Skip to content

Commit c58355b

Browse files
denis-yuendenis-yuen
authored
Feature/java 17 dockstore 15 jakarta (#15)
* upgrades * [maven-release-plugin] prepare release 2.0.1 * [maven-release-plugin] prepare for next development iteration * formatting * Update pom.xml
1 parent db63d60 commit c58355b

File tree

3 files changed

+82
-24
lines changed

3 files changed

+82
-24
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: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<modelVersion>4.0.0</modelVersion>
2020
<groupId>io.dockstore</groupId>
2121
<artifactId>swagger-java-discourse-client</artifactId>
22-
<version>2.0.1-SNAPSHOT</version>
22+
<version>2.0.1</version>
2323
<licenses>
2424
<license>
2525
<name>Apache Software License, Version 2.0</name>
@@ -36,13 +36,13 @@
3636
<dependency>
3737
<groupId>org.glassfish.jersey.core</groupId>
3838
<artifactId>jersey-client</artifactId>
39-
<version>2.39</version>
39+
<version>3.0.9</version>
4040
<scope>compile</scope>
4141
</dependency>
4242
<dependency>
4343
<groupId>org.glassfish.jersey.media</groupId>
4444
<artifactId>jersey-media-json-jackson</artifactId>
45-
<version>2.39</version>
45+
<version>3.0.9</version>
4646
<scope>compile</scope>
4747
<exclusions>
4848
<exclusion>
@@ -66,19 +66,19 @@
6666
<dependency>
6767
<groupId>org.glassfish.jersey.media</groupId>
6868
<artifactId>jersey-media-multipart</artifactId>
69-
<version>2.39</version>
69+
<version>3.0.9</version>
7070
<scope>compile</scope>
7171
</dependency>
7272
<dependency>
7373
<groupId>com.fasterxml.jackson.core</groupId>
7474
<artifactId>jackson-core</artifactId>
75-
<version>2.13.5</version>
75+
<version>2.14.2</version>
7676
<scope>compile</scope>
7777
</dependency>
7878
<dependency>
7979
<groupId>com.fasterxml.jackson.core</groupId>
8080
<artifactId>jackson-annotations</artifactId>
81-
<version>2.13.5</version>
81+
<version>2.14.2</version>
8282
<scope>compile</scope>
8383
<exclusions>
8484
<exclusion>
@@ -90,7 +90,7 @@
9090
<dependency>
9191
<groupId>com.fasterxml.jackson.core</groupId>
9292
<artifactId>jackson-databind</artifactId>
93-
<version>2.13.5</version>
93+
<version>2.14.2</version>
9494
<scope>compile</scope>
9595
<exclusions>
9696
<exclusion>
@@ -102,19 +102,19 @@
102102
<dependency>
103103
<groupId>jakarta.ws.rs</groupId>
104104
<artifactId>jakarta.ws.rs-api</artifactId>
105-
<version>2.1.6</version>
105+
<version>3.0.0</version>
106106
<scope>compile</scope>
107107
</dependency>
108108
<dependency>
109109
<groupId>org.glassfish.jersey.core</groupId>
110110
<artifactId>jersey-common</artifactId>
111-
<version>2.39</version>
111+
<version>3.0.9</version>
112112
<scope>compile</scope>
113113
</dependency>
114114
<dependency>
115115
<groupId>com.fasterxml.jackson.datatype</groupId>
116116
<artifactId>jackson-datatype-jsr310</artifactId>
117-
<version>2.13.5</version>
117+
<version>2.14.2</version>
118118
<scope>compile</scope>
119119
</dependency>
120120
</dependencies>

‎pom.xml‎

Lines changed: 67 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
<packaging>jar</packaging>
2222
<name>swagger-java-discourse-client</name>
2323
<groupId>io.dockstore</groupId>
24-
<version>2.0.1-SNAPSHOT</version>
24+
<version>2.0.2-SNAPSHOT</version>
2525

2626
<properties>
2727
<github.url>scm:git:git@github.com:dockstore/swagger-java-discourse-client.git</github.url>
2828
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
29-
<dockstore-core.version>1.14.0-alpha.9</dockstore-core.version>
29+
<dockstore-core.version>1.15.0-prealpha.1</dockstore-core.version>
3030
<maven-failsafe.version>2.21.0</maven-failsafe.version>
3131
<maven-surefire.version>2.21.0</maven-surefire.version>
3232
<javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
@@ -103,9 +103,9 @@
103103
<plugin>
104104
<groupId>org.apache.maven.plugins</groupId>
105105
<artifactId>maven-compiler-plugin</artifactId>
106-
<version>3.8.1</version>
106+
<version>3.10.1</version>
107107
<configuration>
108-
<release>11</release>
108+
<release>17</release>
109109
<showDeprecation>true</showDeprecation>
110110
<forceJavacCompilerUse>true</forceJavacCompilerUse>
111111
</configuration>
@@ -149,14 +149,7 @@
149149
</plugin>
150150
<plugin>
151151
<artifactId>maven-dependency-plugin</artifactId>
152-
<version>3.1.1</version>
153-
<dependencies>
154-
<dependency>
155-
<groupId>org.apache.maven.shared</groupId>
156-
<artifactId>maven-dependency-analyzer</artifactId>
157-
<version>1.11.1</version>
158-
</dependency>
159-
</dependencies>
152+
<version>3.3.0</version>
160153
</plugin>
161154
<plugin>
162155
<groupId>org.apache.maven.plugins</groupId>
@@ -301,13 +294,13 @@
301294
<plugin>
302295
<groupId>io.swagger</groupId>
303296
<artifactId>swagger-codegen-maven-plugin</artifactId>
304-
<version>2.4.19</version>
297+
<version>2.4.21</version>
305298
</plugin>
306299
<!-- https://mvnrepository.com/artifact/io.swagger.codegen.v3/swagger-codegen-maven-plugin -->
307300
<plugin>
308301
<groupId>io.swagger.codegen.v3</groupId>
309302
<artifactId>swagger-codegen-maven-plugin</artifactId>
310-
<version>3.0.25</version>
303+
<version>3.0.36</version>
311304
</plugin>
312305
<!-- https://mvnrepository.com/artifact/org.codehaus.mojo/versions-maven-plugin -->
313306
<plugin>
@@ -398,6 +391,66 @@
398391
</execution>
399392
</executions>
400393
</plugin>
394+
<plugin>
395+
<groupId>com.google.code.maven-replacer-plugin</groupId>
396+
<artifactId>replacer</artifactId>
397+
<version>1.5.3</version>
398+
<executions>
399+
<execution>
400+
<id>replace1</id>
401+
<phase>generate-sources</phase>
402+
<goals>
403+
<goal>replace</goal>
404+
</goals>
405+
</execution>
406+
<!-- not sure why swagger-codegen-maven-plugin runs in two phases -->
407+
<execution>
408+
<id>replace2</id>
409+
<phase>compile</phase>
410+
<goals>
411+
<goal>replace</goal>
412+
</goals>
413+
</execution>
414+
</executions>
415+
<configuration>
416+
<includes>
417+
<include>${pom.basedir}/target/generated-sources/swagger/src/gen/java/**/*.java</include>
418+
<include>${pom.basedir}/target/generated-sources/swagger/src/main/java/**/*.java</include>
419+
</includes>
420+
<regex>false</regex>
421+
<replacements>
422+
<!-- for these jakarta replacements, we can do better after https://github.com/swagger-api/swagger-codegen/issues/11797 -->
423+
<replacement>
424+
<token>javax.annotation</token>
425+
<value>jakarta.annotation</value>
426+
</replacement>
427+
<replacement>
428+
<token>@javax.annotation</token>
429+
<value>@jakarta.annotation</value>
430+
</replacement>
431+
<replacement>
432+
<token>javax.validation</token>
433+
<value>jakarta.validation</value>
434+
</replacement>
435+
<replacement>
436+
<token>javax.ws</token>
437+
<value>jakarta.ws</value>
438+
</replacement>
439+
<replacement>
440+
<token>javax.servlet</token>
441+
<value>jakarta.servlet</value>
442+
</replacement>
443+
<replacement>
444+
<token>javax.xml.bind</token>
445+
<value>jakarta.xml.bind</value>
446+
</replacement>
447+
<replacement>
448+
<token>javax.xml.bind</token>
449+
<value>jakarta.xml.bind</value>
450+
</replacement>
451+
</replacements>
452+
</configuration>
453+
</plugin>
401454
<plugin>
402455
<artifactId>maven-clean-plugin</artifactId>
403456
<executions>

0 commit comments

Comments
 (0)