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 2017/09/25 13:18:22 UTC
svn commit: r1809626 - in /jackrabbit/branches/2.14: ./
jackrabbit-parent/pom.xml pom.xml
Author: reschke
Date: Mon Sep 25 13:18:22 2017
New Revision: 1809626
URL: http://svn.apache.org/viewvc?rev=1809626&view=rev
Log:
JCR-4190: maven-assembly-plugin:2.6:single failing with Java 9 - consistently use 3.0.0 (ported to 2.14)
Modified:
jackrabbit/branches/2.14/ (props changed)
jackrabbit/branches/2.14/jackrabbit-parent/pom.xml
jackrabbit/branches/2.14/pom.xml
Propchange: jackrabbit/branches/2.14/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 25 13:18:22 2017
@@ -1,3 +1,3 @@
/jackrabbit/branches/JCR-2272:1173165-1176545
/jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1776907,1776911-1776912,1776914,1776918,1779166,1779460,1779614,1779632,1780208,1780220,1780406,1785225,1786325,1786330,1787043,1787381,1792100,1792105,1792113,1792193,1793315,1793323,1793327,1793332,1796980,1797209,1797917,1798586,1799429,1799538,1799549,1799575,1800359,1800378,1800752,1802925,1802977,1807234,1807244
+/jackrabbit/trunk:1776907,1776911-1776912,1776914,1776918,1779166,1779460,1779614,1779632,1780208,1780220,1780406,1785225,1786325,1786330,1787043,1787381,1792100,1792105,1792113,1792193,1793315,1793323,1793327,1793332,1796980,1797209,1797917,1798586,1799429,1799538,1799549,1799575,1800359,1800378,1800752,1802925,1802977,1807234,1807244,1809624
Modified: jackrabbit/branches/2.14/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.14/jackrabbit-parent/pom.xml?rev=1809626&r1=1809625&r2=1809626&view=diff
==============================================================================
--- jackrabbit/branches/2.14/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/branches/2.14/jackrabbit-parent/pom.xml Mon Sep 25 13:18:22 2017
@@ -305,6 +305,10 @@
<version>2.4</version>
</plugin>
<plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>3.0.0</version>
+ </plugin>
+ <plugin>
<artifactId>maven-idea-plugin</artifactId>
<version>2.2.1</version>
</plugin>
Modified: jackrabbit/branches/2.14/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.14/pom.xml?rev=1809626&r1=1809625&r2=1809626&view=diff
==============================================================================
--- jackrabbit/branches/2.14/pom.xml (original)
+++ jackrabbit/branches/2.14/pom.xml Mon Sep 25 13:18:22 2017
@@ -105,7 +105,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.0.0</version>
<executions>
<execution>
<goals>