You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by gn...@apache.org on 2018/02/21 09:05:13 UTC
svn commit: r1824945 - in /aries/trunk/jndi: jndi-bundle/pom.xml
jndi-core/pom.xml jndi-rmi/pom.xml jndi-url-itest/pom.xml
jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java
jndi-url/pom.xml parent/pom.xml pom.xml
Author: gnodet
Date: Wed Feb 21 09:05:13 2018
New Revision: 1824945
URL: http://svn.apache.org/viewvc?rev=1824945&view=rev
Log:
[jndi] Use a dev profile and align versions a bit
Modified:
aries/trunk/jndi/jndi-bundle/pom.xml
aries/trunk/jndi/jndi-core/pom.xml
aries/trunk/jndi/jndi-rmi/pom.xml
aries/trunk/jndi/jndi-url-itest/pom.xml
aries/trunk/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java
aries/trunk/jndi/jndi-url/pom.xml
aries/trunk/jndi/parent/pom.xml
aries/trunk/jndi/pom.xml
Modified: aries/trunk/jndi/jndi-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-bundle/pom.xml?rev=1824945&r1=1824944&r2=1824945&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-bundle/pom.xml (original)
+++ aries/trunk/jndi/jndi-bundle/pom.xml Wed Feb 21 09:05:13 2018
@@ -62,31 +62,36 @@
org.apache.aries.jndi.priv.Activator
</aries.osgi.activator>
<lastReleaseVersion>1.0.0</lastReleaseVersion>
+
+ <jndi-api.version>1.0.0</jndi-api.version>
+ <jndi-core.version>1.0.0</jndi-core.version>
+ <jndi-url.version>1.0.0</jndi-url.version>
+ <jndi-rmi.version>1.0.0</jndi-rmi.version>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.core</artifactId>
- <version>1.0.0</version>
+ <version>${jndi-core.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.url</artifactId>
- <version>1.0.0</version>
+ <version>${jndi-url.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.api</artifactId>
- <version>1.0.0</version>
+ <version>${jndi-api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.rmi</artifactId>
- <version>1.0.0</version>
+ <version>${jndi-rmi.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -167,6 +172,15 @@
<profiles>
<profile>
+ <id>dev</id>
+ <properties>
+ <jndi-api.version>${jndi-api.dev-version}</jndi-api.version>
+ <jndi-core.version>${jndi-core.dev-version}</jndi-core.version>
+ <jndi-url.version>${jndi-url.dev-version}</jndi-url.version>
+ <jndi-rmi.version>${jndi-rmi.dev-version}</jndi-rmi.version>
+ </properties>
+ </profile>
+ <profile>
<id>deploy</id>
<properties>
<createSourcesJar>true</createSourcesJar>
@@ -243,7 +257,6 @@
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</plugin>
-
<plugin>
<groupId>org.apache.aries.versioning</groupId>
<artifactId>org.apache.aries.versioning.plugin</artifactId>
Modified: aries/trunk/jndi/jndi-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-core/pom.xml?rev=1824945&r1=1824944&r2=1824945&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-core/pom.xml (original)
+++ aries/trunk/jndi/jndi-core/pom.xml Wed Feb 21 09:05:13 2018
@@ -32,7 +32,7 @@
<artifactId>org.apache.aries.jndi.core</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries JNDI Core</name>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<description>
This bundle contains the core of JNDI support for OSGi.
</description>
@@ -54,14 +54,29 @@
</aries.osgi.activator>
<aries.osgi.export.pkg />
<lastReleaseVersion>1.0.0</lastReleaseVersion>
+
+ <jndi-api.version>1.1.0</jndi-api.version>
</properties>
+ <profiles>
+ <profile>
+ <id>dev</id>
+ <properties>
+ <jndi-api.version>${jndi-api.dev-version}</jndi-api.version>
+ </properties>
+ </profile>
+ </profiles>
+
<dependencies>
<dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.api</artifactId>
<scope>provided</scope>
- <version>1.1.0</version>
+ <version>${jndi-api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.util</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -93,10 +108,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.util</artifactId>
- </dependency>
</dependencies>
</project>
Modified: aries/trunk/jndi/jndi-rmi/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-rmi/pom.xml?rev=1824945&r1=1824944&r2=1824945&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-rmi/pom.xml (original)
+++ aries/trunk/jndi/jndi-rmi/pom.xml Wed Feb 21 09:05:13 2018
@@ -52,19 +52,29 @@
</aries.osgi.private.pkg>
<aries.osgi.export.pkg />
<lastReleaseVersion>1.0.0</lastReleaseVersion>
+
+ <jndi-api.version>1.0.0</jndi-api.version>
</properties>
+ <profiles>
+ <profile>
+ <id>dev</id>
+ <properties>
+ <jndi-api.version>${jndi-api.dev-version}</jndi-api.version>
+ </properties>
+ </profile>
+ </profiles>
+
<dependencies>
<dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.api</artifactId>
<scope>provided</scope>
- <version>1.0.0</version>
+ <version>${jndi-api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
- <version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Modified: aries/trunk/jndi/jndi-url-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url-itest/pom.xml?rev=1824945&r1=1824944&r2=1824945&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-url-itest/pom.xml (original)
+++ aries/trunk/jndi/jndi-url-itest/pom.xml Wed Feb 21 09:05:13 2018
@@ -43,12 +43,46 @@
</scm>
<properties>
- <exam.version>4.11.0</exam.version>
- <url.version>1.6.0</url.version>
+ <pax-exam.version>4.11.0</pax-exam.version>
+ <pax-url.version>1.6.0</pax-url.version>
+
+ <jndi-api.version>${jndi-api.dev-version}</jndi-api.version>
+ <jndi-bundle.version>${jndi-bundle.dev-version}</jndi-bundle.version>
+ <jndi-url.version>${jndi-url.dev-version}</jndi-url.version>
+ <jndi-url-itest-web.version>${jndi-url-itest-web.dev-version}</jndi-url-itest-web.version>
+ <jndi-url-itest-biz.version>${jndi-url-itest-biz.dev-version}</jndi-url-itest-biz.version>
</properties>
<dependencies>
<dependency>
+ <groupId>org.apache.aries.jndi</groupId>
+ <artifactId>org.apache.aries.jndi</artifactId>
+ <scope>test</scope>
+ <version>${jndi-bundle.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.aries.jndi</groupId>
+ <artifactId>org.apache.aries.jndi.url</artifactId>
+ <scope>test</scope>
+ <version>${jndi-url.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.aries.jndi</groupId>
+ <artifactId>org.apache.aries.jndi.url.itest.web</artifactId>
+ <scope>test</scope>
+ <version>${jndi-url-itest-web.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.aries.jndi</groupId>
+ <artifactId>org.apache.aries.jndi.url.itest.biz</artifactId>
+ <scope>test</scope>
+ <version>${jndi-url-itest-biz.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
<scope>provided</scope>
@@ -61,7 +95,7 @@
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
@@ -69,44 +103,30 @@
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.api</artifactId>
<scope>test</scope>
- <version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
<scope>test</scope>
- <version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
<scope>test</scope>
- <version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
- <artifactId>org.apache.aries.proxy</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <artifactId>org.apache.aries.proxy.api</artifactId>
</dependency>
-
<dependency>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>org.apache.aries.jndi.url.itest.web</artifactId>
- <scope>test</scope>
- <version>1.0.0</version>
+ <groupId>org.apache.aries.proxy</groupId>
+ <artifactId>org.apache.aries.proxy.impl</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>org.apache.aries.jndi.url.itest.biz</artifactId>
- <scope>test</scope>
- <version>1.0.0</version>
- </dependency>
-
- <!-- pax exam -->
+ <!-- pax exam -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -115,31 +135,31 @@
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam</artifactId>
- <version>${exam.version}</version>
+ <version>${pax-exam.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-container-forked</artifactId>
- <version>${exam.version}</version>
+ <version>${pax-exam.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit4</artifactId>
- <version>${exam.version}</version>
+ <version>${pax-exam.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-link-mvn</artifactId>
- <version>${exam.version}</version>
+ <version>${pax-exam.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId>
- <version>${url.version}</version>
+ <version>${pax-url.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -231,20 +251,6 @@
<version>3.4.0</version>
</dependency>
- <dependency>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>org.apache.aries.jndi</artifactId>
- <scope>test</scope>
- <version>1.0.1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>org.apache.aries.jndi.url</artifactId>
- <scope>test</scope>
- <version>1.1.1-SNAPSHOT</version>
- </dependency>
-
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-api</artifactId>
Modified: aries/trunk/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java?rev=1824945&r1=1824944&r2=1824945&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java (original)
+++ aries/trunk/jndi/jndi-url-itest/src/test/java/org/apache/aries/jndi/itests/JndiUrlIntegrationTest.java Wed Feb 21 09:05:13 2018
@@ -158,7 +158,8 @@ public class JndiUrlIntegrationTest exte
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.api").versionAsInProject(),
mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint.core").versionAsInProject(),
- mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").versionAsInProject(),
+ mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.api").versionAsInProject(),
+ mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy.impl").versionAsInProject(),
mavenBundle("org.apache.aries", "org.apache.aries.util").versionAsInProject(),
mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi").versionAsInProject(),
Modified: aries/trunk/jndi/jndi-url/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url/pom.xml?rev=1824945&r1=1824944&r2=1824945&view=diff
==============================================================================
--- aries/trunk/jndi/jndi-url/pom.xml (original)
+++ aries/trunk/jndi/jndi-url/pom.xml Wed Feb 21 09:05:13 2018
@@ -62,49 +62,56 @@
org.apache.aries.proxy.ProxyManager
</aries.osgi.import.service>
<lastReleaseVersion>1.0.0</lastReleaseVersion>
-
+
+ <jndi-api.version>1.1.0</jndi-api.version>
+ <jndi-core.version>1.0.0</jndi-core.version>
</properties>
+ <profiles>
+ <profile>
+ <id>dev</id>
+ <properties>
+ <jndi-api.version>${jndi-api.dev-version}</jndi-api.version>
+ <jndi-core.version>${jndi-core.dev-version}</jndi-core.version>
+ </properties>
+ </profile>
+ </profiles>
+
<dependencies>
<dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.api</artifactId>
<scope>provided</scope>
- <version>1.1.0</version>
+ <version>${jndi-api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.jndi</groupId>
+ <artifactId>org.apache.aries.jndi.core</artifactId>
+ <version>${jndi-core.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
- <version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy.api</artifactId>
- <version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
- <version>6.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.enterprise</artifactId>
- <version>6.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>org.apache.aries.jndi.core</artifactId>
- <scope>test</scope>
- <version>1.0.0</version>
- </dependency>
- <dependency>
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<scope>test</scope>
- <version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: aries/trunk/jndi/parent/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/parent/pom.xml?rev=1824945&r1=1824944&r2=1824945&view=diff
==============================================================================
--- aries/trunk/jndi/parent/pom.xml (original)
+++ aries/trunk/jndi/parent/pom.xml Wed Feb 21 09:05:13 2018
@@ -44,6 +44,16 @@
<url>http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-parent</url>
</scm>
+ <properties>
+ <jndi-api.dev-version>1.1.1-SNAPSHOT</jndi-api.dev-version>
+ <jndi-core.dev-version>1.1.0-SNAPSHOT</jndi-core.dev-version>
+ <jndi-bundle.dev-version>1.0.1-SNAPSHOT</jndi-bundle.dev-version>
+ <jndi-url.dev-version>1.1.1-SNAPSHOT</jndi-url.dev-version>
+ <jndi-rmi.dev-version>1.0.1-SNAPSHOT</jndi-rmi.dev-version>
+ <jndi-url-itest-web.dev-version>1.0.1-SNAPSHOT</jndi-url-itest-web.dev-version>
+ <jndi-url-itest-biz.dev-version>1.0.1-SNAPSHOT</jndi-url-itest-biz.dev-version>
+ </properties>
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -52,6 +62,26 @@
<version>1.0.0</version>
</dependency>
<dependency>
+ <groupId>org.apache.aries.proxy</groupId>
+ <artifactId>org.apache.aries.proxy.api</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.proxy</groupId>
+ <artifactId>org.apache.aries.proxy.impl</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint.api</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint.core</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
<version>6.0.0</version>
Modified: aries/trunk/jndi/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jndi/pom.xml?rev=1824945&r1=1824944&r2=1824945&view=diff
==============================================================================
--- aries/trunk/jndi/pom.xml (original)
+++ aries/trunk/jndi/pom.xml Wed Feb 21 09:05:13 2018
@@ -50,14 +50,4 @@
<module>jndi-url-itest</module>
</modules>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <version>6.0.0</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
</project>