Merge pull request #311 from arjantijms/poms_gf621_jdk11

eclipse-ee4j · Sep 20, 2021 · 4512917 · 4512917
2 parents 8685562 + b450517
commit 4512917
Show file tree

Hide file tree

Showing 7 changed files with 221 additions and 35 deletions.
diff --git a/pom.xml b/pom.xml
@@ -2,6 +2,7 @@
 <!--
 
     Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2021 Contributors to Eclipse Foundation.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -77,8 +78,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.release>11</maven.compiler.release>
     </properties>
 
     <dependencies>
@@ -174,14 +174,24 @@
                         </execution>
                     </executions>
                 </plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-war-plugin</artifactId>
+						<version>3.3.2</version>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-compiler-plugin</artifactId>
+						<version>3.8.1</version>
+					</plugin>
             </plugins>
         </pluginManagement>
         <plugins>
-            <!-- Sets minimal Maven version to 3.5.4 -->
+            <!-- Sets minimal Maven version to 3.6.3 -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.0.0-M3</version>
+                <version>3.0.0</version>
                 <executions>
                     <execution>
                         <id>enforce-maven</id>
@@ -191,7 +201,7 @@
                         <configuration>
                             <rules>
                                 <requireMavenVersion>
-                                    <version>3.5.4</version>
+                                    <version>3.6.3</version>
                                 </requireMavenVersion>
                             </rules>
                         </configuration>

diff --git a/test/app-custom-identity-store-handler/pom.xml b/test/app-custom-identity-store-handler/pom.xml
@@ -43,7 +43,7 @@
         <dependency>
             <groupId>com.unboundid</groupId>
             <artifactId>unboundid-ldapsdk</artifactId>
-            <version>4.0.4</version>
+            <version>6.0.1</version>
         </dependency>
     </dependencies>
 

diff --git a/test/app-db/pom.xml b/test/app-db/pom.xml
@@ -43,7 +43,6 @@
          <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.4.196</version>
         </dependency>
     </dependencies>
 

diff --git a/test/app-ldap/pom.xml b/test/app-ldap/pom.xml
@@ -43,7 +43,6 @@
         <dependency>
             <groupId>com.unboundid</groupId>
             <artifactId>unboundid-ldapsdk</artifactId>
-            <version>4.0.4</version>
         </dependency>
     </dependencies>
 

diff --git a/test/app-ldap2/pom.xml b/test/app-ldap2/pom.xml
@@ -44,7 +44,6 @@
          <dependency>
             <groupId>com.unboundid</groupId>
             <artifactId>unboundid-ldapsdk</artifactId>
-            <version>4.0.4</version>
         </dependency>
     </dependencies>
 

diff --git a/test/app-ldap3/pom.xml b/test/app-ldap3/pom.xml
@@ -44,7 +44,6 @@
          <dependency>
             <groupId>com.unboundid</groupId>
             <artifactId>unboundid-ldapsdk</artifactId>
-            <version>4.0.4</version>
         </dependency>
     </dependencies>