ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject ant git commit: exclude modules package from mvn when not using Java9
Date Sun, 16 Dec 2018 10:04:08 GMT
Repository: ant
Updated Branches:
  refs/heads/master 5fe086f0d -> 876376a8d


exclude modules package from mvn when not using Java9

Many thanks to Gintas (@twogee) for catching this


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/876376a8
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/876376a8
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/876376a8

Branch: refs/heads/master
Commit: 876376a8d1eaea4b181941f7fdc823d0070c9d7f
Parents: 5fe086f
Author: Stefan Bodewig <bodewig@apache.org>
Authored: Sun Dec 16 11:02:48 2018 +0100
Committer: Stefan Bodewig <bodewig@apache.org>
Committed: Sun Dec 16 11:02:48 2018 +0100

----------------------------------------------------------------------
 src/etc/poms/ant/pom.xml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant/blob/876376a8/src/etc/poms/ant/pom.xml
----------------------------------------------------------------------
diff --git a/src/etc/poms/ant/pom.xml b/src/etc/poms/ant/pom.xml
index 99c65f9..6a52c7e 100644
--- a/src/etc/poms/ant/pom.xml
+++ b/src/etc/poms/ant/pom.xml
@@ -35,6 +35,9 @@
   <artifactId>ant</artifactId>
   <version>1.10.6-SNAPSHOT</version>
   <name>Apache Ant Core</name>
+  <properties>
+    <modules.exclude>org/apache/tools/ant/taskdefs/modules/</modules.exclude>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
@@ -175,6 +178,7 @@
             <exclude>org/apache/tools/ant/listener/CommonsLoggingListener*</exclude>
             <exclude>org/apache/tools/ant/listener/Log4jListener*</exclude>
             <exclude>org/apache/tools/ant/taskdefs/email/MimeMailer*</exclude>
+            <exclude>${modules.exclude}</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/NetRexxC*</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/Xalan2TraceSupport*</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/image/</exclude>
@@ -213,6 +217,8 @@
             <exclude>org/apache/tools/ant/taskdefs/StyleTest*</exclude>
             <!-- ERROR: Unexpected recipients -->
             <exclude>org/apache/tools/ant/taskdefs/email/EmailTask*</exclude>
+            <!-- Java9+ -->
+            <exclude>${modules.exclude}</exclude>
             <!-- antlr -->
             <exclude>org/apache/tools/ant/taskdefs/optional/ANTLR*</exclude>
             <!-- obsolete -->
@@ -366,4 +372,15 @@
     <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
     <directory>../../../../target/${project.artifactId}</directory>
   </build>
+  <profiles>
+    <profile>
+      <id>java9+</id>
+      <activation>
+        <jdk>[9,)</jdk>
+      </activation>
+      <properties>
+        <modules.exclude>not/here</modules.exclude>
+      </properties>
+    </profile>
+  </profiles>
 </project>


Mime
View raw message