Skip to content

Commit b3e034b

Browse files
valentin-gauthier-geosirisvalentin-gauthier-geosiris
authored
fixing renaming script (#2)
* fixing renaming script
1 parent 83e5177 commit b3e034b

10 files changed

Lines changed: 103 additions & 82 deletions

File tree

‎.github/workflows/opc.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ on:
44
release:
55
types: [created]
66

7-
pull_request:
8-
branches: main
7+
# pull_request:
8+
# branches: main
99

1010
jobs:
1111
build:

‎.github/workflows/prodmlv2.2.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ on:
44
release:
55
types: [created]
66

7-
pull_request:
8-
branches: main
7+
# pull_request:
8+
# branches: main
99

1010
jobs:
1111
build:

‎.github/workflows/resqmlv2.0.1.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ on:
44
release:
55
types: [created]
66

7-
pull_request:
8-
branches: main
7+
# pull_request:
8+
# branches: main
99

1010
jobs:
1111
build:

‎.github/workflows/resqmlv2.2.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ on:
44
release:
55
types: [created]
66

7-
pull_request:
8-
branches: main
7+
# pull_request:
8+
# branches: main
99

1010
jobs:
1111
build:

‎.github/workflows/resqmlv2.2dev3.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ on:
44
release:
55
types: [created]
66

7-
pull_request:
8-
branches: main
7+
# pull_request:
8+
# branches: main
99

1010
jobs:
1111
build:

‎.github/workflows/witsmlv2.0.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ on:
44
release:
55
types: [created]
66

7-
pull_request:
8-
branches: main
7+
# pull_request:
8+
# branches: main
99

1010
jobs:
1111
build:

‎.github/workflows/witsmlv2.1.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ on:
44
release:
55
types: [created]
66

7-
pull_request:
8-
branches: main
7+
# pull_request:
8+
# branches: main
99

1010
jobs:
1111
build:

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ target/*
1212
.factorypath
1313
.vscode/
1414
*.war
15-
.idea/
15+
.idea/
16+
local-config.txt

‎pom.xml‎

Lines changed: 85 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<groupId>com.geosiris</groupId>
44
<artifactId>energyml-${env.PKG_NAME}${env.PKG_VERSION}</artifactId>
55
<name>${project.groupId}:${project.artifactId}</name>
6-
<version>1.0.0</version>
6+
<version>1.0.1</version>
77
<organization>
88
<name>Geosiris</name>
99
<url>http://www.geosiris.com</url>
@@ -44,6 +44,29 @@
4444
<sonar.organization>geosiris-technologies</sonar.organization>
4545
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
4646
</properties>
47+
<dependencies>
48+
<dependency>
49+
<groupId>jakarta.xml.bind</groupId>
50+
<artifactId>jakarta.xml.bind-api</artifactId>
51+
<version>4.0.0</version>
52+
</dependency>
53+
<dependency>
54+
<groupId>com.sun.xml.bind</groupId>
55+
<artifactId>jaxb-impl</artifactId>
56+
<version>4.0.0</version>
57+
<scope>runtime</scope>
58+
</dependency>
59+
</dependencies>
60+
<distributionManagement>
61+
<snapshotRepository>
62+
<id>ossrh</id>
63+
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
64+
</snapshotRepository>
65+
<repository>
66+
<id>ossrh</id>
67+
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
68+
</repository>
69+
</distributionManagement>
4770
<build>
4871
<plugins>
4972
<!-- Enable xsd distant downloading -->
@@ -124,77 +147,54 @@
124147
</execution>
125148
</executions>
126149
</plugin>
127-
<!-- Maven central publish -->
128-
<plugin>
129-
<groupId>org.sonatype.plugins</groupId>
130-
<artifactId>nexus-staging-maven-plugin</artifactId>
131-
<version>1.6.7</version>
132-
<extensions>true</extensions>
133-
<executions>
134-
<execution>
135-
<id>default-deploy</id>
136-
<phase>deploy</phase>
137-
<goals>
138-
<goal>deploy</goal>
139-
</goals>
140-
</execution>
141-
</executions>
142-
<configuration>
143-
<serverId>ossrh</serverId>
144-
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
145-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
146-
</configuration>
147-
</plugin>
148-
<!-- Sign with PGP -->
149-
<plugin>
150-
<groupId>org.apache.maven.plugins</groupId>
151-
<artifactId>maven-gpg-plugin</artifactId>
152-
<executions>
153-
<execution>
154-
<id>sign-artifacts</id>
155-
<phase>verify</phase>
156-
<goals>
157-
<goal>sign</goal>
158-
</goals>
159-
<configuration>
160-
<gpgArguments>
161-
<arg>--pinentry-mode</arg>
162-
<arg>loopback</arg>
163-
</gpgArguments>
164-
</configuration>
165-
</execution>
166-
</executions>
167-
</plugin>
168150
</plugins>
169151
</build>
170-
<dependencies>
171-
<dependency>
172-
<groupId>jakarta.xml.bind</groupId>
173-
<artifactId>jakarta.xml.bind-api</artifactId>
174-
<version>4.0.0</version>
175-
</dependency>
176-
<dependency>
177-
<groupId>com.sun.xml.bind</groupId>
178-
<artifactId>jaxb-impl</artifactId>
179-
<version>4.0.0</version>
180-
<scope>runtime</scope>
181-
</dependency>
182-
</dependencies>
183-
<distributionManagement>
184-
<snapshotRepository>
185-
<id>ossrh</id>
186-
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
187-
</snapshotRepository>
188-
<repository>
189-
<id>ossrh</id>
190-
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
191-
</repository>
192-
</distributionManagement>
193152
<profiles>
194153
<profile>
195154
<id>release</id>
196155
<build>
197156
<plugins>
157+
<!-- Maven central publish -->
158+
<plugin>
159+
<groupId>org.sonatype.plugins</groupId>
160+
<artifactId>nexus-staging-maven-plugin</artifactId>
161+
<version>1.6.7</version>
162+
<extensions>true</extensions>
163+
<executions>
164+
<execution>
165+
<id>default-deploy</id>
166+
<phase>deploy</phase>
167+
<goals>
168+
<goal>deploy</goal>
169+
</goals>
170+
</execution>
171+
</executions>
172+
<configuration>
173+
<serverId>ossrh</serverId>
174+
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
175+
<autoReleaseAfterClose>true</autoReleaseAfterClose>
176+
</configuration>
177+
</plugin>
178+
<!-- Sign with PGP -->
179+
<plugin>
180+
<groupId>org.apache.maven.plugins</groupId>
181+
<artifactId>maven-gpg-plugin</artifactId>
182+
<executions>
183+
<execution>
184+
<id>sign-artifacts</id>
185+
<phase>verify</phase>
186+
<goals>
187+
<goal>sign</goal>
188+
</goals>
189+
<configuration>
190+
<gpgArguments>
191+
<arg>--pinentry-mode</arg>
192+
<arg>loopback</arg>
193+
</gpgArguments>
194+
</configuration>
195+
</execution>
196+
</executions>
197+
</plugin>
198198
<plugin>
199199
<groupId>org.apache.maven.plugins</groupId>
200200
<artifactId>maven-source-plugin</artifactId>
@@ -228,5 +228,25 @@
228228
</plugins>
229229
</build>
230230
</profile>
231+
<profile>
232+
<id>local</id>
233+
<build>
234+
<plugins>
235+
<plugin>
236+
<groupId>org.apache.maven.plugins</groupId>
237+
<artifactId>maven-source-plugin</artifactId>
238+
<version>3.2.1</version>
239+
<executions>
240+
<execution>
241+
<id>attach-sources</id>
242+
<goals>
243+
<goal>jar-no-fork</goal>
244+
</goals>
245+
</execution>
246+
</executions>
247+
</plugin>
248+
</plugins>
249+
</build>
250+
</profile>
231251
</profiles>
232252
</project>

‎scripts/renamePkg.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
for arg in sys.argv[1:]:
2828
print("ARG found : " + arg)
2929
if arg is not None and "::" in arg:
30-
result = re.search(r"([\w]+)::(\d[\d\.]+)", arg)
31-
pkg_versions[result.group(1)] = result.group(2).replace('.', '_')
30+
for result in re.findall(r"([\w]+)::([\d\w\.]+)", arg):
31+
pkg_versions[result[0]] = result[1].replace('.', '_')
3232

3333
for pkg, version in pkg_versions.items():
3434
print(pkg, ":", version)

0 commit comments

Comments
 (0)