You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2019/07/15 17:01:09 UTC

[directory-fortress-realm] branch master updated: FC-230 - Support Java 11+

This is an automated email from the ASF dual-hosted git repository.

smckinney pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-fortress-realm.git


The following commit(s) were added to refs/heads/master by this push:
     new 5f87982  FC-230 - Support Java 11+
     new 613b509  Merge remote-tracking branch 'origin/master'
5f87982 is described below

commit 5f87982228ad85fdb49cfd1c8ce0a1b0cd7a3a63
Author: Shawn McKinney <sm...@apache.org>
AuthorDate: Mon Jul 15 11:00:44 2019 -0600

    FC-230 - Support Java 11+
---
 impl/pom.xml  | 10 +---------
 pom.xml       | 12 +++++++++---
 proxy/pom.xml |  9 ---------
 3 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/impl/pom.xml b/impl/pom.xml
index b97446c..3a31e03 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -61,15 +61,7 @@
   </dependencies>
 
   <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
+   <plugins>
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
diff --git a/pom.xml b/pom.xml
index 930422c..9807fc3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,6 +85,12 @@
   <!-- The used properties for this project                   -->
   <!-- ====================================================== -->
   <properties>
+    <version>8</version>
+<!--
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+-->
+
     <additionalparam>-Xdoclint:none</additionalparam>
     <projectName>apache-directory-fortress-realm</projectName>
     <distMgmtSiteUrl>
@@ -148,13 +154,13 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
         </plugin>
-        
+
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.8.0</version>
           <configuration>
-            <source>1.8</source>
-            <target>1.8</target>
+            <release>${version}</release>
             <optimize>true</optimize>
             <encoding>ISO-8859-1</encoding>
           </configuration>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 7ac1e86..2381ac7 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -43,15 +43,6 @@
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
       </plugin>
     </plugins>