Author: frm
Date: Tue Jun 21 12:08:09 2016
New Revision: 1749498
URL: http://svn.apache.org/viewvc?rev=1749498&view=rev
Log:
OAK-4491 - Restore the build to a releasable state
Modified:
jackrabbit/oak/trunk/oak-it/pom.xml
jackrabbit/oak/trunk/oak-jcr/pom.xml
jackrabbit/oak/trunk/oak-parent/pom.xml
jackrabbit/oak/trunk/oak-remote/pom.xml
jackrabbit/oak/trunk/oak-run/pom.xml
jackrabbit/oak/trunk/oak-segment-tar/pom.xml
jackrabbit/oak/trunk/oak-upgrade/pom.xml
Modified: jackrabbit/oak/trunk/oak-it/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/pom.xml?rev=1749498&r1=1749497&r2=1749498&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-it/pom.xml Tue Jun 21 12:08:09 2016
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-segment-tar</artifactId>
- <version>${oak.segment.tar.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -66,7 +66,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-segment-tar</artifactId>
- <version>${oak.segment.tar.version}</version>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -122,4 +122,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
Modified: jackrabbit/oak/trunk/oak-jcr/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/pom.xml?rev=1749498&r1=1749497&r2=1749498&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-jcr/pom.xml Tue Jun 21 12:08:09 2016
@@ -223,7 +223,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-segment-tar</artifactId>
- <version>${oak.segment.tar.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -255,7 +255,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-segment-tar</artifactId>
- <version>${oak.segment.tar.version}</version>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Modified: jackrabbit/oak/trunk/oak-parent/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-parent/pom.xml?rev=1749498&r1=1749497&r2=1749498&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-parent/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-parent/pom.xml Tue Jun 21 12:08:09 2016
@@ -73,7 +73,6 @@
<!-- whether skip the surefire unit testing during the integration testing.
Override with -Dsurefire.skip.ut=true when needed -->
<surefire.skip.ut>false</surefire.skip.ut>
- <oak.segment.tar.version>0.0.1-SNAPSHOT</oak.segment.tar.version>
</properties>
<issueManagement>
Modified: jackrabbit/oak/trunk/oak-remote/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-remote/pom.xml?rev=1749498&r1=1749497&r2=1749498&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-remote/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-remote/pom.xml Tue Jun 21 12:08:09 2016
@@ -98,13 +98,13 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-segment-tar</artifactId>
- <version>${oak.segment.tar.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-segment-tar</artifactId>
- <version>${oak.segment.tar.version}</version>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Modified: jackrabbit/oak/trunk/oak-run/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/pom.xml?rev=1749498&r1=1749497&r2=1749498&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-run/pom.xml Tue Jun 21 12:08:09 2016
@@ -238,7 +238,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-segment-tar</artifactId>
- <version>${oak.segment.tar.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
Modified: jackrabbit/oak/trunk/oak-segment-tar/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/pom.xml?rev=1749498&r1=1749497&r2=1749498&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/pom.xml Tue Jun 21 12:08:09 2016
@@ -23,26 +23,15 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.5.3</version>
- <relativePath />
+ <version>1.6-SNAPSHOT</version>
+ <relativePath>../oak-parent/pom.xml</relativePath>
</parent>
<artifactId>oak-segment-tar</artifactId>
- <version>0.0.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Oak Segment Tar</name>
- <properties>
- <oak.version>1.5.3</oak.version>
- </properties>
-
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/jackrabbit/oak/trunk/oak-segment-tar</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/jackrabbit/oak/trunk/oak-segment-tar</developerConnection>
-
<url>http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar</url>
- </scm>
-
<build>
<plugins>
<plugin>
@@ -74,25 +63,25 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-commons</artifactId>
- <version>${oak.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-blob</artifactId>
- <version>${oak.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-blob-cloud</artifactId>
- <version>${oak.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-core</artifactId>
- <version>${oak.version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
@@ -173,14 +162,14 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-core</artifactId>
- <version>${oak.version}</version>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-commons</artifactId>
- <version>${oak.version}</version>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -245,4 +234,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
Modified: jackrabbit/oak/trunk/oak-upgrade/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/pom.xml?rev=1749498&r1=1749497&r2=1749498&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-upgrade/pom.xml Tue Jun 21 12:08:09 2016
@@ -91,7 +91,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-segment-tar</artifactId>
- <version>${oak.segment.tar.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
