Author: frm
Date: Mon Jun 20 09:33:17 2016
New Revision: 1749285
URL: http://svn.apache.org/viewvc?rev=1749285&view=rev
Log:
OAK-4446 - Make oak-segment-tar depend on a released version of Oak modules
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=1749285&r1=1749284&r2=1749285&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-it/pom.xml Mon Jun 20 09:33:17 2016
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-segment-tar</artifactId>
- <version>${project.version}</version>
+ <version>${oak.segment.tar.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -66,7 +66,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-segment-tar</artifactId>
- <version>${project.version}</version>
+ <version>${oak.segment.tar.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -122,4 +122,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: jackrabbit/oak/trunk/oak-jcr/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/pom.xml?rev=1749285&r1=1749284&r2=1749285&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-jcr/pom.xml Mon Jun 20 09:33:17 2016
@@ -223,7 +223,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-segment-tar</artifactId>
- <version>${project.version}</version>
+ <version>${oak.segment.tar.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -255,7 +255,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-segment-tar</artifactId>
- <version>${project.version}</version>
+ <version>${oak.segment.tar.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=1749285&r1=1749284&r2=1749285&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-parent/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-parent/pom.xml Mon Jun 20 09:33:17 2016
@@ -73,6 +73,7 @@
<!-- 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=1749285&r1=1749284&r2=1749285&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-remote/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-remote/pom.xml Mon Jun 20 09:33:17 2016
@@ -98,13 +98,13 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-segment-tar</artifactId>
- <version>${project.version}</version>
+ <version>${oak.segment.tar.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-segment-tar</artifactId>
- <version>${project.version}</version>
+ <version>${oak.segment.tar.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=1749285&r1=1749284&r2=1749285&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-run/pom.xml Mon Jun 20 09:33:17 2016
@@ -238,7 +238,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-segment-tar</artifactId>
- <version>${project.version}</version>
+ <version>${oak.segment.tar.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=1749285&r1=1749284&r2=1749285&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/pom.xml Mon Jun 20 09:33:17 2016
@@ -23,15 +23,46 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
- <version>1.6-SNAPSHOT</version>
- <relativePath>../oak-parent/pom.xml</relativePath>
+ <version>1.5.3</version>
+ <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>
+
+ <profiles>
+
+ <!-- When invoking release:perform for this module, this profile has to
+ be manually activated on the command line. -->
+
+ <profile>
+ <id>release-perform</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <arguments>-Dmaven.deploy.skip=false</arguments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
<build>
<plugins>
<plugin>
@@ -63,25 +94,25 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-commons</artifactId>
- <version>${project.version}</version>
+ <version>${oak.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-blob</artifactId>
- <version>${project.version}</version>
+ <version>${oak.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-blob-cloud</artifactId>
- <version>${project.version}</version>
+ <version>${oak.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-core</artifactId>
- <version>${project.version}</version>
+ <version>${oak.version}</version>
<scope>provided</scope>
</dependency>
@@ -162,14 +193,14 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-core</artifactId>
- <version>${project.version}</version>
+ <version>${oak.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-commons</artifactId>
- <version>${project.version}</version>
+ <version>${oak.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -234,4 +265,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: jackrabbit/oak/trunk/oak-upgrade/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/pom.xml?rev=1749285&r1=1749284&r2=1749285&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-upgrade/pom.xml Mon Jun 20 09:33:17 2016
@@ -91,7 +91,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-segment-tar</artifactId>
- <version>${project.version}</version>
+ <version>${oak.segment.tar.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>