You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2014/02/11 08:57:40 UTC
svn commit: r1567000 - in /myfaces/tobago/branches/tobago-3.0.x: pom.xml
tobago-core/pom.xml tobago-extension/tobago-sandbox/pom.xml
tobago-tool/tobago-tool-annotation/pom.xml
tobago-tool/tobago-tool-apt/pom.xml
Author: lofwyr
Date: Tue Feb 11 07:57:39 2014
New Revision: 1567000
URL: http://svn.apache.org/r1567000
Log:
TOBAGO-1363
- build with jdk 1.7 can be simplified
Modified:
myfaces/tobago/branches/tobago-3.0.x/pom.xml
myfaces/tobago/branches/tobago-3.0.x/tobago-core/pom.xml
myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/pom.xml
myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-annotation/pom.xml
myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/pom.xml
Modified: myfaces/tobago/branches/tobago-3.0.x/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/pom.xml?rev=1567000&r1=1566999&r2=1567000&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/pom.xml Tue Feb 11 07:57:39 2014
@@ -634,8 +634,8 @@
</unCheckedPlugins>
</requirePluginVersions>
<requireJavaVersion>
- <message>Tobago must be compiled with Java 6 or higher</message>
- <version>[1.6,)</version>
+ <message>Tobago must be compiled with Java 7 or higher</message>
+ <version>[1.7,)</version>
</requireJavaVersion>
</rules>
</configuration>
@@ -1153,29 +1153,6 @@
</modules>
</profile>
- <!--name of the runtime classes file-->
- <profile>
- <id>rt.jar</id>
- <activation>
- <os>
- <family>!mac</family>
- </os>
- </activation>
- <properties>
- <java.classes.jar>lib/rt.jar</java.classes.jar>
- </properties>
- </profile>
- <profile>
- <id>classes.jar</id>
- <activation>
- <os>
- <family>mac</family>
- </os>
- </activation>
- <properties>
- <java.classes.jar>../Classes/classes.jar</java.classes.jar>
- </properties>
- </profile>
<profile>
<id>generate-assembly</id>
<modules>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/pom.xml?rev=1567000&r1=1566999&r2=1567000&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/pom.xml Tue Feb 11 07:57:39 2014
@@ -246,23 +246,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>apache-release</id>
<build>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/pom.xml?rev=1567000&r1=1566999&r2=1567000&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/pom.xml Tue Feb 11 07:57:39 2014
@@ -243,23 +243,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>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-annotation/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-annotation/pom.xml?rev=1567000&r1=1566999&r2=1567000&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-annotation/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-annotation/pom.xml Tue Feb 11 07:57:39 2014
@@ -25,25 +25,4 @@
<artifactId>tobago-tool-annotation</artifactId>
<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>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/pom.xml?rev=1567000&r1=1566999&r2=1567000&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/pom.xml Tue Feb 11 07:57:39 2014
@@ -116,25 +116,4 @@
</exclusions>
</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>
</project>