You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2020/12/11 07:54:21 UTC
[myfaces-tobago] 06/22: check if tools.jar is needed with JDK 1.8
(and higher)
This is an automated email from the ASF dual-hosted git repository.
weber pushed a commit to branch TOBAGO-1999_Select2
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit fad377d6004e3c62b3509564380b47c34fcbf2d9
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Wed Aug 26 20:04:21 2020 +0200
check if tools.jar is needed with JDK 1.8 (and higher)
---
tobago-core/pom.xml | 17 -----------------
tobago-extension/tobago-fileupload/pom.xml | 6 ------
tobago-extension/tobago-sandbox/pom.xml | 17 -----------------
tobago-theme/tobago-theme-charlotteville/pom.xml | 6 ------
tobago-theme/tobago-theme-richmond/pom.xml | 6 ------
tobago-theme/tobago-theme-scarborough/pom.xml | 6 ------
tobago-theme/tobago-theme-speyside/pom.xml | 6 ------
tobago-theme/tobago-theme-standard/pom.xml | 6 ------
tobago-tool/tobago-tool-annotation/pom.xml | 20 --------------------
tobago-tool/tobago-tool-apt/pom.xml | 21 ---------------------
10 files changed, 111 deletions(-)
diff --git a/tobago-core/pom.xml b/tobago-core/pom.xml
index 6193b72..ecc77f4 100644
--- a/tobago-core/pom.xml
+++ b/tobago-core/pom.xml
@@ -205,23 +205,6 @@
</dependencies>
<profiles>
- <!-- Apples JDK (until 1.6) has not a tools.jar -->
- <profile>
- <id>tools.jar</id>
- <activation>
- <os><family>!mac</family></os>
- <jdk>1.7</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>sun.jdk</groupId>
- <artifactId>tools</artifactId>
- <version>1.5.0</version>
- <scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
- </dependency>
- </dependencies>
- </profile>
<profile>
<id>codegen-old-jdk</id>
<activation>
diff --git a/tobago-extension/tobago-fileupload/pom.xml b/tobago-extension/tobago-fileupload/pom.xml
index 2c42caa..5c4a266 100644
--- a/tobago-extension/tobago-fileupload/pom.xml
+++ b/tobago-extension/tobago-fileupload/pom.xml
@@ -32,12 +32,6 @@
<artifactId>tobago-core</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>sun.jdk</groupId>
- <artifactId>tools</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
diff --git a/tobago-extension/tobago-sandbox/pom.xml b/tobago-extension/tobago-sandbox/pom.xml
index 8e52b8c..6ab6d4f 100644
--- a/tobago-extension/tobago-sandbox/pom.xml
+++ b/tobago-extension/tobago-sandbox/pom.xml
@@ -245,23 +245,6 @@
</dependencies>
<profiles>
- <!-- Apples JDK (until 1.6) has not a tools.jar -->
- <profile>
- <id>tools.jar</id>
- <activation>
- <os><family>!mac</family></os>
- <jdk>1.7</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>sun.jdk</groupId>
- <artifactId>tools</artifactId>
- <version>1.5.0</version>
- <scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
- </dependency>
- </dependencies>
- </profile>
<profile>
<id>generate-assembly</id>
<build>
diff --git a/tobago-theme/tobago-theme-charlotteville/pom.xml b/tobago-theme/tobago-theme-charlotteville/pom.xml
index 4d9f80f..b1acae7 100644
--- a/tobago-theme/tobago-theme-charlotteville/pom.xml
+++ b/tobago-theme/tobago-theme-charlotteville/pom.xml
@@ -56,12 +56,6 @@
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-core</artifactId>
<version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>sun.jdk</groupId>
- <artifactId>tools</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
<properties>
diff --git a/tobago-theme/tobago-theme-richmond/pom.xml b/tobago-theme/tobago-theme-richmond/pom.xml
index 939cc5b..68b81a4 100644
--- a/tobago-theme/tobago-theme-richmond/pom.xml
+++ b/tobago-theme/tobago-theme-richmond/pom.xml
@@ -58,12 +58,6 @@
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-core</artifactId>
<version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>sun.jdk</groupId>
- <artifactId>tools</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
<properties>
diff --git a/tobago-theme/tobago-theme-scarborough/pom.xml b/tobago-theme/tobago-theme-scarborough/pom.xml
index 71b21b2..d9b9e62 100644
--- a/tobago-theme/tobago-theme-scarborough/pom.xml
+++ b/tobago-theme/tobago-theme-scarborough/pom.xml
@@ -133,12 +133,6 @@
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-core</artifactId>
<version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>sun.jdk</groupId>
- <artifactId>tools</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
diff --git a/tobago-theme/tobago-theme-speyside/pom.xml b/tobago-theme/tobago-theme-speyside/pom.xml
index 43c5149..193200c 100644
--- a/tobago-theme/tobago-theme-speyside/pom.xml
+++ b/tobago-theme/tobago-theme-speyside/pom.xml
@@ -36,12 +36,6 @@
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-core</artifactId>
<version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>sun.jdk</groupId>
- <artifactId>tools</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
diff --git a/tobago-theme/tobago-theme-standard/pom.xml b/tobago-theme/tobago-theme-standard/pom.xml
index 299a3ed..7871f60 100644
--- a/tobago-theme/tobago-theme-standard/pom.xml
+++ b/tobago-theme/tobago-theme-standard/pom.xml
@@ -141,12 +141,6 @@
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-core</artifactId>
<version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>sun.jdk</groupId>
- <artifactId>tools</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.myfaces.test</groupId>
diff --git a/tobago-tool/tobago-tool-annotation/pom.xml b/tobago-tool/tobago-tool-annotation/pom.xml
index 5647619..e094ed8 100644
--- a/tobago-tool/tobago-tool-annotation/pom.xml
+++ b/tobago-tool/tobago-tool-annotation/pom.xml
@@ -26,24 +26,4 @@
<packaging>jar</packaging>
<name>Tobago Tool Annotation</name>
- <profiles>
- <!-- Apples JDK (until 1.6) has not a tools.jar -->
- <profile>
- <id>tools.jar</id>
- <activation>
- <os><family>!mac</family></os>
- <jdk>1.7</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>sun.jdk</groupId>
- <artifactId>tools</artifactId>
- <version>1.5.0</version>
- <scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
- </dependency>
- </dependencies>
- </profile>
-
- </profiles>
</project>
diff --git a/tobago-tool/tobago-tool-apt/pom.xml b/tobago-tool/tobago-tool-apt/pom.xml
index 972b302..7bbc4ac 100644
--- a/tobago-tool/tobago-tool-apt/pom.xml
+++ b/tobago-tool/tobago-tool-apt/pom.xml
@@ -117,27 +117,6 @@
</dependency>
</dependencies>
- <profiles>
- <!-- Apples JDK (until 1.6) has not a tools.jar -->
- <profile>
- <id>tools.jar</id>
- <activation>
- <os><family>!mac</family></os>
- <jdk>1.7</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>sun.jdk</groupId>
- <artifactId>tools</artifactId>
- <version>1.5.0</version>
- <scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
- </dependency>
- </dependencies>
- </profile>
-
- </profiles>
-
<properties>
<tobago.basedir>${project.basedir}/../..</tobago.basedir>
</properties>