Author: tv
Date: Thu Sep 8 14:20:29 2016
New Revision: 1759833
URL: http://svn.apache.org/viewvc?rev=1759833&view=rev
Log:
Java 8
Modified:
db/torque/torque4/trunk/pom.xml
db/torque/torque4/trunk/torque-generator/pom.xml
db/torque/torque4/trunk/torque-test/pom.xml
Modified: db/torque/torque4/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/pom.xml?rev=1759833&r1=1759832&r2=1759833&view=diff
==============================================================================
--- db/torque/torque4/trunk/pom.xml (original)
+++ db/torque/torque4/trunk/pom.xml Thu Sep 8 14:20:29 2016
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>15</version>
+ <version>18</version>
</parent>
<groupId>org.apache.torque</groupId>
@@ -233,7 +233,7 @@
<name>Thomas Vandahl</name>
<id>tv</id>
<email>[email protected]</email>
- <organization>TeWiSoft GmbH</organization>
+ <organization />
<roles>
<role>Java Developer</role>
</roles>
@@ -314,14 +314,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
@@ -344,7 +336,6 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.11</version>
<configuration>
<excludes>
<exclude>velocity.log</exclude>
@@ -386,16 +377,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>2.5</version>
<configuration>
<linkXref>true</linkXref>
- <targetJdk>1.5</targetJdk>
+ <targetJdk>${maven.compiler.source}</targetJdk>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>2.5.2</version>
<configuration>
<excludeFilterFile>${basedir}/src/main/plugin-config/findbugs-exclude.xml</excludeFilterFile>
</configuration>
@@ -417,21 +406,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.17</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>3.3</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
<version>2.9</version>
<configuration>
@@ -440,21 +414,11 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.4</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.17</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.2</version>
<configuration>
<linkXref>true</linkXref>
- <targetJdk>1.5</targetJdk>
+ <targetJdk>${maven.compiler.source}</targetJdk>
</configuration>
</plugin>
<plugin>
@@ -501,18 +465,14 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.11</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.7</version>
</plugin>
</plugins>
</reporting>
<properties>
<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
</properties>
<profiles>
Modified: db/torque/torque4/trunk/torque-generator/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/pom.xml?rev=1759833&r1=1759832&r2=1759833&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/pom.xml (original)
+++ db/torque/torque4/trunk/torque-generator/pom.xml Thu Sep 8 14:20:29 2016
@@ -147,16 +147,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.7</source>
- <target>1.7</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.2</version>
<configuration>
<excludes>
<exclude>BaseTest.java</exclude>
Modified: db/torque/torque4/trunk/torque-test/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/pom.xml?rev=1759833&r1=1759832&r2=1759833&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/pom.xml (original)
+++ db/torque/torque4/trunk/torque-test/pom.xml Thu Sep 8 14:20:29 2016
@@ -518,8 +518,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
<testIncludes>
<include>**/*Test.java</include>
<include>**/*TestCase.java</include>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
