[JAVA-18185] Moved spring-boot-modules to jdk9-and-above profile (#13678)
Co-authored-by: Dhawal Kapil <dhawalkapil@gmail.com>
This commit is contained in:
panos-kakos
GitHub
parent
b1162d37b9
commit
78cb526cf0
31
pom.xml
31
pom.xml
@ -405,7 +405,6 @@
|
||||
<module>spring-aop</module>
|
||||
|
||||
<module>spring-bom</module>
|
||||
<module>spring-boot-modules</module>
|
||||
<module>spring-cloud-modules</module>
|
||||
<!-- <module>spring-cloud-cli</module> --> <!-- Not a maven project -->
|
||||
|
||||
@ -487,10 +486,8 @@
|
||||
<module>libraries-4</module>
|
||||
<module>libraries-5</module>
|
||||
<module>libraries-6</module>
|
||||
<module>spring-boot-modules/spring-boot-react</module>
|
||||
|
||||
|
||||
<module>vaadin</module>
|
||||
|
||||
</modules>
|
||||
</profile>
|
||||
|
||||
@ -591,7 +588,6 @@
|
||||
<module>spring-4</module>
|
||||
|
||||
<module>spring-bom</module>
|
||||
<module>spring-boot-modules</module>
|
||||
<module>spring-cloud-modules</module>
|
||||
<!-- <module>spring-cloud-cli</module> --> <!-- Not a maven project -->
|
||||
|
||||
@ -665,7 +661,7 @@
|
||||
<module>libraries-4</module>
|
||||
<module>libraries-5</module>
|
||||
<module>libraries-6</module>
|
||||
<module>spring-boot-modules/spring-boot-react</module>
|
||||
|
||||
<module>vaadin</module>
|
||||
</modules>
|
||||
|
||||
@ -732,6 +728,7 @@
|
||||
</build>
|
||||
|
||||
<modules>
|
||||
<module>spring-boot-modules</module>
|
||||
<module>apache-httpclient</module>
|
||||
<module>apache-httpclient4</module>
|
||||
<module>apache-httpclient-2</module>
|
||||
@ -843,11 +840,6 @@
|
||||
<module>persistence-modules/spring-data-cassandra-2</module>
|
||||
<module>persistence-modules/spring-data-jpa-repo-3</module>
|
||||
<module>quarkus-modules</module>
|
||||
<module>spring-boot-modules/spring-boot-cassandre</module>
|
||||
<module>spring-boot-modules/spring-boot-3</module>
|
||||
<module>spring-boot-modules/spring-boot-3-native</module>
|
||||
<module>spring-boot-modules/spring-boot-3-observation</module>
|
||||
<module>spring-boot-modules/spring-boot-3-test-pitfalls</module>
|
||||
<module>spring-reactive-modules</module>
|
||||
<module>spring-swagger-codegen/custom-validations-opeanpi-codegen</module>
|
||||
<module>testing-modules/testing-assertions</module>
|
||||
@ -948,7 +940,6 @@
|
||||
<module>spring-5-webflux-2</module>
|
||||
<module>spring-activiti</module>
|
||||
<module>spring-batch-2</module>
|
||||
<module>spring-boot-modules/spring-caching-2</module>
|
||||
<module>spring-core-2</module>
|
||||
<module>spring-core-3</module>
|
||||
<module>spring-core-5</module>
|
||||
@ -970,9 +961,9 @@
|
||||
<module>xstream</module>
|
||||
<module>webrtc</module>
|
||||
<module>persistence-modules/java-mongodb</module>
|
||||
|
||||
<module>messaging-modules</module>
|
||||
<module>spring-boot-modules/spring-boot-redis</module>
|
||||
<module>spring-security-modules/spring-security-saml2</module>
|
||||
|
||||
<module>persistence-modules/questdb</module>
|
||||
</modules>
|
||||
|
||||
@ -1007,6 +998,7 @@
|
||||
</build>
|
||||
|
||||
<modules>
|
||||
<module>spring-boot-modules</module>
|
||||
<module>apache-httpclient</module>
|
||||
<module>apache-httpclient4</module>
|
||||
<module>apache-httpclient-2</module>
|
||||
@ -1117,11 +1109,6 @@
|
||||
<module>persistence-modules/spring-data-cassandra-2</module>
|
||||
<module>persistence-modules/spring-data-jpa-repo-3</module>
|
||||
<module>quarkus-modules</module>
|
||||
<module>spring-boot-modules/spring-boot-cassandre</module>
|
||||
<module>spring-boot-modules/spring-boot-3</module>
|
||||
<module>spring-boot-modules/spring-boot-3-native</module>
|
||||
<module>spring-boot-modules/spring-boot-3-observation</module>
|
||||
<module>spring-boot-modules/spring-boot-3-test-pitfalls</module>
|
||||
<module>spring-reactive-modules</module>
|
||||
<module>spring-swagger-codegen/custom-validations-opeanpi-codegen</module>
|
||||
<module>testing-modules/testing-assertions</module>
|
||||
@ -1224,7 +1211,6 @@
|
||||
<module>spring-5-webflux-2</module>
|
||||
<module>spring-activiti</module>
|
||||
<module>spring-batch-2</module>
|
||||
<module>spring-boot-modules/spring-caching-2</module>
|
||||
<module>spring-core-2</module>
|
||||
<module>spring-core-3</module>
|
||||
<module>spring-core-5</module>
|
||||
@ -1245,10 +1231,9 @@
|
||||
<module>xstream</module>
|
||||
<module>webrtc</module>
|
||||
<module>persistence-modules/java-mongodb</module>
|
||||
<module>libraries-2</module>
|
||||
<module>libraries-2</module>
|
||||
<module>messaging-modules</module>
|
||||
<module>spring-boot-modules/spring-boot-redis</module>
|
||||
<module>spring-security-modules/spring-security-saml2</module>
|
||||
|
||||
<module>persistence-modules/questdb</module>
|
||||
</modules>
|
||||
|
||||
|
||||
@ -85,6 +85,14 @@
|
||||
<module>spring-boot-validation</module>
|
||||
<module>spring-boot-data-3</module>
|
||||
<module>spring-caching</module>
|
||||
<module>spring-caching-2</module>
|
||||
<module>spring-boot-redis</module>
|
||||
<module>spring-boot-cassandre</module>
|
||||
<module>spring-boot-react</module>
|
||||
<module>spring-boot-3</module>
|
||||
<module>spring-boot-3-native</module>
|
||||
<module>spring-boot-3-observation</module>
|
||||
<module>spring-boot-3-test-pitfalls</module>
|
||||
</modules>
|
||||
|
||||
<dependencyManagement>
|
||||
@ -106,4 +114,8 @@
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
|
||||
<properties>
|
||||
<maven-war-plugin.version>3.3.2</maven-war-plugin.version>
|
||||
</properties>
|
||||
|
||||
</project>
|
||||
|
||||
@ -45,6 +45,16 @@
|
||||
<artifactId>spring-boot-starter-test</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.openjfx</groupId>
|
||||
<artifactId>javafx-controls</artifactId>
|
||||
<version>${javafx.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.openjfx</groupId>
|
||||
<artifactId>javafx-fxml</artifactId>
|
||||
<version>${javafx.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
@ -89,10 +99,6 @@
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<configuration>
|
||||
<source>${source.version}</source>
|
||||
<target>${target.version}</target>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
@ -113,10 +119,6 @@
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<configuration>
|
||||
<source>${source.version}</source>
|
||||
<target>${target.version}</target>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
@ -148,10 +150,6 @@
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<configuration>
|
||||
<source>${source.version}</source>
|
||||
<target>${target.version}</target>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
@ -160,8 +158,7 @@
|
||||
|
||||
<properties>
|
||||
<git-commit-id-plugin.version>2.2.4</git-commit-id-plugin.version>
|
||||
<source.version>1.8</source.version>
|
||||
<target.version>1.8</target.version>
|
||||
<javafx.version>19</javafx.version>
|
||||
</properties>
|
||||
|
||||
</project>
|
||||
@ -66,6 +66,11 @@
|
||||
<artifactId>spring-security-test</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.glassfish.jaxb</groupId>
|
||||
<artifactId>jaxb-runtime</artifactId>
|
||||
<version>${jaxb-runtime.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
@ -77,7 +82,7 @@
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>jaxb2-maven-plugin</artifactId>
|
||||
<version>2.3.1</version>
|
||||
<version>${jaxb2-maven-plugin.version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>xjc</id>
|
||||
@ -99,6 +104,8 @@
|
||||
|
||||
<properties>
|
||||
<start-class>com.baeldung.keycloak.SpringBoot</start-class>
|
||||
<jaxb-runtime.version>4.0.0</jaxb-runtime.version>
|
||||
<jaxb2-maven-plugin.version>2.5.0</jaxb2-maven-plugin.version>
|
||||
</properties>
|
||||
|
||||
</project>
|
||||
@ -30,7 +30,7 @@ public class BaeldungTaskSchedulerIntegrationTest {
|
||||
taskScheduler.scheduledTask();
|
||||
System.out.flush();
|
||||
String expected = "Running ShedLock task\n";
|
||||
assertThat(consoleOutput.toString()).isEqualTo(expected);
|
||||
assertThat(consoleOutput.toString()).hasToString(expected);
|
||||
|
||||
//restore the old out
|
||||
System.setOut(old);
|
||||
|
||||
@ -131,6 +131,14 @@
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
<targetBytecode>17</targetBytecode>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>${maven-compiler-plugin.version}</version>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
@ -139,8 +147,9 @@
|
||||
<!-- The main class to start by executing java -jar -->
|
||||
<start-class>com.baeldung.boot.Application</start-class>
|
||||
<git-commit-id-plugin.version>2.2.4</git-commit-id-plugin.version>
|
||||
<spock.version>1.2-groovy-2.4</spock.version>
|
||||
<gmavenplus-plugin.version>1.6</gmavenplus-plugin.version>
|
||||
<spock.version>2.4-M1-groovy-4.0</spock.version>
|
||||
<gmavenplus-plugin.version>2.0.0</gmavenplus-plugin.version>
|
||||
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
|
||||
<redis.version>0.7.2</redis.version>
|
||||
<spring-boot.version>2.5.0</spring-boot.version>
|
||||
<log4j2.version>2.17.1</log4j2.version>
|
||||
|
||||
@ -64,7 +64,7 @@
|
||||
<dependency>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
<version>1.18.12</version>
|
||||
<version>${lombok.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
@ -78,6 +78,7 @@
|
||||
|
||||
<properties>
|
||||
<ehcache.version>3.5.2</ehcache.version>
|
||||
<lombok.version>1.18.26</lombok.version>
|
||||
</properties>
|
||||
|
||||
</project>
|
||||
Loading…
x
Reference in New Issue
Block a user