Author: davide
Date: Tue Feb 14 17:29:22 2017
New Revision: 1782992
URL: http://svn.apache.org/viewvc?rev=1782992&view=rev
Log:
OAK-5657 - leverage project.version in oak-examples
merge r1782990
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 Tue Feb 14 17:29:22 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
+/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782770,1782990
/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=1782992&r1=1782991&r2=1782992&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-examples/standalone/pom.xml (original)
+++ jackrabbit/oak/branches/1.6/oak-examples/standalone/pom.xml Tue Feb 14
17:29:22 2017
@@ -35,7 +35,7 @@
<description>Standalone application based on Spring Boot then embeds a
Jackrabbit Oak content repository</description>
<properties>
- <oak.version>1.6.1-SNAPSHOT</oak.version>
+ <oak.version>${project.version}</oak.version>
<tika.version>1.7</tika.version>
<skip.deployment>true</skip.deployment>
<slf4j.version>1.7.21</slf4j.version>
Propchange: jackrabbit/oak/branches/1.6/oak-examples/webapp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 14 17:29:22 2017
@@ -1,2 +1,3 @@
/jackrabbit/branches/JCR-2272/jackrabbit-webapp:1173165-1176545
+/jackrabbit/oak/trunk/oak-examples/webapp:1782990
/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=1782992&r1=1782991&r2=1782992&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-examples/webapp/pom.xml (original)
+++ jackrabbit/oak/branches/1.6/oak-examples/webapp/pom.xml Tue Feb 14 17:29:22
2017
@@ -35,7 +35,7 @@
<description>Web application that hosts and serves a Jackrabbit Oak content
repository</description>
<properties>
- <oak.version>1.6.1-SNAPSHOT</oak.version>
+ <oak.version>${project.version}</oak.version>
<tomcat.version>7.0.40</tomcat.version>
<tika.version>1.7</tika.version>
<skip.deployment>true</skip.deployment>
