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 fr...@apache.org on 2016/06/22 12:52:50 UTC
svn commit: r1749670 - in /jackrabbit/oak/trunk: oak-it/pom.xml
oak-jcr/pom.xml oak-parent/pom.xml oak-remote/pom.xml oak-run/pom.xml
oak-segment-tar/pom.xml oak-upgrade/pom.xml
Author: frm
Date: Wed Jun 22 12:52:50 2016
New Revision: 1749670
URL: http://svn.apache.org/viewvc?rev=1749670&view=rev
Log:
OAK-4446 - Remove snapshot dependencies from oak-segment-tar
For oak-segment-tar to be released, snapshot dependencies have to be avoided.
Moreover, other modules that have a dependency on oak-segment-tar have to be
updated to use a specific version of that module.
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=1749670&r1=1749669&r2=1749670&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-it/pom.xml Wed Jun 22 12:52:50 2016
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-segment-tar</artifactId>
- <version>${project.version}</version>
+ <version>${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>${segment.tar.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Modified: jackrabbit/oak/trunk/oak-jcr/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/pom.xml?rev=1749670&r1=1749669&r2=1749670&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-jcr/pom.xml Wed Jun 22 12:52:50 2016
@@ -223,7 +223,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-segment-tar</artifactId>
- <version>${project.version}</version>
+ <version>${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>${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=1749670&r1=1749669&r2=1749670&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-parent/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-parent/pom.xml Wed Jun 22 12:52:50 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>
+ <segment.tar.version>0.0.1-SNAPSHOT</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=1749670&r1=1749669&r2=1749670&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-remote/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-remote/pom.xml Wed Jun 22 12:52:50 2016
@@ -98,13 +98,13 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-segment-tar</artifactId>
- <version>${project.version}</version>
+ <version>${segment.tar.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-segment-tar</artifactId>
- <version>${project.version}</version>
+ <version>${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=1749670&r1=1749669&r2=1749670&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-run/pom.xml Wed Jun 22 12:52:50 2016
@@ -238,7 +238,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-segment-tar</artifactId>
- <version>${project.version}</version>
+ <version>${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=1749670&r1=1749669&r2=1749670&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/pom.xml Wed Jun 22 12:52:50 2016
@@ -23,15 +23,20 @@
<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>
+
<build>
<plugins>
<plugin>
@@ -48,10 +53,21 @@
<artifactId>maven-scr-plugin</artifactId>
</plugin>
<plugin>
- <artifactId>maven-deploy-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
<configuration>
- <skip>true</skip>
+ <systemPropertyVariables>
+ <nsfixtures>SEGMENT_TAR</nsfixtures>
+ </systemPropertyVariables>
</configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
@@ -63,25 +79,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 +178,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>
Modified: jackrabbit/oak/trunk/oak-upgrade/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/pom.xml?rev=1749670&r1=1749669&r2=1749670&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-upgrade/pom.xml Wed Jun 22 12:52:50 2016
@@ -91,7 +91,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-segment-tar</artifactId>
- <version>${project.version}</version>
+ <version>${segment.tar.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>