Revert "wrapper中的Gradle6.5版本改为7.4"

This reverts commit 243345b.
kylejPomelo · Dec 19, 2022 · a7f343c · a7f343c
1 parent 243345b
commit a7f343c
Show file tree

Hide file tree

Showing 18 changed files with 70 additions and 74 deletions.
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -23,8 +23,7 @@ repositories {
 dependencies {
   implementation gradleApi()
   implementation localGroovy() //Gradle 2.3 -> Groovy 2.3.9
-  implementation 'org.opentest4j:opentest4j:1.2.0'
-  testImplementation 'org.spockframework:spock-core:2.0-groovy-3.0@jar'
+  testImplementation 'org.spockframework:spock-core:1.3-groovy-2.5@jar'
   testImplementation 'junit:junit:4.12'
 }
 
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -4,9 +4,9 @@ ext {
   classmate = "1.5.1"
   classGraph = "4.8.83"
   equalsverifierVersion = '3.3'
-  groovy = "4.0.6"
+  groovy = "2.5.12"
   jacocoVersion = '0.8.5'
-  jackson = '2.14.1'
+  jackson = '2.11.0'
   joda = "2.10.6"
   jsonPath = "2.4.0"
   jsonAssert = "1.5.0"
@@ -15,25 +15,24 @@ ext {
   mockito = "3.3.3"
   objenesis = "3.1"
   oasCore = "2.1.2"
-  servlet = "6.0.0"
-  slf4j = "2.0.4"
+  servlet = "4.0.1"
+  slf4j = "1.7.25"
   snakeyaml = '1.26'
-  spock = "2.0-groovy-3.0"
-  spring = "3.0.0"
-  springWeb = "6.0.2"
-  springIntegration = "6.0.0"
-  springHateoas = "2.0.0"
-  springDataRest = "4.0.0"
-  springPluginVersion = "3.0.0"
+  spock = "1.3-groovy-2.5"
+  spring = "5.2.7.RELEASE"
+  springIntegration = "5.2.6.RELEASE"
+  springHateoas = "1.1.0.RELEASE"
+  springDataRest = "3.3.0.RELEASE"
+  springPluginVersion = "2.0.0.RELEASE"
   swagger2Core = "1.5.20"
-  springBoot = "3.0.0"
+  springBoot = "2.3.1.RELEASE"
   springfoxRfc6570Version = "1.0.0"
   undercouch = "4.0.4"
   validationApiVersion = '2.0.1.Final'
 
   libs = [
       test                  : [
-          "org.springframework:spring-test:${springWeb}",
+          "org.springframework:spring-test:${spring}",
           "cglib:cglib-nodep:$cglib",
           "org.objenesis:objenesis:$objenesis",
           "org.mockito:mockito-core:${mockito}",
@@ -42,12 +41,12 @@ ext {
           "org.yaml:snakeyaml:${snakeyaml}",
           "org.spockframework:spock-spring:${spock}",
           "org.spockframework:spock-core:${spock}",
-          "org.apache.groovy:groovy-all:${groovy}",
+          "org.codehaus.groovy:groovy-all:${groovy}",
           "org.springframework.hateoas:spring-hateoas:${springHateoas}",
           "nl.jqno.equalsverifier:equalsverifier:${equalsverifierVersion}"
       ],
       testNoHateoas                      : [
-          "org.springframework:spring-test:${springWeb}",
+          "org.springframework:spring-test:${spring}",
           "cglib:cglib-nodep:$cglib",
           "org.objenesis:objenesis:$objenesis",
           "org.mockito:mockito-core:${mockito}",
@@ -56,7 +55,7 @@ ext {
           "org.yaml:snakeyaml:${snakeyaml}",
           "org.spockframework:spock-spring:${spock}",
           "org.spockframework:spock-core:${spock}",
-          "org.apache.groovy:groovy-all:${groovy}",
+          "org.codehaus.groovy:groovy-all:${groovy}",
           "nl.jqno.equalsverifier:equalsverifier:${equalsverifierVersion}"
       ],
       swagger2Core                       : [
@@ -68,25 +67,25 @@ ext {
           "io.swagger.core.v3:swagger-models:${oasCore}"
       ],
       spring                             : [
+          "org.springframework.plugin:spring-plugin-core:${springPluginVersion}",
           "org.springframework.plugin:spring-plugin-metadata:${springPluginVersion}",
-          "org.springframework.plugin:spring-plugin-core:${springPluginVersion}"
       ],
       springProvided                     : [
-          "org.springframework:spring-core:$springWeb",
-          "org.springframework:spring-web:$springWeb",
-          "org.springframework:spring-context:$springWeb",
+          "org.springframework:spring-core:$spring",
+          "org.springframework:spring-web:$spring",
+          "org.springframework:spring-context:$spring",
       ],
       springProvidedWithMvc              : [
-          "org.springframework:spring-core:$springWeb",
-          "org.springframework:spring-web:$springWeb",
-          "org.springframework:spring-webmvc:$springWeb",
-          "org.springframework:spring-context:$springWeb",
+          "org.springframework:spring-core:$spring",
+          "org.springframework:spring-web:$spring",
+          "org.springframework:spring-webmvc:$spring",
+          "org.springframework:spring-context:$spring",
       ],
       springProvidedWithFlux             : [
-          "org.springframework:spring-core:$springWeb",
-          "org.springframework:spring-web:$springWeb",
-          "org.springframework:spring-webflux:$springWeb",
-          "org.springframework:spring-context:$springWeb",
+          "org.springframework:spring-core:$spring",
+          "org.springframework:spring-web:$spring",
+          "org.springframework:spring-webflux:$spring",
+          "org.springframework:spring-context:$spring",
       ],
       springProvidedWithSpringIntegration: [
           "org.springframework.integration:spring-integration-http:$springIntegration",

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/oas-contract-tests/build.gradle b/oas-contract-tests/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
   ext {
-    springBootVersion = '3.0.0'
+    springBootVersion = '2.3.1.RELEASE'
   }
   repositories {
     mavenCentral()
@@ -22,7 +22,7 @@ dependencies {
   implementation "org.springframework.boot:spring-boot-starter-web"
   implementation "org.springframework.boot:spring-boot-starter-webflux"
   implementation "org.springframework.boot:spring-boot-starter-data-rest"
-  implementation "org.apache.groovy:groovy-all:$groovy"
+  implementation "org.codehaus.groovy:groovy-all:$groovy"
   implementation 'org.slf4j:slf4j-simple:1.7.30'
   implementation "javax.validation:validation-api:$validationApiVersion"
 

diff --git a/springfox-boot-starter/build.gradle b/springfox-boot-starter/build.gradle
@@ -14,10 +14,10 @@ dependencies {
   api libs.spring
 
   compileOnly libs.springProvidedWithMvc
-  compileOnly "org.springframework:spring-webflux:$springWeb"
+  compileOnly "org.springframework:spring-webflux:$spring"
   compileOnly libs.springBootProvided
   compileOnly libs.clientProvided
-  compileOnly "jakarta.servlet:jakarta.servlet-api:$servlet"
-  annotationProcessor "org.springframework.boot:spring-boot-configuration-processor:3.0.0"
+  compileOnly "javax.servlet:javax.servlet-api:$servlet"
+  annotationProcessor "org.springframework.boot:spring-boot-configuration-processor:2.3.1.RELEASE"
 
 }
diff --git a/springfox-core/build.gradle b/springfox-core/build.gradle
@@ -19,7 +19,7 @@ dependencies {
 
   testImplementation libs.test
   testImplementation libs.clientProvided
-  testImplementation "jakarta.servlet:jakarta.servlet-api:$servlet"
+  testImplementation "javax.servlet:javax.servlet-api:$servlet"
 
   testImplementation libs.springProvidedWithMvc
 }
diff --git a/springfox-data-rest/build.gradle b/springfox-data-rest/build.gradle
@@ -21,7 +21,7 @@ dependencies {
   compileOnly libs.springBootProvided
 
   compileOnly libs.springProvidedWithMvc
-  compileOnly "jakarta.servlet:jakarta.servlet-api:$servlet"
+  compileOnly "javax.servlet:javax.servlet-api:$servlet"
 
   testImplementation libs.test
 }

diff --git a/springfox-oas/build.gradle b/springfox-oas/build.gradle
@@ -1,6 +1,6 @@
-//plugins {
-//  id "net.ltgt.apt-idea" version "0.21"
-//}
+plugins {
+  id "net.ltgt.apt-idea" version "0.21"
+}
 
 ext {
   limits = [
@@ -14,6 +14,7 @@ ext {
 }
 
 dependencies {
+  api libs.oasCore
   api project(':springfox-spi')
   api project(':springfox-schema')
   api project(':springfox-core')
@@ -23,15 +24,14 @@ dependencies {
   api project(':springfox-swagger-common')
   api libs.core
   api libs.spring
-  api libs.oasCore
 
   implementation "org.mapstruct:mapstruct:$mapstruct"
   annotationProcessor "org.mapstruct:mapstruct-processor:$mapstruct"
 
   compileOnly libs.springProvidedWithMvc
-  compileOnly "org.springframework:spring-webflux:$springWeb"
+  compileOnly "org.springframework:spring-webflux:$spring"
   compileOnly "org.springframework.boot:spring-boot-autoconfigure:$springBoot"
-  compileOnly "jakarta.servlet:jakarta.servlet-api:$servlet"
+  compileOnly "javax.servlet:javax.servlet-api:$servlet"
   compileOnly libs.clientProvided
 
   testImplementation project(':springfox-core').sourceSets.test.output
@@ -48,5 +48,4 @@ compileJava {
       "-Amapstruct.defaultComponentModel=spring",
       "-Amapstruct.unmappedTargetPolicy=ERROR"
   ]
-
 }
diff --git a/springfox-petstore-webflux/build.gradle b/springfox-petstore-webflux/build.gradle
@@ -2,7 +2,7 @@ dependencies {
   implementation libs.core
   implementation libs.spring
   implementation libs.springProvidedWithMvc
-  compileOnly "org.springframework:spring-webflux:$springWeb"
+  compileOnly "org.springframework:spring-webflux:$spring"
 
   implementation libs.swagger2Core
 

diff --git a/springfox-spring-integration-webmvc/build.gradle b/springfox-spring-integration-webmvc/build.gradle
@@ -20,7 +20,7 @@ dependencies {
 
   compileOnly libs.clientProvided
   compileOnly libs.springProvidedWithSpringIntegration
-  compileOnly "jakarta.servlet:jakarta.servlet-api:$servlet"
+  compileOnly "javax.servlet:javax.servlet-api:$servlet"
 
   testImplementation "javax.validation:validation-api:$validationApiVersion"
   testImplementation project(':springfox-core')
@@ -30,6 +30,6 @@ dependencies {
   testImplementation libs.swagger2Core
   testImplementation project(':springfox-core').sourceSets.test.output
   testImplementation project(':springfox-schema').sourceSets.test.output
-  testImplementation "jakarta.servlet:jakarta.servlet-api:$servlet"
+  testImplementation "javax.servlet:javax.servlet-api:$servlet"
   implementation libs.clientProvided
 }
diff --git a/springfox-spring-web/build.gradle b/springfox-spring-web/build.gradle
@@ -17,7 +17,6 @@ dependencies {
   api "io.github.classgraph:classgraph:$classGraph"
   api libs.core
   api libs.spring
-  api libs.springProvided
 
   compileOnly libs.springProvided
   compileOnly libs.clientProvided
@@ -28,7 +27,7 @@ dependencies {
   testImplementation project(':springfox-core').sourceSets.test.output
   testImplementation project(':springfox-schema').sourceSets.test.output
   testImplementation "javax.validation:validation-api:$validationApiVersion"
-  testImplementation "jakarta.servlet:jakarta.servlet-api:$servlet"
+  testImplementation "javax.servlet:javax.servlet-api:$servlet"
   testImplementation libs.clientProvided
 }
 

diff --git a/springfox-spring-webmvc/build.gradle b/springfox-spring-webmvc/build.gradle
@@ -21,15 +21,15 @@ dependencies {
   compileOnly libs.springProvidedWithMvc
   compileOnly libs.clientProvided
   compileOnly libs.springBootProvided
-  compileOnly "jakarta.servlet:jakarta.servlet-api:$servlet"
+  compileOnly "javax.servlet:javax.servlet-api:$servlet"
 
   testImplementation libs.test
   testImplementation libs.swagger2Core
   testImplementation project(':springfox-spring-web').sourceSets.test.output
   testImplementation project(':springfox-core').sourceSets.test.output
   testImplementation project(':springfox-schema').sourceSets.test.output
   testImplementation "javax.validation:validation-api:$validationApiVersion"
-  testImplementation "jakarta.servlet:jakarta.servlet-api:$servlet"
+  testImplementation "javax.servlet:javax.servlet-api:$servlet"
   testImplementation libs.springProvidedWithMvc
   testImplementation libs.clientProvided
   testImplementation libs.springBootProvided

diff --git a/springfox-swagger-common/build.gradle b/springfox-swagger-common/build.gradle
@@ -22,7 +22,7 @@ dependencies {
 
   compileOnly libs.clientProvided
   compileOnly libs.springProvidedWithMvc
-  compileOnly "jakarta.servlet:jakarta.servlet-api:$servlet"
+  compileOnly "javax.servlet:javax.servlet-api:$servlet"
 
 
   testImplementation project(':springfox-core')
@@ -33,7 +33,7 @@ dependencies {
 
   testImplementation libs.test
   testImplementation "org.skyscreamer:jsonassert:${jsonAssert}"
-  testImplementation "jakarta.servlet:jakarta.servlet-api:$servlet"
+  testImplementation "javax.servlet:javax.servlet-api:$servlet"
   testImplementation libs.clientProvided
   testImplementation libs.springProvidedWithMvc
 }
diff --git a/springfox-swagger-ui/build.gradle b/springfox-swagger-ui/build.gradle
@@ -17,7 +17,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
  */
 plugins {
   id "de.undercouch.download" version "4.1.0"
-  id "com.github.node-gradle.node" version "3.5.0"
+  id "com.github.node-gradle.node" version "2.2.4"
 }
 
 ext {

diff --git a/springfox-swagger1/build.gradle b/springfox-swagger1/build.gradle
@@ -1,6 +1,6 @@
-//plugins {
-//  id "net.ltgt.apt-idea" version "0.21"
-//}
+plugins {
+  id "net.ltgt.apt-idea" version "0.21"
+}
 
 ext {
   limits = [
@@ -42,7 +42,7 @@ dependencies {
   api libs.swagger2Core
   compileOnly libs.springProvidedWithMvc
   compileOnly libs.clientProvided
-  compileOnly "jakarta.servlet:jakarta.servlet-api:$servlet"
+  compileOnly "javax.servlet:javax.servlet-api:$servlet"
 
   implementation "org.mapstruct:mapstruct:$mapstruct"
   annotationProcessor "org.mapstruct:mapstruct-processor:$mapstruct"
@@ -55,12 +55,12 @@ dependencies {
   testImplementation libs.test
   testImplementation libs.springProvidedWithMvc
   testImplementation libs.clientProvided
-  testImplementation "jakarta.servlet:jakarta.servlet-api:$servlet"
+  testImplementation "javax.servlet:javax.servlet-api:$servlet"
 
-  integrationTestImplementation sourceSets.main.output
-  integrationTestImplementation sourceSets.test.output
-//  integrationTestImplementation configurations.testImplementation
-//  integrationTestImplementation configurations.testRuntime
+  integrationTestCompile sourceSets.main.output
+  integrationTestCompile sourceSets.test.output
+  integrationTestCompile configurations.testImplementation
+  integrationTestRuntime configurations.testRuntime
 }
 
 compileJava {

diff --git a/springfox-swagger2/build.gradle b/springfox-swagger2/build.gradle
@@ -1,6 +1,6 @@
-//plugins {
-//  id "net.ltgt.apt-idea" version "0.21"
-//}
+plugins {
+  id "net.ltgt.apt-idea" version "0.21"
+}
 
 ext {
   limits = [
@@ -25,11 +25,11 @@ dependencies {
   api libs.spring
   api libs.swagger2Core
 
-  compileOnly "org.springframework:spring-webflux:$springWeb"
+  compileOnly "org.springframework:spring-webflux:$spring"
   compileOnly libs.springBootProvided
   compileOnly libs.springProvidedWithMvc
   compileOnly libs.clientProvided
-  compileOnly "jakarta.servlet:jakarta.servlet-api:$servlet"
+  compileOnly "javax.servlet:javax.servlet-api:$servlet"
 
 
   implementation "org.mapstruct:mapstruct:$mapstruct"
@@ -41,8 +41,8 @@ dependencies {
   testImplementation project(':springfox-swagger-common').sourceSets.test.output
   testImplementation project(':springfox-spring-web').sourceSets.test.output
   testImplementation project(':springfox-spring-webmvc').sourceSets.test.output
-  testImplementation "jakarta.servlet:jakarta.servlet-api:$servlet"
-  testImplementation "org.springframework:spring-webflux:$springWeb"
+  testImplementation "javax.servlet:javax.servlet-api:$servlet"
+  testImplementation "org.springframework:spring-webflux:$spring"
   testImplementation libs.springProvidedWithMvc
   testImplementation libs.clientProvided
 

diff --git a/swagger-contract-tests-webflux/build.gradle b/swagger-contract-tests-webflux/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
   ext {
-    springBootVersion = '3.0.0'
+    springBootVersion = '2.3.1.RELEASE'
   }
   repositories {
     mavenCentral()