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 10:18:20 UTC
svn commit: r1761711 - in /jackrabbit/branches/2.6: ./
jackrabbit-parent/pom.xml
Author: reschke
Date: Wed Sep 21 10:18:20 2016
New Revision: 1761711
URL: http://svn.apache.org/viewvc?rev=1761711&view=rev
Log:
JCR-4025: enable animal sniffer plugin (ported to 2.6)
Modified:
jackrabbit/branches/2.6/ (props changed)
jackrabbit/branches/2.6/jackrabbit-parent/pom.xml
Propchange: jackrabbit/branches/2.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 21 10:18:20 2016
@@ -1,3 +1,3 @@
/jackrabbit/branches/JCR-2272:1173165-1176545
/jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1437334,1437374,1437384,1437618,1437928,1437933,1437963,1438158,1438541,1439296,1439312,1439346,1439768,1439797,1439927,1440059,1440336,1440456,1440908,1440917,1442061,1443652,1443876,1443885,1443943,1444501,1444515,1444654,1444666,1444683,1444755,1445122,1445134,1453907,1460995,1461064,1461137,1461613,1461646,1462115,1462153,1462205,1462211,1465974,1466060,1466085,1466938,1467255,1467363,1468965,1469312,1469799,1469892,1469940,1470573,1470957,1471286,1475718,1478684,1478719,1478757,1479518,1479527,1479533,1479536,1479691,1479809,1479908,1480574,1481964,1483276,1483286,1484440,1484442,1484444,1484727,1487803,1497243,1497492,1497787,1498840,1498850,1499285,1505795,1505907,1505942,1506594,1506877,1508053,1509101,1513144,1516281,1517602,1517627,1519376,1525629,1525633,1526928,1526945,1530005,1535539,1537027,1539030,1539045,1539050,1555885,1556248,1566668-1566669,1582373,1587619,1590030,1590733,1598035,1598058,1603934,1609712,1634584,1680757,1709811,1729382,1732436,175
8600
+/jackrabbit/trunk:1437334,1437374,1437384,1437618,1437928,1437933,1437963,1438158,1438541,1439296,1439312,1439346,1439768,1439797,1439927,1440059,1440336,1440456,1440908,1440917,1442061,1443652,1443876,1443885,1443943,1444501,1444515,1444654,1444666,1444683,1444755,1445122,1445134,1453907,1460995,1461064,1461137,1461613,1461646,1462115,1462153,1462205,1462211,1465974,1466060,1466085,1466938,1467255,1467363,1468965,1469312,1469799,1469892,1469940,1470573,1470957,1471286,1475718,1478684,1478719,1478757,1479518,1479527,1479533,1479536,1479691,1479809,1479908,1480574,1481964,1483276,1483286,1484440,1484442,1484444,1484727,1487803,1497243,1497492,1497787,1498840,1498850,1499285,1505795,1505907,1505942,1506594,1506877,1508053,1509101,1513144,1516281,1517602,1517627,1519376,1525629,1525633,1526928,1526945,1530005,1535539,1537027,1539030,1539045,1539050,1555885,1556248,1566668-1566669,1582373,1587619,1590030,1590733,1598035,1598058,1603934,1609712,1634584,1680757,1709811,1729382,1732436,175
8600,1761679
Modified: jackrabbit/branches/2.6/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.6/jackrabbit-parent/pom.xml?rev=1761711&r1=1761710&r2=1761711&view=diff
==============================================================================
--- jackrabbit/branches/2.6/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/branches/2.6/jackrabbit-parent/pom.xml Wed Sep 21 10:18:20 2016
@@ -49,6 +49,8 @@
<tika.version>1.3</tika.version>
<clirr.baseline.version>2.2.0</clirr.baseline.version>
<project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
+ <java.version>1.6</java.version>
+ <java.version.signature>java16</java.version.signature>
</properties>
<url>http://jackrabbit.apache.org/</url>
@@ -133,19 +135,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>
@@ -159,7 +180,7 @@
<artifactId>maven-idea-plugin</artifactId>
<configuration>
<downloadSources>true</downloadSources>
- <jdkLevel>1.6</jdkLevel>
+ <jdkLevel>${java.version}</jdkLevel>
</configuration>
</plugin>
<plugin>
@@ -281,7 +302,7 @@
<artifactId>maven-pmd-plugin</artifactId>
<version>2.4</version>
<configuration>
- <targetJdk>1.6</targetJdk>
+ <targetJdk>${java.version}</targetJdk>
</configuration>
</plugin>
<plugin>