yetus-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aajis...@apache.org
Subject yetus git commit: YETUS-619. audience-annottaions-jdiff doclet does not work on Java 9
Date Sun, 01 Apr 2018 10:27:00 GMT
Repository: yetus
Updated Branches:
  refs/heads/master 535b38faf -> b9a78c3db


YETUS-619. audience-annottaions-jdiff doclet does not work on Java 9

closes apache/yetus#15

Signed-off-by: Allen Wittenauer <aw@apache.org>
Signed-off-by: Sean Busbey <busbey@apache.org>


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

Branch: refs/heads/master
Commit: b9a78c3dbea6e2dd98c3254ecf4cbd69776e8527
Parents: 535b38f
Author: Akira Ajisaka <aajisaka@apache.org>
Authored: Fri Mar 9 10:56:03 2018 -0800
Committer: Akira Ajisaka <aajisaka@apache.org>
Committed: Sun Apr 1 19:26:38 2018 +0900

----------------------------------------------------------------------
 .../audience-annotations-jdiff/pom.xml          | 27 +++++++++++++------
 .../audience-annotations/pom.xml                | 28 +++++++++++++-------
 yetus-project/pom.xml                           | 17 ------------
 3 files changed, 37 insertions(+), 35 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/yetus/blob/b9a78c3d/audience-annotations-component/audience-annotations-jdiff/pom.xml
----------------------------------------------------------------------
diff --git a/audience-annotations-component/audience-annotations-jdiff/pom.xml b/audience-annotations-component/audience-annotations-jdiff/pom.xml
index baa9ef1..e65f323 100644
--- a/audience-annotations-component/audience-annotations-jdiff/pom.xml
+++ b/audience-annotations-component/audience-annotations-jdiff/pom.xml
@@ -46,13 +46,24 @@
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <!-- Version and location set in project pom -->
-      <groupId>jdk.tools</groupId>
-      <artifactId>jdk.tools</artifactId>
-      <scope>system</scope>
-      <!-- Mark as optional so that it isn't taken transitively -->
-      <optional>true</optional>
-    </dependency>
   </dependencies>
+  <profiles>
+    <profile>
+      <id>jdk1.8</id>
+      <activation>
+        <jdk>(,1.8]</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <!-- Version and location set in project pom -->
+          <groupId>jdk.tools</groupId>
+          <artifactId>jdk.tools</artifactId>
+          <scope>system</scope>
+          <!-- Mark as optional so that it isn't taken transitively -->
+          <optional>true</optional>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
+
 </project>

http://git-wip-us.apache.org/repos/asf/yetus/blob/b9a78c3d/audience-annotations-component/audience-annotations/pom.xml
----------------------------------------------------------------------
diff --git a/audience-annotations-component/audience-annotations/pom.xml b/audience-annotations-component/audience-annotations/pom.xml
index 8c9eb2f..d527485 100644
--- a/audience-annotations-component/audience-annotations/pom.xml
+++ b/audience-annotations-component/audience-annotations/pom.xml
@@ -33,14 +33,22 @@
   <name>Apache Yetus - Audience Annotations</name>
   <packaging>jar</packaging>
 
-  <dependencies>
-    <dependency>
-      <!-- Version and location set in project pom -->
-      <groupId>jdk.tools</groupId>
-      <artifactId>jdk.tools</artifactId>
-      <scope>system</scope>
-      <!-- Mark as optional so that it isn't taken transitively -->
-      <optional>true</optional>
-    </dependency>
-  </dependencies>
+  <profiles>
+    <profile>
+      <id>jdk1.8</id>
+      <activation>
+        <jdk>(,1.8]</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <!-- Version and location set in project pom -->
+          <groupId>jdk.tools</groupId>
+          <artifactId>jdk.tools</artifactId>
+          <scope>system</scope>
+          <!-- Mark as optional so that it isn't taken transitively -->
+          <optional>true</optional>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/yetus/blob/b9a78c3d/yetus-project/pom.xml
----------------------------------------------------------------------
diff --git a/yetus-project/pom.xml b/yetus-project/pom.xml
index be818b3..56e182d 100644
--- a/yetus-project/pom.xml
+++ b/yetus-project/pom.xml
@@ -166,23 +166,6 @@
         </dependencies>
       </dependencyManagement>
     </profile>
-    <profile>
-      <id>jdk1.9</id>
-      <activation>
-        <jdk>1.9</jdk>
-      </activation>
-      <dependencyManagement>
-        <dependencies>
-          <dependency>
-            <groupId>jdk.tools</groupId>
-            <artifactId>jdk.tools</artifactId>
-            <version>1.9</version>
-            <scope>system</scope>
-            <systemPath>${java.home}/../lib/tools.jar</systemPath>
-          </dependency>
-        </dependencies>
-      </dependencyManagement>
-    </profile>
   </profiles>
 
 </project>


Mime
View raw message