Skip to content

Commit fd20414

Browse files
denis-yuendenis-yuen
authored
Feature/java 17 dockstore 15 jakarta (#14)
* WIP, needs bom, chicken and the egg? * WIP, but compiles * bit of cleanup * [maven-release-plugin] prepare release 2.0.3 * [maven-release-plugin] prepare for next development iteration * Update pom.xml
1 parent 72c04c6 commit fd20414

3 files changed

Lines changed: 91 additions & 33 deletions

File tree

‎.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: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,102 +4,102 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>io.dockstore</groupId>
66
<artifactId>swagger-java-bitbucket-client</artifactId>
7-
<version>2.0.2</version>
7+
<version>2.0.3-SNAPSHOT</version>
88
<licenses>
99
<license>
1010
<name>Apache Software License, Version 2.0</name>
11-
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
11+
<url>https://www.apache.org/licenses/LICENSE-2.0</url>
1212
</license>
1313
</licenses>
1414
<dependencies>
1515
<dependency>
1616
<groupId>io.swagger</groupId>
1717
<artifactId>swagger-annotations</artifactId>
18-
<version>1.6.2</version>
18+
<version>1.6.8</version>
1919
<scope>compile</scope>
2020
</dependency>
2121
<dependency>
2222
<groupId>org.glassfish.jersey.core</groupId>
2323
<artifactId>jersey-client</artifactId>
24-
<version>2.33</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.33</version>
30+
<version>3.0.9</version>
3131
<scope>compile</scope>
3232
<exclusions>
3333
<exclusion>
34-
<artifactId>jackson-jaxrs-base</artifactId>
3534
<groupId>com.fasterxml.jackson.jaxrs</groupId>
35+
<artifactId>jackson-jaxrs-base</artifactId>
3636
</exclusion>
3737
<exclusion>
38-
<artifactId>jackson-annotations</artifactId>
3938
<groupId>com.fasterxml.jackson.core</groupId>
39+
<artifactId>jackson-annotations</artifactId>
4040
</exclusion>
4141
<exclusion>
42-
<artifactId>jersey-common</artifactId>
4342
<groupId>org.glassfish.jersey.core</groupId>
43+
<artifactId>jersey-common</artifactId>
4444
</exclusion>
4545
<exclusion>
46-
<artifactId>jackson-jaxrs-json-provider</artifactId>
4746
<groupId>com.fasterxml.jackson.jaxrs</groupId>
47+
<artifactId>jackson-jaxrs-json-provider</artifactId>
4848
</exclusion>
4949
</exclusions>
5050
</dependency>
5151
<dependency>
5252
<groupId>org.glassfish.jersey.media</groupId>
5353
<artifactId>jersey-media-multipart</artifactId>
54-
<version>2.33</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.12.3</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.12.3</version>
66+
<version>2.14.2</version>
6767
<scope>compile</scope>
6868
<exclusions>
6969
<exclusion>
70-
<artifactId>jackson-annotations</artifactId>
7170
<groupId>com.fasterxml.jackson.core</groupId>
71+
<artifactId>jackson-annotations</artifactId>
7272
</exclusion>
7373
</exclusions>
7474
</dependency>
7575
<dependency>
7676
<groupId>com.fasterxml.jackson.core</groupId>
7777
<artifactId>jackson-databind</artifactId>
78-
<version>2.12.3</version>
78+
<version>2.14.2</version>
7979
<scope>compile</scope>
8080
<exclusions>
8181
<exclusion>
82-
<artifactId>jackson-annotations</artifactId>
8382
<groupId>com.fasterxml.jackson.core</groupId>
83+
<artifactId>jackson-annotations</artifactId>
8484
</exclusion>
8585
</exclusions>
8686
</dependency>
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.33</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.12.3</version>
102+
<version>2.14.2</version>
103103
<scope>compile</scope>
104104
</dependency>
105105
</dependencies>

‎pom.xml‎

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

1111
<properties>
1212
<github.url>scm:git:git@github.com:dockstore/swagger-java-bitbucket-client.git</github.url>
1313
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
14-
<dockstore-core.version>1.12.0-alpha.0</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>
@@ -88,9 +88,9 @@
8888
<plugin>
8989
<groupId>org.apache.maven.plugins</groupId>
9090
<artifactId>maven-compiler-plugin</artifactId>
91-
<version>3.8.1</version>
91+
<version>3.10.1</version>
9292
<configuration>
93-
<release>11</release>
93+
<release>17</release>
9494
<showDeprecation>true</showDeprecation>
9595
<forceJavacCompilerUse>true</forceJavacCompilerUse>
9696
</configuration>
@@ -134,14 +134,7 @@
134134
</plugin>
135135
<plugin>
136136
<artifactId>maven-dependency-plugin</artifactId>
137-
<version>3.1.1</version>
138-
<dependencies>
139-
<dependency>
140-
<groupId>org.apache.maven.shared</groupId>
141-
<artifactId>maven-dependency-analyzer</artifactId>
142-
<version>1.11.1</version>
143-
</dependency>
144-
</dependencies>
137+
<version>3.3.0</version>
145138
</plugin>
146139
<plugin>
147140
<groupId>org.apache.maven.plugins</groupId>
@@ -240,7 +233,7 @@
240233
<plugin>
241234
<groupId>com.github.spotbugs</groupId>
242235
<artifactId>spotbugs-maven-plugin</artifactId>
243-
<version>3.1.12.2</version>
236+
<version>4.5.3.0</version>
244237
</plugin>
245238
<plugin>
246239
<groupId>org.apache.maven.plugins</groupId>
@@ -286,13 +279,13 @@
286279
<plugin>
287280
<groupId>io.swagger</groupId>
288281
<artifactId>swagger-codegen-maven-plugin</artifactId>
289-
<version>2.4.19</version>
282+
<version>2.4.21</version>
290283
</plugin>
291284
<!-- https://mvnrepository.com/artifact/io.swagger.codegen.v3/swagger-codegen-maven-plugin -->
292285
<plugin>
293286
<groupId>io.swagger.codegen.v3</groupId>
294287
<artifactId>swagger-codegen-maven-plugin</artifactId>
295-
<version>3.0.25</version>
288+
<version>3.0.36</version>
296289
</plugin>
297290
<!-- https://mvnrepository.com/artifact/org.codehaus.mojo/versions-maven-plugin -->
298291
<plugin>
@@ -383,6 +376,66 @@
383376
</execution>
384377
</executions>
385378
</plugin>
379+
<plugin>
380+
<groupId>com.google.code.maven-replacer-plugin</groupId>
381+
<artifactId>replacer</artifactId>
382+
<version>1.5.3</version>
383+
<executions>
384+
<execution>
385+
<id>replace1</id>
386+
<phase>generate-sources</phase>
387+
<goals>
388+
<goal>replace</goal>
389+
</goals>
390+
</execution>
391+
<!-- not sure why swagger-codegen-maven-plugin runs in two phases -->
392+
<execution>
393+
<id>replace2</id>
394+
<phase>compile</phase>
395+
<goals>
396+
<goal>replace</goal>
397+
</goals>
398+
</execution>
399+
</executions>
400+
<configuration>
401+
<includes>
402+
<include>${pom.basedir}/target/generated-sources/swagger/src/gen/java/**/*.java</include>
403+
<include>${pom.basedir}/target/generated-sources/swagger/src/main/java/**/*.java</include>
404+
</includes>
405+
<regex>false</regex>
406+
<replacements>
407+
<!-- for these jakarta replacements, we can do better after https://github.com/swagger-api/swagger-codegen/issues/11797 -->
408+
<replacement>
409+
<token>javax.annotation</token>
410+
<value>jakarta.annotation</value>
411+
</replacement>
412+
<replacement>
413+
<token>@javax.annotation</token>
414+
<value>@jakarta.annotation</value>
415+
</replacement>
416+
<replacement>
417+
<token>javax.validation</token>
418+
<value>jakarta.validation</value>
419+
</replacement>
420+
<replacement>
421+
<token>javax.ws</token>
422+
<value>jakarta.ws</value>
423+
</replacement>
424+
<replacement>
425+
<token>javax.servlet</token>
426+
<value>jakarta.servlet</value>
427+
</replacement>
428+
<replacement>
429+
<token>javax.xml.bind</token>
430+
<value>jakarta.xml.bind</value>
431+
</replacement>
432+
<replacement>
433+
<token>javax.xml.bind</token>
434+
<value>jakarta.xml.bind</value>
435+
</replacement>
436+
</replacements>
437+
</configuration>
438+
</plugin>
386439
<!-- auto-generated java classes should not fail the build on style -->
387440
<plugin>
388441
<groupId>org.apache.maven.plugins</groupId>

0 commit comments

Comments
 (0)