snakeyaml / testng update and JDK 11+ build

swagger-api · Feb 27, 2023 · 977c931 · 977c931
1 parent b842b6d
commit 977c931
Show file tree

Hide file tree

Showing 20 changed files with 244 additions and 182 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/CI/post-release.sh b/CI/post-release.sh
@@ -40,8 +40,8 @@ sc_find="io.swagger.core.v3:swagger-jaxrs2:$SC_VERSION"
 sc_replace="io.swagger.core.v3:swagger-jaxrs2:$SC_NEXT_VERSION-SNAPSHOT"
 sed -i -e "s/$sc_find/$sc_replace/g" $CUR/modules/swagger-gradle-plugin/src/main/java/io/swagger/v3/plugins/gradle/SwaggerPlugin.java
 
-sc_find="name: 'swagger-jaxrs2', version:'$SC_VERSION"
-sc_replace="name: 'swagger-jaxrs2', version:'$SC_NEXT_VERSION-SNAPSHOT"
+sc_find="io.swagger.core.v3:swagger-jaxrs2:$SC_VERSION"
+sc_replace="io.swagger.core.v3:swagger-jaxrs2:$SC_VERSION-SNAPSHOT"
 sed -i -e "s/$sc_find/$sc_replace/g" $CUR/modules/swagger-gradle-plugin/src/test/java/io/swagger/v3/plugins/gradle/SwaggerResolveTest.java
 
 

diff --git a/CI/prepare-release.sh b/CI/prepare-release.sh
@@ -65,8 +65,8 @@ sc_find="io.swagger.core.v3:swagger-jaxrs2:$SC_VERSION-SNAPSHOT"
 sc_replace="io.swagger.core.v3:swagger-jaxrs2:$SC_VERSION"
 sed -i -e "s/$sc_find/$sc_replace/g" $CUR/modules/swagger-gradle-plugin/src/main/java/io/swagger/v3/plugins/gradle/SwaggerPlugin.java
 
-sc_find="name: 'swagger-jaxrs2', version:'$SC_VERSION-SNAPSHOT"
-sc_replace="name: 'swagger-jaxrs2', version:'$SC_VERSION"
+sc_find="io.swagger.core.v3:swagger-jaxrs2:$SC_VERSION-SNAPSHOT"
+sc_replace="io.swagger.core.v3:swagger-jaxrs2:$SC_VERSION"
 sed -i -e "s/$sc_find/$sc_replace/g" $CUR/modules/swagger-gradle-plugin/src/test/java/io/swagger/v3/plugins/gradle/SwaggerResolveTest.java
 
 sc_find="<version>$SC_LAST_RELEASE<\/version>"

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-gradle-plugin/README.md b/modules/swagger-gradle-plugin/README.md
@@ -14,8 +14,8 @@ In many cases it is sufficient to set it to the `classpath` value, like:
 
 Alternatively provide as value a classpath with the following dependencies (replacing the provided [`javax` ones](https://github.com/swagger-api/swagger-core/blob/master/modules/swagger-gradle-plugin/src/main/java/io/swagger/v3/plugins/gradle/SwaggerPlugin.java#L16-L25)):
 
-* org.apache.commons:commons-lang3:3.7
-* io.swagger.core.v3:swagger-jaxrs2-jakarta:2.1.7
+* org.apache.commons:commons-lang3:3.12.0
+* io.swagger.core.v3:swagger-jaxrs2-jakarta:2.2.9
 * jakarta.ws.rs:jakarta.ws.rs-api:3.0.0
 * jakarta.servlet:jakarta.servlet-api:5.0.0
 

diff --git a/modules/swagger-gradle-plugin/build.gradle b/modules/swagger-gradle-plugin/build.gradle
@@ -4,7 +4,7 @@
 plugins {
     id 'java-gradle-plugin'
     // Publishing publicly
-    id 'com.gradle.plugin-publish' version '0.19.0'
+    id 'com.gradle.plugin-publish' version '0.21.0'
     // Publishing to maven
     id 'maven-publish'
 }
@@ -18,9 +18,13 @@ repositories {
     mavenCentral()
 }
 
+compileJava {
+    options.release = 8
+}
+
 dependencies {
     implementation gradleApi()
-    implementation 'org.apache.commons:commons-lang3:3.7'
+    implementation 'org.apache.commons:commons-lang3:3.12.0'
 
     testImplementation gradleTestKit()
     testImplementation('com.github.tomakehurst:wiremock:2.27.2') {
@@ -35,8 +39,8 @@ dependencies {
         exclude group: 'com.github.jknack', module: 'handlebars-helpers'
     }
     testImplementation 'javax.servlet:javax.servlet-api:3.1.0'
-    testImplementation 'com.google.guava:guava:30.1-jre'
-    testImplementation 'javax.ws.rs:javax.ws.rs-api:2.1'
+    testImplementation 'com.google.guava:guava:31.1-jre'
+    testImplementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
     testImplementation "io.swagger.core.v3:swagger-jaxrs2:${project.version}"
     testImplementation 'junit:junit:4+'
     testImplementation "org.eclipse.jetty:jetty-server:${project.jettyVersion}"
@@ -46,10 +50,10 @@ dependencies {
     testImplementation "org.eclipse.jetty:jetty-proxy:${project.jettyVersion}"
     testImplementation "org.apache.httpcomponents:httpclient:4.5.13"
     testImplementation "commons-codec:commons-codec:1.15"
-    testImplementation "commons-io:commons-io:2.7"
+    testImplementation "commons-io:commons-io:2.11.0"
     testImplementation "org.apache.commons:commons-compress:1.21"
-    testImplementation "com.github.jknack:handlebars:4.2.1"
-    testImplementation "com.github.jknack:handlebars-helpers:4.2.1"
+    testImplementation "com.github.jknack:handlebars:4.3.1"
+    testImplementation "com.github.jknack:handlebars-helpers:4.3.1"
 }
 
 // * * * * * * * * * * * *

diff --git a/modules/swagger-gradle-plugin/gradle.properties b/modules/swagger-gradle-plugin/gradle.properties
@@ -1,2 +1,2 @@
 version=2.2.9-SNAPSHOT
-jettyVersion=9.4.43.v20210629
+jettyVersion=9.4.49.v20220914
diff --git a/modules/swagger-gradle-plugin/gradle/wrapper/gradle-wrapper.jar b/modules/swagger-gradle-plugin/gradle/wrapper/gradle-wrapper.jar
diff --git a/modules/swagger-gradle-plugin/gradle/wrapper/gradle-wrapper.properties b/modules/swagger-gradle-plugin/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists