Upgrade spring-cloud-contract, spring-cloud-data-flow to JDK 17 (#14263)
* Upgrade spring-cloud-contract, spring-cloud-data-flow to JDK 17 * JAVA-22207 Refactored groovy version
This commit is contained in:
Anastasios Ioannidis
GitHub
parent
936a915ad4
commit
c0171ff7ce
2
pom.xml
2
pom.xml
|
|
@ -730,6 +730,8 @@
|
|||
<module>spring-batch-2</module>
|
||||
<module>spring-boot-rest</module>
|
||||
<module>spring-drools</module>
|
||||
<module>spring-cloud-modules/spring-cloud-contract</module>
|
||||
<module>spring-cloud-modules/spring-cloud-data-flow</module>
|
||||
<module>spring-exceptions</module>
|
||||
<module>spring-jenkins-pipeline</module>
|
||||
<module>spring-core</module>
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
<module>spring-cloud-aws</module>
|
||||
<module>spring-cloud-consul</module>
|
||||
<module>spring-cloud-zuul-eureka-integration</module>
|
||||
<module>spring-cloud-contract</module>
|
||||
<!-- <module>spring-cloud-contract</module>-->
|
||||
<module>spring-cloud-kubernetes</module>
|
||||
<module>spring-cloud-open-service-broker</module>
|
||||
<module>spring-cloud-archaius</module>
|
||||
|
|
@ -52,7 +52,7 @@
|
|||
<module>spring-cloud-dapr</module>
|
||||
<module>spring-cloud-docker</module>
|
||||
<module>spring-cloud-bus</module>
|
||||
<module>spring-cloud-data-flow</module>
|
||||
<!-- <module>spring-cloud-data-flow</module>-->
|
||||
<module>spring-cloud-sleuth</module>
|
||||
<module>spring-cloud-open-telemetry</module>
|
||||
<module>spring-cloud-azure</module>
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@
|
|||
</dependencyManagement>
|
||||
|
||||
<properties>
|
||||
<spring-cloud.version>2.1.1.RELEASE</spring-cloud.version>
|
||||
<spring-cloud.version>4.0.3</spring-cloud.version>
|
||||
<spring-boot.version>2.1.4.RELEASE</spring-boot.version>
|
||||
<log4j2.version>2.17.1</log4j2.version>
|
||||
</properties>
|
||||
|
|
|
|||
|
|
@ -40,6 +40,16 @@
|
|||
<version>${project.parent.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.rest-assured</groupId>
|
||||
<artifactId>rest-assured</artifactId>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>org.codehaus.groovy</groupId>
|
||||
<artifactId>groovy-xml</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
</project>
|
||||
|
|
@ -29,6 +29,16 @@
|
|||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-data-rest</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.rest-assured</groupId>
|
||||
<artifactId>rest-assured</artifactId>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>org.codehaus.groovy</groupId>
|
||||
<artifactId>groovy-xml</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
|
|
@ -36,7 +46,7 @@
|
|||
<plugin>
|
||||
<groupId>org.springframework.cloud</groupId>
|
||||
<artifactId>spring-cloud-contract-maven-plugin</artifactId>
|
||||
<version>${spring-cloud.version}</version>
|
||||
<version>2.1.1.RELEASE</version>
|
||||
<extensions>true</extensions>
|
||||
<configuration>
|
||||
<baseClassForTests>com.baeldung.spring.cloud.springcloudcontractproducer.BaseTestClass
|
||||
|
|
@ -46,8 +56,4 @@
|
|||
</plugins>
|
||||
</build>
|
||||
|
||||
<properties>
|
||||
<spring-cloud.version>2.1.1.RELEASE</spring-cloud.version>
|
||||
</properties>
|
||||
|
||||
</project>
|
||||
|
|
@ -17,13 +17,6 @@
|
|||
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-dependencies</artifactId>
|
||||
<version>${spring-boot.version}</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.cloud</groupId>
|
||||
<artifactId>spring-cloud-dataflow-dependencies</artifactId>
|
||||
|
|
@ -31,13 +24,6 @@
|
|||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.cloud</groupId>
|
||||
<artifactId>spring-cloud-dependencies</artifactId>
|
||||
<version>${spring-cloud-dependencies.version}</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
|
||||
|
|
@ -45,6 +31,7 @@
|
|||
<dependency>
|
||||
<groupId>org.springframework.cloud</groupId>
|
||||
<artifactId>spring-cloud-starter-dataflow-server-local</artifactId>
|
||||
<version>1.7.4.RELEASE</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.hibernate</groupId>
|
||||
|
|
@ -62,13 +49,22 @@
|
|||
<version>${byte-buddy.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.codehaus.groovy</groupId>
|
||||
<artifactId>groovy</artifactId>
|
||||
<version>${groovy.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.session</groupId>
|
||||
<artifactId>spring-session-data-redis</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<properties>
|
||||
<spring-cloud-dataflow-dependencies.version>1.3.1.RELEASE</spring-cloud-dataflow-dependencies.version>
|
||||
<spring-cloud-dependencies.version>Edgware.SR6</spring-cloud-dependencies.version>
|
||||
<hibernate.compatible.version>5.2.12.Final</hibernate.compatible.version>
|
||||
<spring-boot.version>1.5.22.RELEASE</spring-boot.version>
|
||||
<spring-cloud-dataflow-dependencies.version>2.0.0.RELEASE</spring-cloud-dataflow-dependencies.version>
|
||||
<hibernate.compatible.version>5.6.0.Final</hibernate.compatible.version>
|
||||
<spring-boot.version>2.1.4.RELEASE</spring-boot.version>
|
||||
<groovy.version>3.0.8</groovy.version>
|
||||
</properties>
|
||||
|
||||
</project>
|
||||
Loading…
Reference in New Issue