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 2018/06/28 14:06:50 UTC
svn commit: r1834614 - in /jackrabbit/branches/2.10: ./
jackrabbit-core/pom.xml jackrabbit-data/pom.xml
jackrabbit-jcr-server/pom.xml jackrabbit-parent/pom.xml
jackrabbit-spi-commons/pom.xml pom.xml
Author: reschke
Date: Thu Jun 28 14:06:50 2018
New Revision: 1834614
URL: http://svn.apache.org/viewvc?rev=1834614&view=rev
Log:
JCR-4128: update maven plugins and require Maven 3.2.1 (ported to 2.10)
Modified:
jackrabbit/branches/2.10/ (props changed)
jackrabbit/branches/2.10/jackrabbit-core/pom.xml
jackrabbit/branches/2.10/jackrabbit-data/pom.xml
jackrabbit/branches/2.10/jackrabbit-jcr-server/pom.xml
jackrabbit/branches/2.10/jackrabbit-parent/pom.xml
jackrabbit/branches/2.10/jackrabbit-spi-commons/pom.xml
jackrabbit/branches/2.10/pom.xml
Propchange: jackrabbit/branches/2.10/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 28 14:06:50 2018
@@ -1,4 +1,4 @@
/jackrabbit/branches/2.12:1776442,1776451,1776500,1776524
/jackrabbit/branches/JCR-2272:1173165-1176545
/jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1709811,1717599,1729382,1730696,1732436,1740814-1740815,1751279,1752165,1753226,1757322,1758600,1759607,1759782,1759865,1761679,1761909,1762422,1763558,1766398,1771078,1771741,1771939,1771999,1772049,1772343,1772444,1772457,1772530,1772544,1773579,1773591,1773745,1774443,1775123,1775132,1775315,1775384,1775414,1775419,1775437,1775444,1775463,1775472-1775473,1775481,1775485,1775496,1775509,1775514,1775613,1775617,1775621,1775624,1775629,1775631-1775632,1775634-1775635,1775637,1775657,1776410,1776414,1776416-1776417,1776421,1779166,1779460,1780208,1786325,1787043,1787381,1792193,1793315,1793323,1793327,1793332,1796980,1797209,1797917,1798586,1799429,1802977,1807234,1807244,1808752,1808754,1809149,1809329,1810108,1811667,1812994,1814831,1817097-1817098,1817100,1817201,1818586,1819269,1820133,1821597,1822947,1822950,1826230,1826647,1826940,1826964,1833374
+/jackrabbit/trunk:1709811,1717599,1729382,1730696,1732436,1740814-1740815,1751279,1752165,1753226,1757322,1758600,1759607,1759782,1759865,1761679,1761909,1762422,1763558,1766398,1771078,1771741,1771939,1771999,1772049,1772343,1772444,1772457,1772530,1772544,1773579,1773591,1773745,1774443,1775123,1775132,1775315,1775384,1775414,1775419,1775437,1775444,1775463,1775472-1775473,1775481,1775485,1775496,1775509,1775514,1775613,1775617,1775621,1775624,1775629,1775631-1775632,1775634-1775635,1775637,1775657,1776410,1776414,1776416-1776417,1776421,1779166,1779460,1780208,1786325,1787043,1787381,1792100,1792105,1792113,1792193,1793315,1793323,1793327,1793332,1796980,1797209,1797917,1798586,1799429,1802977,1807234,1807244,1808752,1808754,1809149,1809329,1810108,1811667,1812994,1814831,1817097-1817098,1817100,1817201,1818586,1819269,1820133,1821597,1822947,1822950,1826230,1826647,1826940,1826964,1833374
Modified: jackrabbit/branches/2.10/jackrabbit-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-core/pom.xml?rev=1834614&r1=1834613&r2=1834614&view=diff
==============================================================================
--- jackrabbit/branches/2.10/jackrabbit-core/pom.xml (original)
+++ jackrabbit/branches/2.10/jackrabbit-core/pom.xml Thu Jun 28 14:06:50 2018
@@ -160,7 +160,7 @@ org.apache.jackrabbit.core.security.user
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
+ <version>3.0.2</version>
<configuration>
<excludes>
<exclude>logback-test.xml</exclude>
Modified: jackrabbit/branches/2.10/jackrabbit-data/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-data/pom.xml?rev=1834614&r1=1834613&r2=1834614&view=diff
==============================================================================
--- jackrabbit/branches/2.10/jackrabbit-data/pom.xml (original)
+++ jackrabbit/branches/2.10/jackrabbit-data/pom.xml Thu Jun 28 14:06:50 2018
@@ -47,7 +47,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
+ <version>3.0.2</version>
<executions>
<execution>
<goals>
Modified: jackrabbit/branches/2.10/jackrabbit-jcr-server/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-jcr-server/pom.xml?rev=1834614&r1=1834613&r2=1834614&view=diff
==============================================================================
--- jackrabbit/branches/2.10/jackrabbit-jcr-server/pom.xml (original)
+++ jackrabbit/branches/2.10/jackrabbit-jcr-server/pom.xml Thu Jun 28 14:06:50 2018
@@ -55,7 +55,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- <version>1.12.0</version>
+ <version>1.24.0</version>
<executions>
<execution>
<id>generate-scr-scrdescriptor</id>
Modified: jackrabbit/branches/2.10/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-parent/pom.xml?rev=1834614&r1=1834613&r2=1834614&view=diff
==============================================================================
--- jackrabbit/branches/2.10/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/branches/2.10/jackrabbit-parent/pom.xml Thu Jun 28 14:06:50 2018
@@ -75,7 +75,7 @@
<!-- B U I L D S E T T I N G S -->
<!-- =================================================================== -->
<prerequisites>
- <maven>2.0.9</maven>
+ <maven>3.2.1</maven>
</prerequisites>
<profiles>
@@ -221,7 +221,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.1</version>
+ <version>2.5.3</version>
<configuration>
<useReleaseProfile>false</useReleaseProfile>
<goals>deploy</goals>
@@ -230,33 +230,33 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.18</version>
+ <version>2.20</version>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.10</version>
+ <version>2.20</version>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
- <version>2.1.1</version>
+ <version>3.0.0</version>
</plugin>
<plugin>
<artifactId>maven-rar-plugin</artifactId>
- <version>2.2</version>
+ <version>2.4</version>
</plugin>
<plugin>
<artifactId>maven-idea-plugin</artifactId>
- <version>2.2</version>
+ <version>2.2.1</version>
</plugin>
<plugin>
<artifactId>maven-eclipse-plugin</artifactId>
- <version>2.8</version>
+ <version>2.10</version>
</plugin>
<!-- Default configuration of OSGi bundling (JCR-1342) -->
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.4</version>
+ <version>3.3.0</version>
<inherited>true</inherited>
<configuration>
<instructions>
@@ -271,12 +271,12 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
+ <version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
- <version>2.5.1</version>
+ <version>2.7</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -292,27 +292,27 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- <version>2.1</version>
+ <version>2.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.6.1</version>
+ <version>2.10.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.18</version>
+ <version>2.20</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.4</version>
+ <version>2.17</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>2.4</version>
+ <version>3.7</version>
<configuration>
<targetJdk>${java.version}</targetJdk>
</configuration>
@@ -320,7 +320,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>1.1.1</version>
+ <version>3.0.4</version>
<configuration>
<xmlOutput>true</xmlOutput>
<findbugsXmlOutput>true</findbugsXmlOutput>
Modified: jackrabbit/branches/2.10/jackrabbit-spi-commons/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-spi-commons/pom.xml?rev=1834614&r1=1834613&r2=1834614&view=diff
==============================================================================
--- jackrabbit/branches/2.10/jackrabbit-spi-commons/pom.xml (original)
+++ jackrabbit/branches/2.10/jackrabbit-spi-commons/pom.xml Thu Jun 28 14:06:50 2018
@@ -115,7 +115,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>javacc-maven-plugin</artifactId>
- <version>2.4.1</version>
+ <version>2.6</version>
<executions>
<execution>
<id>sql</id>
Modified: jackrabbit/branches/2.10/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/pom.xml?rev=1834614&r1=1834613&r2=1834614&view=diff
==============================================================================
--- jackrabbit/branches/2.10/pom.xml (original)
+++ jackrabbit/branches/2.10/pom.xml Thu Jun 28 14:06:50 2018
@@ -104,6 +104,7 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>3.0.0</version>
<executions>
<execution>
<goals>