You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2019/10/29 15:30:22 UTC
svn commit: r1869115 - in /jackrabbit/oak/branches/1.6: ./
oak-doc/src/site/site.xml oak-examples/webapp/ oak-examples/webapp/pom.xml
oak-parent/pom.xml oak-pojosr/pom.xml oak-run/pom.xml
oak-segment-tar/pom.xml oak-upgrade/pom.xml
Author: reschke
Date: Tue Oct 29 15:30:21 2019
New Revision: 1869115
URL: http://svn.apache.org/viewvc?rev=1869115&view=rev
Log:
OAK-6089: update maven plugins (merged r1791811, r1791823, r1791828, r1791836, r1791854, r1791856, r1791860, r1791865, r1791869, r1791885, r1791894, r1791899, r1791901, r1791906, r1791912, r1791914, r1791923, r1791948, r1791957, r1792014, r1792017, r1792019, r1792027, r1792034, r1793485 into 1.6)
Modified:
jackrabbit/oak/branches/1.6/ (props changed)
jackrabbit/oak/branches/1.6/oak-doc/src/site/site.xml
jackrabbit/oak/branches/1.6/oak-examples/webapp/ (props changed)
jackrabbit/oak/branches/1.6/oak-examples/webapp/pom.xml
jackrabbit/oak/branches/1.6/oak-parent/pom.xml
jackrabbit/oak/branches/1.6/oak-pojosr/pom.xml
jackrabbit/oak/branches/1.6/oak-run/pom.xml
jackrabbit/oak/branches/1.6/oak-segment-tar/pom.xml
jackrabbit/oak/branches/1.6/oak-upgrade/pom.xml
Propchange: jackrabbit/oak/branches/1.6/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1791811,1791823,1791828,1791836,1791854,1791856,1791860,1791865,1791869,1791885,1791894,1791899,1791901,1791906,1791912,1791914,1791923,1791948,1791957,1792014,1792017,1792019,1792027,1792034,1793485
Modified: jackrabbit/oak/branches/1.6/oak-doc/src/site/site.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-doc/src/site/site.xml?rev=1869115&r1=1869114&r2=1869115&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-doc/src/site/site.xml (original)
+++ jackrabbit/oak/branches/1.6/oak-doc/src/site/site.xml Tue Oct 29 15:30:21 2019
@@ -77,12 +77,12 @@ under the License.
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
- <version>1.3.0</version>
+ <version>1.6</version>
</skin>
<custom>
<fluidoSkin>
- <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
+ <sourceLineNumbersEnabled>false</sourceLineNumbersEnabled>
<topBarEnabled>true</topBarEnabled>
<topBarIcon>
<name>Oak logo</name>
Propchange: jackrabbit/oak/branches/1.6/oak-examples/webapp/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk/oak-examples/webapp:r1791885,1791899,1791901
Modified: jackrabbit/oak/branches/1.6/oak-examples/webapp/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-examples/webapp/pom.xml?rev=1869115&r1=1869114&r2=1869115&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-examples/webapp/pom.xml (original)
+++ jackrabbit/oak/branches/1.6/oak-examples/webapp/pom.xml Tue Oct 29 15:30:21 2019
@@ -239,7 +239,7 @@
<!-- add the jar created by maven-antrun-plugin in our artifacts -->
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.9</version>
+ <version>3.0.0</version>
<executions>
<execution>
<id>attach-artifacts</id>
@@ -283,7 +283,7 @@
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>2.5</version>
+ <version>3.0.0</version>
<configuration>
<filesets>
<fileset>
Modified: jackrabbit/oak/branches/1.6/oak-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-parent/pom.xml?rev=1869115&r1=1869114&r2=1869115&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-parent/pom.xml (original)
+++ jackrabbit/oak/branches/1.6/oak-parent/pom.xml Tue Oct 29 15:30:21 2019
@@ -73,6 +73,10 @@
<surefire.skip.ut>false</surefire.skip.ut>
</properties>
+ <prerequisites>
+ <maven>3.2.1</maven>
+ </prerequisites>
+
<issueManagement>
<system>Jira</system>
<url>http://issues.apache.org/jira/browse/OAK</url>
@@ -240,7 +244,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- <version>1.16.0</version>
+ <version>1.21.0</version>
<executions>
<execution>
<id>generate-scr-scrdescriptor</id>
@@ -270,9 +274,14 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>3.0.0</version>
+ </plugin>
+ <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.11</version>
+ <version>0.12</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
@@ -382,7 +391,7 @@
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-module-markdown</artifactId>
- <version>1.5</version>
+ <version>1.7</version>
</dependency>
</dependencies>
</plugin>
Modified: jackrabbit/oak/branches/1.6/oak-pojosr/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-pojosr/pom.xml?rev=1869115&r1=1869114&r2=1869115&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-pojosr/pom.xml (original)
+++ jackrabbit/oak/branches/1.6/oak-pojosr/pom.xml Tue Oct 29 15:30:21 2019
@@ -40,7 +40,7 @@
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
- <version>1.4</version>
+ <version>1.5</version>
<!--suppress MavenModelInspection -->
<configuration>
<providerSelection>2.0</providerSelection>
Modified: jackrabbit/oak/branches/1.6/oak-run/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-run/pom.xml?rev=1869115&r1=1869114&r2=1869115&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-run/pom.xml (original)
+++ jackrabbit/oak/branches/1.6/oak-run/pom.xml Tue Oct 29 15:30:21 2019
@@ -73,7 +73,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
<configuration>
<archive>
<manifest>
@@ -102,7 +101,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
+ <version>1.8</version>
<executions>
<execution>
<phase>package</phase>
@@ -153,7 +152,7 @@
<plugin>
<groupId>com.phasebash.jsdoc</groupId>
<artifactId>jsdoc3-maven-plugin</artifactId>
- <version>1.1.0</version>
+ <version>1.2.0</version>
<executions>
<execution>
<id>generate-jsdoc</id>
Modified: jackrabbit/oak/branches/1.6/oak-segment-tar/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-segment-tar/pom.xml?rev=1869115&r1=1869114&r2=1869115&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-segment-tar/pom.xml (original)
+++ jackrabbit/oak/branches/1.6/oak-segment-tar/pom.xml Tue Oct 29 15:30:21 2019
@@ -74,7 +74,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.19.1</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration>
@@ -82,7 +81,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.19.1</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration>
Modified: jackrabbit/oak/branches/1.6/oak-upgrade/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-upgrade/pom.xml?rev=1869115&r1=1869114&r2=1869115&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-upgrade/pom.xml (original)
+++ jackrabbit/oak/branches/1.6/oak-upgrade/pom.xml Tue Oct 29 15:30:21 2019
@@ -44,7 +44,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>1.6</version>
+ <version>3.0.0</version>
<executions>
<execution>
<phase>package</phase>