Skip to content

Commit 46b4b51

Browse files
frantumafrantuma
committed
update deps and build on JDK 11+
1 parent 743cd19 commit 46b4b51

File tree

16 files changed

+330
-265
lines changed

16 files changed

+330
-265
lines changed

‎.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Setup Java JDK
3131
uses: actions/setup-java@v1
3232
with:
33-
java-version: 8
33+
java-version: 11
3434

3535
# Initializes the CodeQL tools for scanning.
3636
- name: Initialize CodeQL

‎.github/workflows/maven-v1-pulls.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
strategy:
1212
matrix:
13-
java: [ 8 ]
13+
java: [ 11, 17 ]
1414

1515
steps:
1616
- uses: actions/checkout@v2

‎.github/workflows/maven-v1.yml

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,16 @@ name: Build Test Deploy 1.5
33
on:
44
push:
55
branches: [ "1.5" ]
6+
pull_request:
7+
branches: [ "1.5" ]
68

79
jobs:
810
build:
911

1012
runs-on: ubuntu-latest
1113
strategy:
1214
matrix:
13-
java: [ 8 ]
15+
java: [ 11, 17 ]
1416

1517
steps:
1618
- uses: actions/checkout@v2
@@ -31,13 +33,20 @@ jobs:
3133
- name: Build with Maven and Gradle
3234
run: |
3335
./mvnw -B -Dhttps.protocols=TLSv1.2 verify --file pom.xml
34-
export MY_POM_VERSION=`./mvnw -q -Dexec.executable="echo" -Dexec.args='${projects.version}' --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec`
35-
echo "POM VERSION" ${MY_POM_VERSION}
36-
if [[ $MY_POM_VERSION =~ ^.*SNAPSHOT$ ]];
36+
export MY_JAVA_VERSION=`java -version 2>&1 | head -1 | cut -d'"' -f2 | sed '/^1\./s///' | cut -d'.' -f1`
37+
echo "JAVA VERSION" ${MY_JAVA_VERSION}
38+
if [[ ${MY_JAVA_VERSION} == "11" ]];
3739
then
38-
./mvnw -B -Dhttps.protocols=TLSv1.2 clean deploy
40+
export MY_POM_VERSION=`./mvnw -q -Dexec.executable="echo" -Dexec.args='${projects.version}' --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec`
41+
echo "POM VERSION" ${MY_POM_VERSION}
42+
if [[ $MY_POM_VERSION =~ ^.*SNAPSHOT$ ]];
43+
then
44+
./mvnw -B -Dhttps.protocols=TLSv1.2 clean deploy
45+
else
46+
echo "not deploying release: " ${MY_POM_VERSION}
47+
fi
3948
else
40-
echo "not deploying release: " ${MY_POM_VERSION}
49+
echo "not deploying on java version: " ${MY_JAVA_VERSION}
4150
fi
4251
env:
4352
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}

‎.mvn/wrapper/maven-wrapper.jar

10.2 KB
Binary file not shown.

‎.mvn/wrapper/maven-wrapper.properties

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,18 @@
1-
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.9/apache-maven-3.3.9-bin.zip
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# https://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
18+
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar

‎modules/swagger-annotations/pom.xml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,25 @@
1010
<groupId>io.swagger</groupId>
1111
<artifactId>swagger-annotations</artifactId>
1212
<version>1.6.10-SNAPSHOT</version>
13-
<packaging>bundle</packaging>
1413
<name>swagger-annotations</name>
1514
<build>
1615
<sourceDirectory>src/main/java</sourceDirectory>
1716
<defaultGoal>install</defaultGoal>
1817
<plugins>
1918
<plugin>
20-
<groupId>org.apache.felix</groupId>
21-
<artifactId>maven-bundle-plugin</artifactId>
22-
<version>${felix-version}</version>
23-
<extensions>true</extensions>
19+
<groupId>biz.aQute.bnd</groupId>
20+
<artifactId>bnd-maven-plugin</artifactId>
21+
</plugin>
22+
<plugin>
23+
<groupId>org.apache.maven.plugins</groupId>
24+
<artifactId>maven-jar-plugin</artifactId>
2425
<configuration>
25-
<instructions>
26-
<Export-Package>io.swagger.annotations</Export-Package>
27-
</instructions>
26+
<archive>
27+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
28+
<manifestEntries>
29+
<Automatic-Module-Name>io.swagger.annotations</Automatic-Module-Name>
30+
</manifestEntries>
31+
</archive>
2832
</configuration>
2933
</plugin>
3034
</plugins>
@@ -125,4 +129,4 @@
125129
</build>
126130
</profile>
127131
</profiles>
128-
</project>
132+
</project>

‎modules/swagger-core/pom.xml

