iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[JAVA-18185] Moved spring-boot-modules to jdk9-and-above profile (#13678)

Browse Source 
Co-authored-by: Dhawal Kapil <dhawalkapil@gmail.com>
This commit is contained in:
panos-kakos
2023-03-23 05:38:51 +02:00
committed by GitHub
parent b1162d37b9
commit 78cb526cf0
7 changed files with 53 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-boot-modules/pom.xml
+12
View File
@@ -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>
spring-boot-modules/spring-boot-data/pom.xml
+11 -14
View File
@@ -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>
spring-boot-modules/spring-boot-keycloak/pom.xml
+8 -1
View File
@@ -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>
spring-boot-modules/spring-boot-libraries/src/test/java/com/baeldung/scheduling/shedlock/BaeldungTaskSchedulerIntegrationTest.java
+1 -1
View File
@@ -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);
spring-boot-modules/spring-boot-testing/pom.xml
+11 -2
View File
@@ -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>
spring-boot-modules/spring-caching/pom.xml
+2 -1
View File
@@ -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>