You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2016/09/21 09:10:18 UTC
svn commit: r1761701 - in /jackrabbit/branches/2.8: ./
jackrabbit-parent/pom.xml
Author: reschke
Date: Wed Sep 21 09:10:18 2016
New Revision: 1761701
URL: http://svn.apache.org/viewvc?rev=1761701&view=rev
Log:
JCR-4025: enable animal sniffer plugin (ported to 2.8)
Modified:
jackrabbit/branches/2.8/ (props changed)
jackrabbit/branches/2.8/jackrabbit-parent/pom.xml
Propchange: jackrabbit/branches/2.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 21 09:10:18 2016
@@ -1,3 +1,3 @@
/jackrabbit/branches/JCR-2272:1173165-1176545
/jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1592881,1597717,1597799,1597806,1598035,1598058,1603769,1603934,1609712,1625561,1634584,1667787,1674859,1680757,1709811,1729382,1732436,1740814-1740815,1758600,1759865
+/jackrabbit/trunk:1592881,1597717,1597799,1597806,1598035,1598058,1603769,1603934,1609712,1625561,1634584,1667787,1674859,1680757,1709811,1729382,1732436,1740814-1740815,1758600,1759865,1761679
Modified: jackrabbit/branches/2.8/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-parent/pom.xml?rev=1761701&r1=1761700&r2=1761701&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/branches/2.8/jackrabbit-parent/pom.xml Wed Sep 21 09:10:18 2016
@@ -56,6 +56,8 @@
<slf4j.api.version>1.6.6</slf4j.api.version>
<slf4j.version>1.7.4</slf4j.version> <!-- sync with logback version -->
<logback.version>1.0.12</logback.version>
+ <java.version>1.6</java.version>
+ <java.version.signature>java16</java.version.signature>
</properties>
<url>http://jackrabbit.apache.org/</url>
@@ -140,19 +142,38 @@
<build>
<plugins>
- <!-- JCR-3327: Upgrade to Java SE 6 -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <target>1.6</target>
- <source>1.6</source>
+ <target>${java.version}</target>
+ <source>${java.version}</source>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>animal-sniffer-maven-plugin</artifactId>
+ <version>1.15</version>
+ <configuration>
+ <signature>
+ <groupId>org.codehaus.mojo.signature</groupId>
+ <artifactId>${java.version.signature}</artifactId>
+ <version>1.0</version>
+ </signature>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>compile</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<!-- Generate aggregate Javadocs -->
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
- <source>1.6</source>
+ <source>${java.version}</source>
<aggregate>true</aggregate>
<links>
<link>http://docs.oracle.com/javase/6/docs/api/</link>
@@ -166,7 +187,7 @@
<artifactId>maven-idea-plugin</artifactId>
<configuration>
<downloadSources>true</downloadSources>
- <jdkLevel>1.6</jdkLevel>
+ <jdkLevel>${java.version}</jdkLevel>
</configuration>
</plugin>
<plugin>
@@ -288,7 +309,7 @@
<artifactId>maven-pmd-plugin</artifactId>
<version>2.4</version>
<configuration>
- <targetJdk>1.6</targetJdk>
+ <targetJdk>${java.version}</targetJdk>
</configuration>
</plugin>
<plugin>