fix(ci): fix build for java 17

apache · Nov 17, 2021 · f4c2ccf · f4c2ccf
1 parent ace1c30
commit f4c2ccf
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 35 deletions.
diff --git a/.mvn/jvm.config b/.mvn/jvm.config
@@ -0,0 +1 @@
+--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
diff --git a/code-generation/language-java/pom.xml b/code-generation/language-java/pom.xml
@@ -76,40 +76,6 @@
     </plugins>
   </build>
 
-  <profiles>
-    <profile>
-      <id>java8</id>
-      <activation>
-        <jdk>1.8</jdk>
-      </activation>
-      <!-- TODO: fix build for java 8-->
-    </profile>
-    <profile>
-      <id>java17</id>
-      <!-- NOTE: activate manually if you have a 17 version installed as this is getting picked up by the invoker plugin -->
-      <activation>
-        <jdk>[17,)</jdk>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-invoker-plugin</artifactId>
-            <configuration>
-              <mavenOpts>
-                --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
-                --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
-                --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
-                --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
-                --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
-              </mavenOpts>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
   <dependencies>
     <!-- We are using the Freemarker module to generate Java code -->
     <dependency>

diff --git a/pom.xml b/pom.xml
@@ -794,7 +794,7 @@
             <!-- Exclude files generated by the go build system -->
             <exclude>**/go.sum</exclude>
 
-            <!--exclude>plc4go/**</exclude-->
+            <exclude>.mvn/**</exclude>
           </excludes>
         </configuration>
       </plugin>
@@ -1646,6 +1646,40 @@
         </plugins>
       </build>
     </profile>
+
+    <!-- Java 8 specific fixes-->
+    <profile>
+      <id>java8</id>
+      <activation>
+        <jdk>1.8</jdk>
+      </activation>
+      <!-- TODO: fix build for java 8-->
+    </profile>
+    <!-- Java 17 specific fixes-->
+    <profile>
+      <id>java17</id>
+      <!-- NOTE: activate manually if you have a 17 version installed as this is getting picked up by the invoker plugin -->
+      <activation>
+        <jdk>[17,)</jdk>
+      </activation>
+      <!--build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-invoker-plugin</artifactId>
+            <configuration>
+              <mavenOpts>
+                - -add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
+                - -add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
+                - -add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
+                - -add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
+                - -add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
+              </mavenOpts>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build-->
+    </profile>
   </profiles>
 
 </project>