dropping support for JDK 11, midPoint language level is now 17

Evolveum · Jun 28, 2022 · 9a28002 · 9a28002
1 parent e34d90f
commit 9a28002
Show file tree

Hide file tree

Showing 12 changed files with 52 additions and 91 deletions.
diff --git a/dist/javadoc/pom.xml b/dist/javadoc/pom.xml
@@ -27,7 +27,6 @@
         <maven.install.skip>true</maven.install.skip>
         <!-- This enables build without -DskipTests option (e.g. full build). -->
         <maven.test.skip>true</maven.test.skip>
-        <!-- Profile for JDK11 sets additional javadocs options for java 11 (which are removed in java 13+). -->
         <javadoc.options></javadoc.options>
     </properties>
 
@@ -75,7 +74,7 @@
                     <debug>false</debug>
 
                     <!--
-                    TODO: Not usable yet, see https://github.com/asciidoctor/asciidoclet/pull/96 for the progress on JDK 11 support.
+                    TODO: Not usable yet, see https://github.com/asciidoctor/asciidoclet/pull/96 for the progress on JDK 11+ support.
                     Currently fails on:
                     [ERROR] javadoc: error - invalid flag: -author
 
@@ -117,16 +116,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>active-on-jdk-11</id>
-            <activation>
-                <jdk>11</jdk>
-            </activation>
-            <properties>
-                <javadoc.options>--no-module-directories</javadoc.options>
-            </properties>
-        </profile>
-    </profiles>
 </project>
diff --git a/dist/midpoint-api/pom.xml b/dist/midpoint-api/pom.xml
@@ -23,7 +23,6 @@
 
     <properties>
         <maven.test.skip>true</maven.test.skip>
-        <!-- Profile for JDK11 sets additional javadocs options for java 11 (which are removed in java 13+). -->
         <javadoc.options></javadoc.options>
     </properties>
 
@@ -93,7 +92,7 @@
                     <additionalJOption>${javadoc.options}</additionalJOption>
 
                     <!--
-                    TODO: Not usable yet, see https://github.com/asciidoctor/asciidoclet/pull/96 for the progress on JDK 11 support.
+                    TODO: Not usable yet, see https://github.com/asciidoctor/asciidoclet/pull/96 for the progress on JDK 11+ support.
                     Currently fails on:
                     [ERROR] javadoc: error - invalid flag: -author
 
@@ -129,15 +128,4 @@
             </plugin>
         </plugins>
     </build>
-    <profiles>
-        <profile>
-            <id>active-on-jdk-11</id>
-            <activation>
-                <jdk>11</jdk>
-            </activation>
-            <properties>
-                <javadoc.options>--no-module-directories</javadoc.options>
-            </properties>
-        </profile>
-    </profiles>
 </project>
diff --git a/infra/schema-pure-jaxb/pom.xml b/infra/schema-pure-jaxb/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright (c) 2010-2017 Evolveum and contributors
+  ~ Copyright (C) 2010-2022 Evolveum and contributors
   ~
   ~ This work is dual-licensed under the Apache License 2.0
   ~ and European Union Public License. See LICENSE file for details.
@@ -100,7 +100,6 @@
                     <catalog>${basedir}/src/compile/resources/catalog.xml</catalog>
                     <laxSchemaValidation>true</laxSchemaValidation>
                     <verbose>false</verbose>
-                    <!-- JDK 11 does not need exclusions of imported files like JDK 8 -->
                 </configuration>
                 <dependencies>
                     <!--

