Skip to content

Commit 679c970

Browse files
denis-yuendenis-yuen
authored
Feature/feature/java 17 dockstore 15 jakarta (#15)
* upgrades * [maven-release-plugin] prepare release 2.0.2 * [maven-release-plugin] prepare for next development iteration * formatting
1 parent a63f96e commit 679c970

File tree

3 files changed

+81
-23
lines changed

3 files changed

+81
-23
lines changed

‎.github/workflows/mvn.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,10 @@ jobs:
2121
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
2222
restore-keys: |
2323
${{ runner.os }}-maven-
24+
- name: Set up JDK
25+
uses: actions/setup-java@v3
26+
with:
27+
java-version: '17.0.4+8'
28+
distribution: 'adopt'
2429
- name: Build with mvn
2530
run: mvn -B -ntp clean install

‎generated/src/main/resources/pom.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
<dependency>
2222
<groupId>org.glassfish.jersey.core</groupId>
2323
<artifactId>jersey-client</artifactId>
24-
<version>2.39</version>
24+
<version>3.0.9</version>
2525
<scope>compile</scope>
2626
</dependency>
2727
<dependency>
2828
<groupId>org.glassfish.jersey.media</groupId>
2929
<artifactId>jersey-media-json-jackson</artifactId>
30-
<version>2.39</version>
30+
<version>3.0.9</version>
3131
<scope>compile</scope>
3232
<exclusions>
3333
<exclusion>
@@ -51,19 +51,19 @@
5151
<dependency>
5252
<groupId>org.glassfish.jersey.media</groupId>
5353
<artifactId>jersey-media-multipart</artifactId>
54-
<version>2.39</version>
54+
<version>3.0.9</version>
5555
<scope>compile</scope>
5656
</dependency>
5757
<dependency>
5858
<groupId>com.fasterxml.jackson.core</groupId>
5959
<artifactId>jackson-core</artifactId>
60-
<version>2.13.5</version>
60+
<version>2.14.2</version>
6161
<scope>compile</scope>
6262
</dependency>
6363
<dependency>
6464
<groupId>com.fasterxml.jackson.core</groupId>
6565
<artifactId>jackson-annotations</artifactId>
66-
<version>2.13.5</version>
66+
<version>2.14.2</version>
6767
<scope>compile</scope>
6868
<exclusions>
6969
<exclusion>
@@ -75,7 +75,7 @@
7575
<dependency>
7676
<groupId>com.fasterxml.jackson.core</groupId>
7777
<artifactId>jackson-databind</artifactId>
78-
<version>2.13.5</version>
78+
<version>2.14.2</version>
7979
<scope>compile</scope>
8080
<exclusions>
8181
<exclusion>
@@ -87,19 +87,19 @@
8787
<dependency>
8888
<groupId>jakarta.ws.rs</groupId>
8989
<artifactId>jakarta.ws.rs-api</artifactId>
90-
<version>2.1.6</version>
90+
<version>3.0.0</version>
9191
<scope>compile</scope>
9292
</dependency>
9393
<dependency>
9494
<groupId>org.glassfish.jersey.core</groupId>
9595
<artifactId>jersey-common</artifactId>
96-
<version>2.39</version>
96+
<version>3.0.9</version>
9797
<scope>compile</scope>
9898
</dependency>
9999
<dependency>
100100
<groupId>com.fasterxml.jackson.datatype</groupId>
101101
<artifactId>jackson-datatype-jsr310</artifactId>
102-
<version>2.13.5</version>
102+
<version>2.14.2</version>
103103
<scope>compile</scope>
104104
</dependency>
105105
</dependencies>

‎pom.xml‎

Lines changed: 67 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
<packaging>jar</packaging>
77
<name>swagger-java-sam-client</name>
88
<groupId>io.dockstore</groupId>
9-
<version>2.0.2-SNAPSHOT</version>
9+
<version>2.0.3-SNAPSHOT</version>
1010

1111
<properties>
1212
<github.url>scm:git:git@github.com:dockstore/swagger-java-sam-client.git</github.url>
1313
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
14-
<dockstore-core.version>1.14.0-alpha.9</dockstore-core.version>
14+
<dockstore-core.version>1.15.0-prealpha.1</dockstore-core.version>
1515
<maven-failsafe.version>2.21.0</maven-failsafe.version>
1616
<maven-surefire.version>2.21.0</maven-surefire.version>
1717
<javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
@@ -87,9 +87,9 @@
8787
<plugin>
8888
<groupId>org.apache.maven.plugins</groupId>
8989
<artifactId>maven-compiler-plugin</artifactId>
90-
<version>3.8.1</version>
90+
<version>3.10.1</version>
9191
<configuration>
92-
<release>11</release>
92+
<release>17</release>
9393
<showDeprecation>true</showDeprecation>
9494
<forceJavacCompilerUse>true</forceJavacCompilerUse>
9595
</configuration>
@@ -133,14 +133,7 @@
133133
</plugin>
134134
<plugin>
135135
<artifactId>maven-dependency-plugin</artifactId>
136-
<version>3.1.1</version>
137-
<dependencies>
138-
<dependency>
139-
<groupId>org.apache.maven.shared</groupId>
140-
<artifactId>maven-dependency-analyzer</artifactId>
141-
<version>1.11.1</version>
142-
</dependency>
143-
</dependencies>
136+
<version>3.3.0</version>
144137
</plugin>
145138
<plugin>
146139
<groupId>org.apache.maven.plugins</groupId>
@@ -285,13 +278,13 @@
285278
<plugin>
286279
<groupId>io.swagger</groupId>
287280
<artifactId>swagger-codegen-maven-plugin</artifactId>
288-
<version>2.4.19</version>
281+
<version>2.4.21</version>
289282
</plugin>
290283
<!-- https://mvnrepository.com/artifact/io.swagger.codegen.v3/swagger-codegen-maven-plugin -->
291284
<plugin>
292285
<groupId>io.swagger.codegen.v3</groupId>
293286
<artifactId>swagger-codegen-maven-plugin</artifactId>
294-
<version>3.0.25</version>
287+
<version>3.0.36</version>
295288
</plugin>
296289
<!-- https://mvnrepository.com/artifact/org.codehaus.mojo/versions-maven-plugin -->
297290
<plugin>
@@ -382,6 +375,66 @@
382375
</execution>
383376
</executions>
384377
</plugin>
378+
<plugin>
379+
<groupId>com.google.code.maven-replacer-plugin</groupId>
380+
<artifactId>replacer</artifactId>
381+
<version>1.5.3</version>
382+
<executions>
383+
<execution>
384+
<id>replace1</id>
385+
<phase>generate-sources</phase>
386+
<goals>
387+
<goal>replace</goal>
388+
</goals>
389+
</execution>
390+
<!-- not sure why swagger-codegen-maven-plugin runs in two phases -->
391+
<execution>
392+
<id>replace2</id>
393+
<phase>compile</phase>
394+
<goals>
395+
<goal>replace</goal>
396+
</goals>
397+
</execution>
398+
</executions>
399+
<configuration>
400+
<includes>
401+
<include>${pom.basedir}/target/generated-sources/swagger/src/gen/java/**/*.java</include>
402+
<include>${pom.basedir}/target/generated-sources/swagger/src/main/java/**/*.java</include>
403+
</includes>
404+
<regex>false</regex>
405+
<replacements>
406+
<!-- for these jakarta replacements, we can do better after https://github.com/swagger-api/swagger-codegen/issues/11797 -->
407+
<replacement>
408+
<token>javax.annotation</token>
409+
<value>jakarta.annotation</value>
410+
</replacement>
411+
<replacement>
412+
<token>@javax.annotation</token>
413+
<value>@jakarta.annotation</value>
414+
</replacement>
415+
<replacement>
416+
<token>javax.validation</token>
417+
<value>jakarta.validation</value>
418+
</replacement>
419+
<replacement>
420+
<token>javax.ws</token>
421+
<value>jakarta.ws</value>
422+
</replacement>
423+
<replacement>
424+
<token>javax.servlet</token>
425+
<value>jakarta.servlet</value>
426+
</replacement>
427+
<replacement>
428+
<token>javax.xml.bind</token>
429+
<value>jakarta.xml.bind</value>
430+
</replacement>
431+
<replacement>
432+
<token>javax.xml.bind</token>
433+
<value>jakarta.xml.bind</value>
434+
</replacement>
435+
</replacements>
436+
</configuration>
437+
</plugin>
385438
<plugin>
386439
<artifactId>maven-clean-plugin</artifactId>
387440
<executions>

0 commit comments

Comments
 (0)