Lines changed: 29 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010
<artifactId>swagger-core</artifactId>
11-
<packaging>bundle</packaging>
1211
<name>swagger-core</name>
1312
<build>
1413
<sourceDirectory>src/main/java</sourceDirectory>
@@ -28,31 +27,38 @@
2827
</testResources>
2928
<plugins>
3029
<plugin>
31-
<groupId>org.apache.felix</groupId>
32-
<artifactId>maven-bundle-plugin</artifactId>
33-
<version>${felix-version}</version>
34-
<extensions>true</extensions>
30+
<groupId>biz.aQute.bnd</groupId>
31+
<artifactId>bnd-maven-plugin</artifactId>
3532
<configuration>
36-
<instructions>
37-
<Export-Package>
38-
io.swagger.converter,
39-
io.swagger.core,
40-
io.swagger.core.filter,
41-
io.swagger.core.util,
42-
io.swagger.reader,
43-
io.swagger.config,
44-
io.swagger.model,
45-
io.swagger.util
46-
</Export-Package>
47-
<Import-Package>javax.validation.constraints;version="[1.1,3)",*</Import-Package>
48-
</instructions>
33+
<bnd>
34+
Import-Package: javax.validation.constraints;version="[1.1,3)",*
35+
Export-Package: \
36+
io.swagger.converter,\
37+
io.swagger.core,\
38+
io.swagger.core.filter,\
39+
io.swagger.core.util,\
40+
io.swagger.reader,\
41+
io.swagger.config,\
42+
io.swagger.model,\
43+
io.swagger.util
44+
</bnd>
4945
</configuration>
5046
</plugin>
5147
<plugin>
5248
<groupId>org.apache.maven.plugins</groupId>
5349
<artifactId>maven-jar-plugin</artifactId>
54-
<version>2.6</version>
5550
<executions>
51+
<execution>
52+
<id>default-jar</id>
53+
<configuration>
54+
<archive>
55+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
56+
<manifestEntries>
57+
<Automatic-Module-Name>io.swagger.core</Automatic-Module-Name>
58+
</manifestEntries>
59+
</archive>
60+
</configuration>
61+
</execution>
5662
<execution>
5763
<goals>
5864
<goal>test-jar</goal>
@@ -63,6 +69,10 @@
6369
</plugins>
6470
</build>
6571
<dependencies>
72+
<dependency>
73+
<groupId>jakarta.xml.bind</groupId>
74+
<artifactId>jakarta.xml.bind-api</artifactId>
75+
</dependency>
6676
<dependency>
6777
<groupId>org.apache.commons</groupId>
6878
<artifactId>commons-lang3</artifactId>

‎modules/swagger-hibernate-validations/pom.xml

Lines changed: 34 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,24 +31,43 @@
3131
</testResources>
3232
<plugins>
3333
<plugin>
34-
<groupId>org.apache.felix</groupId>
35-
<artifactId>maven-bundle-plugin</artifactId>
36-
<version>${felix-version}</version>
37-
<extensions>true</extensions>
34+
<groupId>biz.aQute.bnd</groupId>
35+
<artifactId>bnd-maven-plugin</artifactId>
3836
<configuration>
39-
<instructions>
40-
<Export-Package>
41-
io.swagger.converter,
42-
io.swagger.core,
43-
io.swagger.core.util,
44-
io.swagger.reader,
45-
io.swagger.config,
46-
io.swagger.models
47-
</Export-Package>
48-
<Import-Package>javax.validation.constraints;version="[1.1,3)",*</Import-Package>
49-
</instructions>
37+
<bnd>
38+
Import-Package: javax.validation.constraints;version="[1.1,3)",*
39+
Export-Package: \
40+
io.swagger.converter,\
41+
io.swagger.core,\
42+
io.swagger.core.util,\
43+
io.swagger.reader,\
44+
io.swagger.config,\
45+
io.swagger.models
46+
</bnd>
5047
</configuration>
5148
</plugin>
49+
<plugin>
50+
<groupId>org.apache.maven.plugins</groupId>
51+
<artifactId>maven-jar-plugin</artifactId>
52+
<executions>
53+
<execution>
54+
<id>default-jar</id>
55+
<configuration>
56+
<archive>
57+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
58+
<manifestEntries>
59+
<Automatic-Module-Name>io.swagger.validator</Automatic-Module-Name>
60+
</manifestEntries>
61+
</archive>
62+
</configuration>
63+
</execution>
64+
<execution>
65+
<goals>
66+
<goal>test-jar</goal>
67+
</goals>
68+
</execution>
69+
</executions>
70+
</plugin>
5271
</plugins>
5372
</build>
5473
<dependencies>

0 commit comments

Comments
 (0)