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/28 16:44:18 UTC
svn commit: r1869083 - in /jackrabbit/oak/branches/1.4: ./
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-upgrade/pom.xml
pom.xml
Author: reschke
Date: Mon Oct 28 16:44:17 2019
New Revision: 1869083
URL: http://svn.apache.org/viewvc?rev=1869083&view=rev
Log:
OAK-6089: update maven plugins - temporarily backed out
Modified:
jackrabbit/oak/branches/1.4/ (props changed)
jackrabbit/oak/branches/1.4/oak-doc/src/site/site.xml
jackrabbit/oak/branches/1.4/oak-examples/webapp/ (props changed)
jackrabbit/oak/branches/1.4/oak-examples/webapp/pom.xml
jackrabbit/oak/branches/1.4/oak-parent/pom.xml
jackrabbit/oak/branches/1.4/oak-pojosr/pom.xml
jackrabbit/oak/branches/1.4/oak-run/pom.xml
jackrabbit/oak/branches/1.4/oak-upgrade/pom.xml
jackrabbit/oak/branches/1.4/pom.xml
Propchange: jackrabbit/oak/branches/1.4/
------------------------------------------------------------------------------
Reverse-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.4/oak-doc/src/site/site.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-doc/src/site/site.xml?rev=1869083&r1=1869082&r2=1869083&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-doc/src/site/site.xml (original)
+++ jackrabbit/oak/branches/1.4/oak-doc/src/site/site.xml Mon Oct 28 16:44:17 2019
@@ -76,12 +76,12 @@ under the License.
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
- <version>1.6</version>
+ <version>1.3.0</version>
</skin>
<custom>
<fluidoSkin>
- <sourceLineNumbersEnabled>false</sourceLineNumbersEnabled>
+ <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
<topBarEnabled>true</topBarEnabled>
<topBarIcon>
<name>Oak logo</name>
Propchange: jackrabbit/oak/branches/1.4/oak-examples/webapp/
------------------------------------------------------------------------------
Reverse-merged /jackrabbit/oak/trunk/oak-examples/webapp:r1791885,1791899,1791901
Modified: jackrabbit/oak/branches/1.4/oak-examples/webapp/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-examples/webapp/pom.xml?rev=1869083&r1=1869082&r2=1869083&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-examples/webapp/pom.xml (original)
+++ jackrabbit/oak/branches/1.4/oak-examples/webapp/pom.xml Mon Oct 28 16:44:17 2019
@@ -200,7 +200,7 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>9.4.3.v20170317</version>
+ <version>9.2.8.v20150217</version>
<configuration>
<scanIntervalSeconds>0</scanIntervalSeconds>
<connectors>
@@ -238,7 +238,7 @@
<!-- add the jar created by maven-antrun-plugin in our artifacts -->
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>3.0.0</version>
+ <version>1.9</version>
<executions>
<execution>
<id>attach-artifacts</id>
@@ -282,7 +282,7 @@
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>3.0.0</version>
+ <version>2.5</version>
<configuration>
<filesets>
<fileset>
Modified: jackrabbit/oak/branches/1.4/oak-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-parent/pom.xml?rev=1869083&r1=1869082&r2=1869083&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-parent/pom.xml (original)
+++ jackrabbit/oak/branches/1.4/oak-parent/pom.xml Mon Oct 28 16:44:17 2019
@@ -71,10 +71,6 @@
<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>
@@ -128,7 +124,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>3.3.0</version>
+ <version>3.0.0</version>
<extensions>true</extensions>
<inherited>true</inherited>
<configuration>
@@ -241,7 +237,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- <version>1.21.0</version>
+ <version>1.16.0</version>
<executions>
<execution>
<id>generate-scr-scrdescriptor</id>
@@ -271,18 +267,12 @@
</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.12</version>
+ <version>0.11</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.20</version>
<configuration>
<argLine>${test.opts}</argLine>
<systemPropertyVariables>
@@ -316,7 +306,7 @@
</plugin>
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
+ <version>2.11</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -378,7 +368,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.6</version>
+ <version>3.3</version>
<configuration>
<generateReports>false</generateReports>
<skip>true</skip>
@@ -388,19 +378,19 @@
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-module-markdown</artifactId>
- <version>1.7</version>
+ <version>1.5</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
- <version>1.1</version>
+ <version>1.0-beta-2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.9</version>
+ <version>2.4</version>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
Modified: jackrabbit/oak/branches/1.4/oak-pojosr/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-pojosr/pom.xml?rev=1869083&r1=1869082&r2=1869083&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-pojosr/pom.xml (original)
+++ jackrabbit/oak/branches/1.4/oak-pojosr/pom.xml Mon Oct 28 16:44:17 2019
@@ -41,7 +41,7 @@
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
- <version>1.5</version>
+ <version>1.4</version>
<!--suppress MavenModelInspection -->
<configuration>
<providerSelection>2.0</providerSelection>
Modified: jackrabbit/oak/branches/1.4/oak-run/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-run/pom.xml?rev=1869083&r1=1869082&r2=1869083&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-run/pom.xml (original)
+++ jackrabbit/oak/branches/1.4/oak-run/pom.xml Mon Oct 28 16:44:17 2019
@@ -107,6 +107,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>2.4</version>
<configuration>
<archive>
<manifest>
@@ -147,7 +148,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.8</version>
+ <version>1.7</version>
<executions>
<execution>
<phase>package</phase>
@@ -198,7 +199,7 @@
<plugin>
<groupId>com.phasebash.jsdoc</groupId>
<artifactId>jsdoc3-maven-plugin</artifactId>
- <version>1.2.0</version>
+ <version>1.1.0</version>
<executions>
<execution>
<id>generate-jsdoc</id>
Modified: jackrabbit/oak/branches/1.4/oak-upgrade/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-upgrade/pom.xml?rev=1869083&r1=1869082&r2=1869083&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-upgrade/pom.xml (original)
+++ jackrabbit/oak/branches/1.4/oak-upgrade/pom.xml Mon Oct 28 16:44:17 2019
@@ -44,7 +44,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.0.0</version>
+ <version>1.6</version>
<executions>
<execution>
<phase>package</phase>
Modified: jackrabbit/oak/branches/1.4/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/pom.xml?rev=1869083&r1=1869082&r2=1869083&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/pom.xml (original)
+++ jackrabbit/oak/branches/1.4/pom.xml Mon Oct 28 16:44:17 2019
@@ -93,7 +93,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>${findbugs.version}</version>
+ <version>2.4.0</version>
</plugin>
</plugins>
</reporting>