testng update and JDK 11+ build

swagger-api · Feb 24, 2023 · ccb8a19 · ccb8a19
1 parent b842b6d
commit ccb8a19
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 25 deletions.
diff --git a/.github/workflows/maven-pulls.yml b/.github/workflows/maven-pulls.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ 8, 11, 14 ]
+        java: [ 11, 14, 17 ]
 
     steps:
     - uses: actions/checkout@v2

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ 8, 11, 14 ]
+        java: [ 11, 14, 17 ]
 
     steps:
     - uses: actions/checkout@v2
@@ -40,7 +40,7 @@ jobs:
           cd ../..
           export MY_JAVA_VERSION=`java -version 2>&1 | head -1 | cut -d'"' -f2 | sed '/^1\./s///' | cut -d'.' -f1`
           echo "JAVA VERSION" ${MY_JAVA_VERSION}
-          if [[ ${MY_JAVA_VERSION} == "8" ]];
+          if [[ ${MY_JAVA_VERSION} == "11" ]];
           then
             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`
             echo "POM VERSION" ${MY_POM_VERSION}

diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
@@ -20,10 +20,10 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: 2.x
-    - name: Set up Java 8
+    - name: Set up Java 11
       uses: actions/setup-java@v1
       with:
-        java-version: 8
+        java-version: 11
         server-id: ossrh
         server-username: MAVEN_USERNAME
         server-password: MAVEN_PASSWORD

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,10 +20,10 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: 2.x
-    - name: Set up Java 8
+    - name: Set up Java 11
       uses: actions/setup-java@v1
       with:
-        java-version: 8
+        java-version: 11
         server-id: ossrh
         server-username: MAVEN_USERNAME
         server-password: MAVEN_PASSWORD

diff --git a/modules/swagger-core/pom.xml b/modules/swagger-core/pom.xml
@@ -163,6 +163,11 @@
             <version>1.0</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <properties>
         <!-- TODO increase coverage -->

diff --git a/modules/swagger-models/pom.xml b/modules/swagger-models/pom.xml
@@ -39,7 +39,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
+                <version>${surefire-version}</version>
                 <configuration>
                     <argLine>-Djdk.attach.allowAttachSelf</argLine>
                 </configuration>
@@ -97,7 +97,7 @@
     <properties>
         <coverage.complexity.minimum>0.07</coverage.complexity.minimum>
         <coverage.line.minimum>0.0</coverage.line.minimum>
-        <jmockit-version>1.39</jmockit-version>
+        <jmockit-version>1.49</jmockit-version>
         <mockito-version>2.16.0</mockito-version>
     </properties>
 </project>
diff --git a/modules/swagger-project-jakarta/pom.xml b/modules/swagger-project-jakarta/pom.xml
@@ -69,10 +69,6 @@
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -565,6 +561,7 @@
         </dependencies>
     </dependencyManagement>
     <properties>
+        <maven.compiler.release>8</maven.compiler.release>
         <joda-version>1.9.2</joda-version>
         <joda-time-version>2.12.1</joda-time-version>
         <snakeyaml-version>1.33</snakeyaml-version>
@@ -575,8 +572,8 @@
         <servlet-api-version>5.0.0</servlet-api-version>
         <jersey2-version>3.0.1</jersey2-version>
         <junit-version>4.13.1</junit-version>
-        <jackson-version>2.14.0</jackson-version>
-        <jackson-databind-version>2.14.0</jackson-databind-version>
+        <jackson-version>2.14.2</jackson-version>
+        <jackson-databind-version>2.14.2</jackson-databind-version>
         <logback-version>1.4.4</logback-version>
         <classgraph-version>4.8.150</classgraph-version>
         <guava-version>31.0.1-jre</guava-version>
@@ -585,13 +582,13 @@
         <commons-io-version>2.11.0</commons-io-version>
         <slf4j-version>1.7.35</slf4j-version>
         <jetty-version>9.4.49.v20220914</jetty-version>
-        <testng-version>7.3.0</testng-version>
+        <testng-version>7.7.0</testng-version>
         <mockito-version>2.28.2</mockito-version>
         <rest-assured-version>4.3.2</rest-assured-version>
         <httpcomponents-version>4.5.13</httpcomponents-version>
         <commons-codec-version>1.15</commons-codec-version>
 
-        <surefire-version>2.21.0</surefire-version>
+        <surefire-version>2.22.2</surefire-version>
         <enforcer-plugin-version>3.0.0-M2</enforcer-plugin-version>
         <failsafe-plugin-version>2.22.2</failsafe-plugin-version>
 

diff --git a/pom.xml b/pom.xml
@@ -105,10 +105,6 @@
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -650,6 +646,7 @@
         </dependencies>
     </dependencyManagement>
     <properties>
+        <maven.compiler.release>8</maven.compiler.release>
         <joda-version>1.9.2</joda-version>
         <joda-time-version>2.12.1</joda-time-version>
         <snakeyaml-version>1.33</snakeyaml-version>
@@ -660,8 +657,8 @@
         <servlet-api-version>4.0.3</servlet-api-version>
         <jersey2-version>2.26</jersey2-version>
         <junit-version>4.13.1</junit-version>
-        <jackson-version>2.14.0</jackson-version>
-        <jackson-databind-version>2.14.0</jackson-databind-version>
+        <jackson-version>2.14.2</jackson-version>
+        <jackson-databind-version>2.14.2</jackson-databind-version>
         <logback-version>1.4.4</logback-version>
         <classgraph-version>4.8.150</classgraph-version>
         <guava-version>31.0.1-jre</guava-version>
@@ -670,13 +667,13 @@
         <commons-io-version>2.11.0</commons-io-version>
         <slf4j-version>1.7.35</slf4j-version>
         <jetty-version>9.4.49.v20220914</jetty-version>
-        <testng-version>7.3.0</testng-version>
+        <testng-version>7.7.0</testng-version>
         <mockito-version>2.28.2</mockito-version>
         <rest-assured-version>4.3.2</rest-assured-version>
         <httpcomponents-version>4.5.13</httpcomponents-version>
         <commons-codec-version>1.15</commons-codec-version>
 
-        <surefire-version>2.21.0</surefire-version>
+        <surefire-version>2.22.2</surefire-version>
         <enforcer-plugin-version>3.0.0-M2</enforcer-plugin-version>
         <failsafe-plugin-version>2.22.2</failsafe-plugin-version>