[course issue 36] deal with jdk 8,11,17 compatibility

vmware-tanzu-learning · Mar 23, 2022 · 204e210 · 204e210
1 parent a850bb8
commit 204e210
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 10 deletions.
diff --git a/.github/workflows/test-java-8.yml b/.github/workflows/test-java-8.yml
@@ -15,11 +15,6 @@ jobs:
     - name: Build and test with Maven
       run: |
         cd lab
-        sed -i 's/<java.version>11<\/java.version>/<java.version>1.8<\/java.version>/g' ./pom.xml
-        sed -i 's/<java.version>11<\/java.version>/<java.version>1.8<\/java.version>/g' ./30-jdbc-boot-solution/pom.xml
-        sed -i 's/<java.version>11<\/java.version>/<java.version>1.8<\/java.version>/g' ./33-autoconfig-helloworld/pom.xml
-        sed -i 's/<java.version>11<\/java.version>/<java.version>1.8<\/java.version>/g' ./33-autoconfig-helloworld-solution/pom.xml
-        sed -i "s/sourceCompatibility = '11'/sourceCompatibility = '8'/g" ./build.gradle
         ./mvnw clean package
     - name: Build and test with Gradle
       run: |

diff --git a/lab/30-jdbc-boot-solution/pom.xml b/lab/30-jdbc-boot-solution/pom.xml
@@ -21,7 +21,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-		<java.version>11</java.version>
+		<java.version>8</java.version>
 
 		<!-- Without this, Eclipse will flag an error on pom.xml -->
         <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>

diff --git a/lab/33-autoconfig-helloworld-solution/pom.xml b/lab/33-autoconfig-helloworld-solution/pom.xml
@@ -12,7 +12,7 @@
     </parent>
     <properties>
 
-        <java.version>11</java.version>
+        <java.version>8</java.version>
 
         <!-- Without this, Eclipse will flag an error on pom.xml -->
         <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>

diff --git a/lab/33-autoconfig-helloworld/pom.xml b/lab/33-autoconfig-helloworld/pom.xml
@@ -12,7 +12,7 @@
     </parent>
     <properties>
 
-        <java.version>11</java.version>
+        <java.version>8</java.version>
 
         <!-- Without this, Eclipse will flag an error on pom.xml -->
         <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>

diff --git a/lab/build.gradle b/lab/build.gradle
@@ -49,7 +49,7 @@ subprojects {
         }
     }
 
-    sourceCompatibility = '11'
+    sourceCompatibility = '8'
 
     tasks.withType(JavaCompile) {
         options.encoding = 'UTF-8'

diff --git a/lab/pom.xml b/lab/pom.xml
@@ -19,7 +19,7 @@
         <hibernate.jmx.version>3.5.6-Final</hibernate.jmx.version>
         <jamon.version>2.82</jamon.version>
 
-        <java.version>11</java.version>
+        <java.version>8</java.version>
 
         <!-- Enable maven support for Servlet 3 - no web.xml -->
         <failOnMissingWebXml>false</failOnMissingWebXml>