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 da...@apache.org on 2017/03/02 12:07:00 UTC
svn commit: r1785109 - in /jackrabbit/oak/branches/1.6: ./
oak-examples/standalone/pom.xml oak-examples/webapp/
oak-examples/webapp/pom.xml
Author: davide
Date: Thu Mar 2 12:07:00 2017
New Revision: 1785109
URL: http://svn.apache.org/viewvc?rev=1785109&view=rev
Log:
OAK-5875 - project.version in oak-example fails release-plugin
Modified:
jackrabbit/oak/branches/1.6/ (props changed)
jackrabbit/oak/branches/1.6/oak-examples/standalone/pom.xml
jackrabbit/oak/branches/1.6/oak-examples/webapp/ (props changed)
jackrabbit/oak/branches/1.6/oak-examples/webapp/pom.xml
Propchange: jackrabbit/oak/branches/1.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 2 12:07:00 2017
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782770,1782945,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783619,1783731,1783733,1783742,1783855,1783891,1784023,1784130,1784162,1784251,1784401,1784551,1785095
+/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782770,1782945,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783619,1783731,1783733,1783742,1783855,1783891,1784023,1784130,1784162,1784251,1784401,1784551,1785095,1785108
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.6/oak-examples/standalone/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-examples/standalone/pom.xml?rev=1785109&r1=1785108&r2=1785109&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-examples/standalone/pom.xml (original)
+++ jackrabbit/oak/branches/1.6/oak-examples/standalone/pom.xml Thu Mar 2 12:07:00 2017
@@ -35,7 +35,6 @@
<description>Standalone application based on Spring Boot then embeds a Jackrabbit Oak content repository</description>
<properties>
- <oak.version>${project.version}</oak.version>
<tika.version>1.7</tika.version>
<skip.deployment>true</skip.deployment>
<slf4j.version>1.7.21</slf4j.version>
@@ -155,17 +154,17 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-jcr</artifactId>
- <version>${oak.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-pojosr</artifactId>
- <version>${oak.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-lucene</artifactId>
- <version>${oak.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.googlecode.json-simple</groupId>
Propchange: jackrabbit/oak/branches/1.6/oak-examples/webapp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 2 12:07:00 2017
@@ -1,3 +1,3 @@
/jackrabbit/branches/JCR-2272/jackrabbit-webapp:1173165-1176545
-/jackrabbit/oak/trunk/oak-examples/webapp:1782990
+/jackrabbit/oak/trunk/oak-examples/webapp:1782990,1785108
/jackrabbit/sandbox/JCR-2415-lucene-3.0/jackrabbit-webapp:1060860-1064038
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=1785109&r1=1785108&r2=1785109&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-examples/webapp/pom.xml (original)
+++ jackrabbit/oak/branches/1.6/oak-examples/webapp/pom.xml Thu Mar 2 12:07:00 2017
@@ -35,7 +35,6 @@
<description>Web application that hosts and serves a Jackrabbit Oak content repository</description>
<properties>
- <oak.version>${project.version}</oak.version>
<tomcat.version>7.0.40</tomcat.version>
<tika.version>1.7</tika.version>
<skip.deployment>true</skip.deployment>
@@ -84,17 +83,17 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-jcr</artifactId>
- <version>${oak.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-pojosr</artifactId>
- <version>${oak.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-lucene</artifactId>
- <version>${oak.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>