Author: jboynes
Date: Sun Oct 10 00:37:21 2010
New Revision: 1006237
URL: http://svn.apache.org/viewvc?rev=1006237&view=rev
Log:
Set JDK level using default maven.compiler.* properties
Modified:
tomcat/taglibs/standard/trunk/impl/pom.xml
tomcat/taglibs/standard/trunk/spec/pom.xml
tomcat/taglibs/taglibs-parent/trunk/pom.xml
Modified: tomcat/taglibs/standard/trunk/impl/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/pom.xml?rev=1006237&r1=1006236&r2=1006237&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/pom.xml (original)
+++ tomcat/taglibs/standard/trunk/impl/pom.xml Sun Oct 10 00:37:21 2010
@@ -122,20 +122,10 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <maven.compile.source>1.5</maven.compile.source>
- <maven.compile.target>1.5</maven.compile.target>
</properties>
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -166,7 +156,7 @@
<artifactId>maven-pmd-plugin</artifactId>
<version>2.3</version>
<configuration>
- <targetJdk>${maven.compile.target}</targetJdk>
+ <targetJdk>${maven.compiler.target}</targetJdk>
</configuration>
<reportSets>
<reportSet>
Modified: tomcat/taglibs/standard/trunk/spec/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/spec/pom.xml?rev=1006237&r1=1006236&r2=1006237&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/spec/pom.xml (original)
+++ tomcat/taglibs/standard/trunk/spec/pom.xml Sun Oct 10 00:37:21 2010
@@ -84,17 +84,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
Modified: tomcat/taglibs/taglibs-parent/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/trunk/pom.xml?rev=1006237&r1=1006236&r2=1006237&view=diff
==============================================================================
--- tomcat/taglibs/taglibs-parent/trunk/pom.xml (original)
+++ tomcat/taglibs/taglibs-parent/trunk/pom.xml Sun Oct 10 00:37:21 2010
@@ -131,8 +131,8 @@
<Implementation-Version>${project.version}</Implementation-Version>
<Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
-
<X-Compile-Source-JDK>${maven.compile.source}</X-Compile-Source-JDK>
-
<X-Compile-Target-JDK>${maven.compile.target}</X-Compile-Target-JDK>
+
<X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>
+
<X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>
</manifestEntries>
</archive>
</configuration>
@@ -150,8 +150,8 @@
<Implementation-Version>${project.version}</Implementation-Version>
<Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
-
<X-Compile-Source-JDK>${maven.compile.source}</X-Compile-Source-JDK>
-
<X-Compile-Target-JDK>${maven.compile.target}</X-Compile-Target-JDK>
+
<X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>
+
<X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>
</manifestEntries>
</archive>
</configuration>
@@ -197,10 +197,9 @@
<properties>
<!-- Default configuration for compiler source and target JVM -->
- <!--
- <maven.compile.source>1.4</maven.compile.source>
- <maven.compile.target>1.4</maven.compile.target>
- -->
+ <maven.compiler.source>1.5</maven.compiler.source>
+ <maven.compiler.target>1.5</maven.compiler.target>
+
<!-- Staging -->
<taglibs.componentid>${project.artifactId}</taglibs.componentid>
<taglibs.rc.version>RC1</taglibs.rc.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