diff --git a/model/model-common/pom.xml b/model/model-common/pom.xml
@@ -154,53 +154,46 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+
+        <!--
+        JavaScript/ECMAScript is optional in JDK 15+.
+        If desired the JAR from this dependency can be provided in ${midpoint.home}/lib.
+        For more see: https://docs.evolveum.com/midpoint/reference/expressions/expressions/script/javascript/
+        -->
+        <dependency>
+            <groupId>org.openjdk.nashorn</groupId>
+            <artifactId>nashorn-core</artifactId>
+            <version>15.3</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
-    <profiles>
-        <profile>
-            <!--
-            JavaScript/ECMAScript is optional. It is not provided with newer JDKs or distributed with midPoint.
-            If desired the JAR from this dependency can be provided in ${midpoint.home}/lib.
-            For more see: https://docs.evolveum.com/midpoint/reference/expressions/expressions/script/javascript/
-            -->
-            <id>javascript</id>
-            <activation>
-                <jdk>[15,)</jdk>
-            </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <!-- This one is needed by GUI too, so midPoint brings it in. -->
-                    <dependency>
-                        <groupId>org.ow2.asm</groupId>
-                        <artifactId>asm</artifactId>
-                        <version>${asm.version}</version>
-                    </dependency>
-                    <!-- The rest must be provided in midpoint.home manually if we want JavaScript/ECMAScript. -->
-                    <dependency>
-                        <groupId>org.ow2.asm</groupId>
-                        <artifactId>asm-commons</artifactId>
-                        <version>${asm.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.ow2.asm</groupId>
-                        <artifactId>asm-tree</artifactId>
-                        <version>${asm.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.ow2.asm</groupId>
-                        <artifactId>asm-util</artifactId>
-                        <version>${asm.version}</version>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-            <dependencies>
-                <dependency>
-                    <groupId>org.openjdk.nashorn</groupId>
-                    <artifactId>nashorn-core</artifactId>
-                    <version>15.3</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
+    <!-- For JavaScript test dependency only, that's why it's not in main POM. -->
+    <dependencyManagement>
+        <dependencies>
+            <!-- This one is needed by GUI too, so midPoint brings it in. -->
+            <dependency>
+                <groupId>org.ow2.asm</groupId>
+                <artifactId>asm</artifactId>
+                <version>${asm.version}</version>
+            </dependency>
+            <!-- The rest must be provided in midpoint.home manually if we want JavaScript/ECMAScript. -->
+            <dependency>
+                <groupId>org.ow2.asm</groupId>
+                <artifactId>asm-commons</artifactId>
+                <version>${asm.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ow2.asm</groupId>
+                <artifactId>asm-tree</artifactId>
+                <version>${asm.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ow2.asm</groupId>
+                <artifactId>asm-util</artifactId>
+                <version>${asm.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
 </project>
diff --git a/pom.xml b/pom.xml
@@ -165,7 +165,7 @@
         <!-- Build system options -->
         <!-- Encoding for both sources and resources -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.source.version>11</project.source.version>
+        <project.source.version>17</project.source.version>
         <project.build.locale>en_US</project.build.locale>
         <ansi.color>true</ansi.color>
         <verbose.jaxb2>false</verbose.jaxb2>
@@ -1797,12 +1797,6 @@
                 </configuration>
             </plugin>
 
-            <plugin>
-                <groupId>pl.project13.maven</groupId>
-                <artifactId>git-commit-id-plugin</artifactId>
-                <version>3.0.1</version>
-                <!-- Used in system-init module. -->
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
@@ -2034,7 +2028,7 @@
                                     <pluginExecutionFilter>
                                         <groupId>com.lukegb.mojo</groupId>
                                         <artifactId>gitdescribe-maven-plugin</artifactId>
-                                        <versionRange>[3.0,)</versionRange>
+                                        <versionRange>3.0</versionRange>
                                         <goals>
                                             <goal>gitdescribe</goal>
                                         </goals>

diff --git a/tools/jenkins/midpoint-compile-pipeline b/tools/jenkins/midpoint-compile-pipeline
@@ -20,7 +20,7 @@ podTemplate(
                         resourceRequestMemory: '1Gi',
                         resourceLimitMemory: '1Gi'),
                 containerTemplate(name: 'maven',
-                        image: params.BUILDER_IMAGE ?: 'maven:3.8.5-openjdk-11',
+                        image: params.BUILDER_IMAGE ?: 'maven:3.8.5-openjdk-17',
                         runAsUser: '0',
                         ttyEnabled: true,
                         command: 'cat',

diff --git a/tools/jenkins/midpoint-conntest-pipeline b/tools/jenkins/midpoint-conntest-pipeline
@@ -23,7 +23,7 @@ spec:
                         resourceRequestCpu: '900m',
                         resourceRequestMemory: '1Gi'),
                 containerTemplate(name: 'maven',
-                        image: 'maven:3.8.5-openjdk-11',
+                        image: params.BUILDER_IMAGE ?: 'maven:3.8.5-openjdk-17',
                         runAsUser: '0',
                         ttyEnabled: true,
                         command: 'cat',

diff --git a/tools/jenkins/midpoint-main-generic-pg-pipeline b/tools/jenkins/midpoint-main-generic-pg-pipeline
@@ -36,7 +36,7 @@ podTemplate(
                         ],
                         ports: [portMapping(name: 'postgres', containerPort: 5432)]),
                 containerTemplate(name: 'maven',
-                        image: params.BUILDER_IMAGE ?: 'maven:3.8.5-openjdk-11',
+                        image: params.BUILDER_IMAGE ?: 'maven:3.8.5-openjdk-17',
                         runAsUser: '0',
                         ttyEnabled: true,
                         command: 'cat',

diff --git a/tools/jenkins/midpoint-main-generic-sql-server-pipeline b/tools/jenkins/midpoint-main-generic-sql-server-pipeline
@@ -44,7 +44,7 @@ podTemplate(
                         // TODO needed? ports: [portMapping(name: 'mssql', containerPort: 5432)]
                 ),
                 containerTemplate(name: 'maven',
-                        image: params.BUILDER_IMAGE ?: 'maven:3.8.5-openjdk-11',
+                        image: params.BUILDER_IMAGE ?: 'maven:3.8.5-openjdk-17',
                         runAsUser: '0',
                         ttyEnabled: true,
                         command: 'cat',

diff --git a/tools/jenkins/midpoint-main-nativepg-pipeline b/tools/jenkins/midpoint-main-nativepg-pipeline
@@ -36,7 +36,7 @@ podTemplate(
                         ],
                         ports: [portMapping(name: 'postgres', containerPort: 5432)]),
                 containerTemplate(name: 'maven',
-                        image: params.BUILDER_IMAGE ?: 'maven:3.8.5-openjdk-11',
+                        image: params.BUILDER_IMAGE ?: 'maven:3.8.5-openjdk-17',
                         runAsUser: '0',
                         ttyEnabled: true,
                         command: 'cat',

diff --git a/tools/jenkins/midpoint-main-pipeline b/tools/jenkins/midpoint-main-pipeline
@@ -22,7 +22,7 @@ podTemplate(
                         resourceRequestMemory: '1Gi',
                         resourceLimitMemory: '1Gi'),
                 containerTemplate(name: 'maven',
-                        image: params.BUILDER_IMAGE ?: 'maven:3.8.5-openjdk-11',
+                        image: params.BUILDER_IMAGE ?: 'maven:3.8.5-openjdk-17',
                         runAsUser: '0',
                         ttyEnabled: true,
                         command: 'cat',

diff --git a/tools/jenkins/midpoint-quick-pipeline b/tools/jenkins/midpoint-quick-pipeline
@@ -23,7 +23,7 @@ podTemplate(
                         resourceRequestMemory: '1Gi',
                         resourceLimitMemory: '1Gi'),
                 containerTemplate(name: 'maven',
-                        image: params.BUILDER_IMAGE ?: 'maven:3.8.5-openjdk-11',
+                        image: params.BUILDER_IMAGE ?: 'maven:3.8.5-openjdk-17',
                         runAsUser: '0',
                         ttyEnabled: true,
                         command: 'cat',