You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ah...@apache.org on 2019/09/17 11:09:27 UTC

[commons-rng] 04/04: Moved downgrade of felix version to the pre-Java 8 profile.

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

aherbert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-rng.git

commit c4f0d3c15be28cd9da553d1dba2571415105569f
Author: aherbert <ah...@apache.org>
AuthorDate: Tue Sep 17 12:09:19 2019 +0100

    Moved downgrade of felix version to the pre-Java 8 profile.
---
 pom.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index b6c54f1..e45ed01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,8 +67,6 @@
        jxr:aggregate. If compile is forked it fails when building the Java 9 modules that
        depend on other packages. -->
     <commons.jxr.version>2.5</commons.jxr.version>
-    <!-- Fix to build on JDK 7: version 4.0.0 requires Java 8. -->
-    <commons.felix.version>3.5.1</commons.felix.version>
 
     <commons.jacoco.haltOnFailure>false</commons.jacoco.haltOnFailure>
 
@@ -497,13 +495,18 @@
         </plugins>
       </build>
     </profile>
-    <!-- Profile to alter default Maven goal as it uses checks from Java 8+ plugins. -->
+    <!-- Profile for pre-Java 8 builds. -->
     <profile>
       <id>pre-jdk8</id>
       <activation>
         <jdk>[1.6,1.8)</jdk>
       </activation>
+      <properties>
+        <!-- Override parent version 4.x which requires Java 8. -->
+        <commons.felix.version>3.5.1</commons.felix.version>
+      </properties>
       <build>
+        <!-- Alter default goal as it uses checks from Java 8 plugins. -->
         <defaultGoal>clean verify</defaultGoal>
       </build>
     </profile>