You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cu...@apache.org on 2012/04/06 23:56:42 UTC
svn commit: r1310604 - in /aries/branches/1.0-prototype:
application/application-modeller/ jndi/ jndi/jndi-api/ jndi/jndi-bundle/
jndi/jndi-core/ jndi/jndi-legacy-support/ jndi/jndi-rmi/
jndi/jndi-url-itest-biz/ jndi/jndi-url-itest-web/ jndi/jndi-url-i...
Author: cumminsh
Date: Fri Apr 6 21:56:41 2012
New Revision: 1310604
URL: http://svn.apache.org/viewvc?rev=1310604&view=rev
Log:
Updating JNDI module to 1.0.0-SNAPSHOT, and updating dependencies
Modified:
aries/branches/1.0-prototype/application/application-modeller/pom.xml
aries/branches/1.0-prototype/jndi/jndi-api/pom.xml
aries/branches/1.0-prototype/jndi/jndi-bundle/pom.xml
aries/branches/1.0-prototype/jndi/jndi-core/pom.xml
aries/branches/1.0-prototype/jndi/jndi-legacy-support/pom.xml
aries/branches/1.0-prototype/jndi/jndi-rmi/pom.xml
aries/branches/1.0-prototype/jndi/jndi-url-itest-biz/pom.xml
aries/branches/1.0-prototype/jndi/jndi-url-itest-web/pom.xml
aries/branches/1.0-prototype/jndi/jndi-url-itest/pom.xml
aries/branches/1.0-prototype/jndi/jndi-url/pom.xml
aries/branches/1.0-prototype/jndi/pom.xml
aries/branches/1.0-prototype/jpa/jpa-container-itest/pom.xml
aries/branches/1.0-prototype/samples/pom.xml
Modified: aries/branches/1.0-prototype/application/application-modeller/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/application/application-modeller/pom.xml?rev=1310604&r1=1310603&r2=1310604&view=diff
==============================================================================
--- aries/branches/1.0-prototype/application/application-modeller/pom.xml (original)
+++ aries/branches/1.0-prototype/application/application-modeller/pom.xml Fri Apr 6 21:56:41 2012
@@ -81,7 +81,7 @@
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.api</artifactId>
<scope>provided</scope>
- <version>0.3</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<!-- Blueprint API must come before OSGi compendium because we want to compile against the Java 5 interfaces
Modified: aries/branches/1.0-prototype/jndi/jndi-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/jndi/jndi-api/pom.xml?rev=1310604&r1=1310603&r2=1310604&view=diff
==============================================================================
--- aries/branches/1.0-prototype/jndi/jndi-api/pom.xml (original)
+++ aries/branches/1.0-prototype/jndi/jndi-api/pom.xml Fri Apr 6 21:56:41 2012
@@ -33,7 +33,7 @@
<artifactId>org.apache.aries.jndi.api</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries JNDI API</name>
- <version>0.3.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<description>
This bundle contains the JNDI 1.0.0 API
</description>
Modified: aries/branches/1.0-prototype/jndi/jndi-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/jndi/jndi-bundle/pom.xml?rev=1310604&r1=1310603&r2=1310604&view=diff
==============================================================================
--- aries/branches/1.0-prototype/jndi/jndi-bundle/pom.xml (original)
+++ aries/branches/1.0-prototype/jndi/jndi-bundle/pom.xml Fri Apr 6 21:56:41 2012
@@ -27,7 +27,7 @@
<artifactId>org.apache.aries.jndi</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries JNDI Bundle</name>
- <version>0.3.2-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<description>
This bundle contains the core JNDI along with the OSGi url handler.
It's composed of the jndi-api, jndi-core and jndi-url modules.
@@ -63,25 +63,25 @@
<dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.core</artifactId>
- <version>0.3.2-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.url</artifactId>
- <version>0.3.2-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.api</artifactId>
- <version>0.3</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.rmi</artifactId>
- <version>0.3.2-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: aries/branches/1.0-prototype/jndi/jndi-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/jndi/jndi-core/pom.xml?rev=1310604&r1=1310603&r2=1310604&view=diff
==============================================================================
--- aries/branches/1.0-prototype/jndi/jndi-core/pom.xml (original)
+++ aries/branches/1.0-prototype/jndi/jndi-core/pom.xml Fri Apr 6 21:56:41 2012
@@ -29,7 +29,7 @@
<artifactId>org.apache.aries.jndi.core</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries JNDI Core</name>
- <version>0.3.2-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<description>
This bundle contains the core of JNDI support for OSGi.
</description>
@@ -66,7 +66,7 @@
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.api</artifactId>
<scope>provided</scope>
- <version>0.3</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Modified: aries/branches/1.0-prototype/jndi/jndi-legacy-support/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/jndi/jndi-legacy-support/pom.xml?rev=1310604&r1=1310603&r2=1310604&view=diff
==============================================================================
--- aries/branches/1.0-prototype/jndi/jndi-legacy-support/pom.xml (original)
+++ aries/branches/1.0-prototype/jndi/jndi-legacy-support/pom.xml Fri Apr 6 21:56:41 2012
@@ -1,63 +1,63 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>java5-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath />
- </parent>
-
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>org.apache.aries.jndi.legacy.support</artifactId>
- <packaging>bundle</packaging>
- <version>0.3.2-SNAPSHOT</version>
- <name>Apache Aries JNDI Support for Legacy Runtimes</name>
- <description>
- This bundle contains support for legacy runtimes which rely on the thread context classloader to load JNDI implementations. It is intended for use with OSGi Web Container implementations which do not correctly work with the OSGi JNDI Service specification.
- </description>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-legacy-support</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-legacy-support</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-legacy-support</url>
- </scm>
-
- <properties>
- <aries.osgi.export.pkg />
- <aries.osgi.private.pkg>
- org.apache.aries.jndi.legacy.support
- </aries.osgi.private.pkg>
- <aries.osgi.activator>
- org.apache.aries.jndi.legacy.support.Activator
- </aries.osgi.activator>
- <aries.osgi.import.pkg> *
- </aries.osgi.import.pkg>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
-</project>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath />
+ </parent>
+
+ <groupId>org.apache.aries.jndi</groupId>
+ <artifactId>org.apache.aries.jndi.legacy.support</artifactId>
+ <packaging>bundle</packaging>
+ <version>1.0.0-SNAPSHOT</version>
+ <name>Apache Aries JNDI Support for Legacy Runtimes</name>
+ <description>
+ This bundle contains support for legacy runtimes which rely on the thread context classloader to load JNDI implementations. It is intended for use with OSGi Web Container implementations which do not correctly work with the OSGi JNDI Service specification.
+ </description>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-legacy-support</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-legacy-support</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-legacy-support</url>
+ </scm>
+
+ <properties>
+ <aries.osgi.export.pkg />
+ <aries.osgi.private.pkg>
+ org.apache.aries.jndi.legacy.support
+ </aries.osgi.private.pkg>
+ <aries.osgi.activator>
+ org.apache.aries.jndi.legacy.support.Activator
+ </aries.osgi.activator>
+ <aries.osgi.import.pkg> *
+ </aries.osgi.import.pkg>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+</project>
Modified: aries/branches/1.0-prototype/jndi/jndi-rmi/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/jndi/jndi-rmi/pom.xml?rev=1310604&r1=1310603&r2=1310604&view=diff
==============================================================================
--- aries/branches/1.0-prototype/jndi/jndi-rmi/pom.xml (original)
+++ aries/branches/1.0-prototype/jndi/jndi-rmi/pom.xml Fri Apr 6 21:56:41 2012
@@ -1,86 +1,86 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>java5-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath />
- </parent>
-
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>org.apache.aries.jndi.rmi</artifactId>
- <packaging>bundle</packaging>
- <name>Apache Aries JNDI RMI Handler</name>
- <version>0.3.2-SNAPSHOT</version>
- <description>
- This bundle contains the JNDI RMI handler
- </description>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-rmi</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-rmi</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-rmi</url>
- </scm>
-
- <properties>
- <aries.osgi.activator>
- org.apache.aries.jndi.rmi.Activator
- </aries.osgi.activator>
- <aries.osgi.private.pkg>
- ${project.artifactId}*
- </aries.osgi.private.pkg>
- <aries.osgi.export.pkg />
- <!--
- We use the range macro to get a 0.x to 0.x+1 version range while Aries is still
- stabilizing API. This should be removed once the dependency is available at a
- version greater than or equal to 1.0.0
- -->
- <aries.osgi.import.pkg>
- org.apache.aries.*;version="$<range;[==,=+)>",
- *
- </aries.osgi.import.pkg>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>org.apache.aries.jndi.api</artifactId>
- <scope>provided</scope>
- <version>0.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.util</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
-</project>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath />
+ </parent>
+
+ <groupId>org.apache.aries.jndi</groupId>
+ <artifactId>org.apache.aries.jndi.rmi</artifactId>
+ <packaging>bundle</packaging>
+ <name>Apache Aries JNDI RMI Handler</name>
+ <version>1.0.0-SNAPSHOT</version>
+ <description>
+ This bundle contains the JNDI RMI handler
+ </description>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-rmi</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-rmi</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-rmi</url>
+ </scm>
+
+ <properties>
+ <aries.osgi.activator>
+ org.apache.aries.jndi.rmi.Activator
+ </aries.osgi.activator>
+ <aries.osgi.private.pkg>
+ ${project.artifactId}*
+ </aries.osgi.private.pkg>
+ <aries.osgi.export.pkg />
+ <!--
+ We use the range macro to get a 0.x to 0.x+1 version range while Aries is still
+ stabilizing API. This should be removed once the dependency is available at a
+ version greater than or equal to 1.0.0
+ -->
+ <aries.osgi.import.pkg>
+ org.apache.aries.*;version="$<range;[==,=+)>",
+ *
+ </aries.osgi.import.pkg>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.aries.jndi</groupId>
+ <artifactId>org.apache.aries.jndi.api</artifactId>
+ <scope>provided</scope>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.util</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+</project>
Modified: aries/branches/1.0-prototype/jndi/jndi-url-itest-biz/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/jndi/jndi-url-itest-biz/pom.xml?rev=1310604&r1=1310603&r2=1310604&view=diff
==============================================================================
--- aries/branches/1.0-prototype/jndi/jndi-url-itest-biz/pom.xml (original)
+++ aries/branches/1.0-prototype/jndi/jndi-url-itest-biz/pom.xml Fri Apr 6 21:56:41 2012
@@ -1,51 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>java5-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath />
- </parent>
-
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>org.apache.aries.jndi.url.itest.biz</artifactId>
- <name>Apache Aries JNDI "business logic" test bundle for Aries jndi-url iTests</name>
- <version>0.3.2-SNAPSHOT</version>
- <packaging>bundle</packaging>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-url-itest-biz</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-url-itest-biz</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url-itest-biz</url>
- </scm>
-
- <properties>
- <aries.osgi.import.pkg>*
- </aries.osgi.import.pkg>
- <aries.osgi.private.pkg>*
- </aries.osgi.private.pkg>
- <aries.osgi.export />
- </properties>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath />
+ </parent>
+
+ <groupId>org.apache.aries.jndi</groupId>
+ <artifactId>org.apache.aries.jndi.url.itest.biz</artifactId>
+ <name>Apache Aries JNDI "business logic" test bundle for Aries jndi-url iTests</name>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-url-itest-biz</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-url-itest-biz</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url-itest-biz</url>
+ </scm>
+
+ <properties>
+ <aries.osgi.import.pkg>*
+ </aries.osgi.import.pkg>
+ <aries.osgi.private.pkg>*
+ </aries.osgi.private.pkg>
+ <aries.osgi.export />
+ </properties>
+
+</project>
Modified: aries/branches/1.0-prototype/jndi/jndi-url-itest-web/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/jndi/jndi-url-itest-web/pom.xml?rev=1310604&r1=1310603&r2=1310604&view=diff
==============================================================================
--- aries/branches/1.0-prototype/jndi/jndi-url-itest-web/pom.xml (original)
+++ aries/branches/1.0-prototype/jndi/jndi-url-itest-web/pom.xml Fri Apr 6 21:56:41 2012
@@ -1,76 +1,76 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>java5-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath />
- </parent>
-
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>org.apache.aries.jndi.url.itest.web</artifactId>
- <name>Apache Aries JNDI Test Bundle for Aries jndi-url iTests</name>
- <version>0.3.2-SNAPSHOT</version>
- <packaging>bundle</packaging>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-url-itest-web</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-url-itest-web</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url-itest-web</url>
- </scm>
-
- <properties>
- <aries.osgi.private.pkg>
- org.apache.aries.jndiurl.itest,
- org.apache.aries.jndiurl.itest.beans
- </aries.osgi.private.pkg>
- <aries.osgi.import.pkg>
- javax.servlet*;version=2.5,
- *
- </aries.osgi.import.pkg>
- <aries.osgi.export.pkg />
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
- <version>1.2</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Web-ContextPath>/jndiUrlItest</Web-ContextPath>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath />
+ </parent>
+
+ <groupId>org.apache.aries.jndi</groupId>
+ <artifactId>org.apache.aries.jndi.url.itest.web</artifactId>
+ <name>Apache Aries JNDI Test Bundle for Aries jndi-url iTests</name>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-url-itest-web</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-url-itest-web</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url-itest-web</url>
+ </scm>
+
+ <properties>
+ <aries.osgi.private.pkg>
+ org.apache.aries.jndiurl.itest,
+ org.apache.aries.jndiurl.itest.beans
+ </aries.osgi.private.pkg>
+ <aries.osgi.import.pkg>
+ javax.servlet*;version=2.5,
+ *
+ </aries.osgi.import.pkg>
+ <aries.osgi.export.pkg />
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <version>1.2</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Web-ContextPath>/jndiUrlItest</Web-ContextPath>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Modified: aries/branches/1.0-prototype/jndi/jndi-url-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/jndi/jndi-url-itest/pom.xml?rev=1310604&r1=1310603&r2=1310604&view=diff
==============================================================================
--- aries/branches/1.0-prototype/jndi/jndi-url-itest/pom.xml (original)
+++ aries/branches/1.0-prototype/jndi/jndi-url-itest/pom.xml Fri Apr 6 21:56:41 2012
@@ -1,298 +1,298 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>java5-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath />
- </parent>
-
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>org.apache.aries.jndi.url.itest</artifactId>
- <name>Apache Aries JNDI iTests for jndi-url</name>
- <version>0.3.2-SNAPSHOT</version>
- <description>
- Integration test for JNDI
- </description>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-url-itest</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-url-itest</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url-itest</url>
- </scm>
-
- <dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>osgi</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint.api</artifactId>
- <scope>test</scope>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint.core</artifactId>
- <scope>test</scope>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.util</artifactId>
- <scope>test</scope>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.aries.proxy</groupId>
- <artifactId>org.apache.aries.proxy</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>org.apache.aries.jndi.url.itest.web</artifactId>
- <scope>test</scope>
- <version>0.3.2-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>org.apache.aries.jndi.url.itest.biz</artifactId>
- <scope>test</scope>
- <version>0.3.2-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-container-default</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-junit-extender-impl</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.ops4j.pax.runner</groupId>
- <artifactId>pax-runner-no-jcl</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.ops4j.pax.swissbox</groupId>
- <artifactId>pax-swissbox-tinybundles</artifactId>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.ops4j.pax.logging</groupId>
- <artifactId>pax-logging-api</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.ops4j.pax.logging</groupId>
- <artifactId>pax-logging-service</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.ops4j.pax.url</groupId>
- <artifactId>pax-url-mvn</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
- <scope>test</scope>
- <version>2.1_3_4</version>
- </dependency>
-
- <dependency>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm-all</artifactId>
- <scope>test</scope>
- <version>4.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>cm</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.osgi</groupId>
- <artifactId>services</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
- <scope>test</scope>
- <version>1.2</version>
- </dependency>
-
- <dependency>
- <groupId>org.ops4j.pax.web</groupId>
- <artifactId>pax-web-extender-war</artifactId>
- <scope>test</scope>
- <version>0.8.1</version>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.web</groupId>
- <artifactId>pax-web-jetty-bundle</artifactId>
- <scope>test</scope>
- <version>0.8.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.fileinstall</artifactId>
- <scope>test</scope>
- <version>2.0.8</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>org.apache.aries.jndi</artifactId>
- <scope>test</scope>
- <version>0.3.2-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.aries.jndi</groupId>
- <artifactId>org.apache.aries.jndi.url</artifactId>
- <scope>test</scope>
- <version>0.3.2-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.aries.testsupport</groupId>
- <artifactId>org.apache.aries.testsupport.unit</artifactId>
- <version>0.4</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>pertest</forkMode>
- <excludes>
- <exclude>**/*$*</exclude>
- <exclude>**/Abstract*.java</exclude>
- </excludes>
- <includes>
- <include>**/Test*.java</include>
- <include>**/*Test.java</include>
- </includes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>maven-paxexam-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-config</id>
- <goals>
- <goal>generate-depends-file</goal>
- </goals>
- <configuration>
- <outputFile>${project.build.directory}/test-classes/META-INF/maven/dependencies.properties</outputFile>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>ci-build-profile</id>
- <activation>
- <property>
- <name>maven.repo.local</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!--
- when the local repo location has been specified, we need to pass
- on this information to PAX mvn url
- -->
- <argLine>-Dorg.ops4j.pax.url.mvn.localRepository=${maven.repo.local}</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
-
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath />
+ </parent>
+
+ <groupId>org.apache.aries.jndi</groupId>
+ <artifactId>org.apache.aries.jndi.url.itest</artifactId>
+ <name>Apache Aries JNDI iTests for jndi-url</name>
+ <version>1.0.0-SNAPSHOT</version>
+ <description>
+ Integration test for JNDI
+ </description>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-url-itest</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jndi/jndi-url-itest</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jndi/jndi-url-itest</url>
+ </scm>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>osgi</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint.api</artifactId>
+ <scope>test</scope>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint.core</artifactId>
+ <scope>test</scope>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.util</artifactId>
+ <scope>test</scope>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.aries.proxy</groupId>
+ <artifactId>org.apache.aries.proxy</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.aries.jndi</groupId>
+ <artifactId>org.apache.aries.jndi.url.itest.web</artifactId>
+ <scope>test</scope>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.aries.jndi</groupId>
+ <artifactId>org.apache.aries.jndi.url.itest.biz</artifactId>
+ <scope>test</scope>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-container-default</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-junit-extender-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.ops4j.pax.runner</groupId>
+ <artifactId>pax-runner-no-jcl</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.ops4j.pax.swissbox</groupId>
+ <artifactId>pax-swissbox-tinybundles</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-service</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.ops4j.pax.url</groupId>
+ <artifactId>pax-url-mvn</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
+ <scope>test</scope>
+ <version>2.1_3_4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-all</artifactId>
+ <scope>test</scope>
+ <version>4.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>cm</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.osgi</groupId>
+ <artifactId>services</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <scope>test</scope>
+ <version>1.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.ops4j.pax.web</groupId>
+ <artifactId>pax-web-extender-war</artifactId>
+ <scope>test</scope>
+ <version>0.8.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.web</groupId>
+ <artifactId>pax-web-jetty-bundle</artifactId>
+ <scope>test</scope>
+ <version>0.8.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.fileinstall</artifactId>
+ <scope>test</scope>
+ <version>2.0.8</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.aries.jndi</groupId>
+ <artifactId>org.apache.aries.jndi</artifactId>
+ <scope>test</scope>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.aries.jndi</groupId>
+ <artifactId>org.apache.aries.jndi.url</artifactId>
+ <scope>test</scope>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.aries.testsupport</groupId>
+ <artifactId>org.apache.aries.testsupport.unit</artifactId>
+ <version>0.4</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>pertest</forkMode>
+ <excludes>
+ <exclude>**/*$*</exclude>
+ <exclude>**/Abstract*.java</exclude>
+ </excludes>
+ <includes>
+ <include>**/Test*.java</include>
+ <include>**/*Test.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>maven-paxexam-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-config</id>
+ <goals>
+ <goal>generate-depends-file</goal>
+ </goals>
+ <configuration>
+ <outputFile>${project.build.directory}/test-classes/META-INF/maven/dependencies.properties</outputFile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>ci-build-profile</id>
+ <activation>
+ <property>
+ <name>maven.repo.local</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!--
+ when the local repo location has been specified, we need to pass
+ on this information to PAX mvn url
+ -->
+ <argLine>-Dorg.ops4j.pax.url.mvn.localRepository=${maven.repo.local}</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
+
Modified: aries/branches/1.0-prototype/jndi/jndi-url/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/jndi/jndi-url/pom.xml?rev=1310604&r1=1310603&r2=1310604&view=diff
==============================================================================
--- aries/branches/1.0-prototype/jndi/jndi-url/pom.xml (original)
+++ aries/branches/1.0-prototype/jndi/jndi-url/pom.xml Fri Apr 6 21:56:41 2012
@@ -29,7 +29,7 @@
<artifactId>org.apache.aries.jndi.url</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries JNDI URL Handler</name>
- <version>0.3.2-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<description>
This bundle contains the JNDI URL handler for OSGi
</description>
@@ -68,7 +68,7 @@
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.api</artifactId>
<scope>provided</scope>
- <version>0.3</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries</groupId>
@@ -94,7 +94,7 @@
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.core</artifactId>
<scope>test</scope>
- <version>0.3.2-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
Modified: aries/branches/1.0-prototype/jndi/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/jndi/pom.xml?rev=1310604&r1=1310603&r2=1310604&view=diff
==============================================================================
--- aries/branches/1.0-prototype/jndi/pom.xml (original)
+++ aries/branches/1.0-prototype/jndi/pom.xml Fri Apr 6 21:56:41 2012
@@ -30,7 +30,7 @@
<artifactId>jndi</artifactId>
<name>Apache Aries JNDI</name>
<packaging>pom</packaging>
- <version>0.3.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<description>
JNDI support for OSGi - Reactor POM
Modified: aries/branches/1.0-prototype/jpa/jpa-container-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/jpa/jpa-container-itest/pom.xml?rev=1310604&r1=1310603&r2=1310604&view=diff
==============================================================================
--- aries/branches/1.0-prototype/jpa/jpa-container-itest/pom.xml (original)
+++ aries/branches/1.0-prototype/jpa/jpa-container-itest/pom.xml Fri Apr 6 21:56:41 2012
@@ -294,19 +294,19 @@
<dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.api</artifactId>
- <version>0.3.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.core</artifactId>
- <version>0.3.2-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>org.apache.aries.jndi.url</artifactId>
- <version>0.3.2-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: aries/branches/1.0-prototype/samples/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/samples/pom.xml?rev=1310604&r1=1310603&r2=1310604&view=diff
==============================================================================
--- aries/branches/1.0-prototype/samples/pom.xml (original)
+++ aries/branches/1.0-prototype/samples/pom.xml Fri Apr 6 21:56:41 2012
@@ -85,12 +85,12 @@
<ariesJmxWhiteboardVersion>0.3.1-SNAPSHOT</ariesJmxWhiteboardVersion>
<!-- Aries Jndi Versions -->
- <ariesJndiApiVersion>0.3.1-SNAPSHOT</ariesJndiApiVersion>
- <ariesJndiVersion>0.3.2-SNAPSHOT</ariesJndiVersion>
- <ariesJndiCoreVersion>0.3.2-SNAPSHOT</ariesJndiCoreVersion>
- <ariesJndiLegacySupportVersion>0.3.2-SNAPSHOT</ariesJndiLegacySupportVersion>
- <ariesJndiRmiVersion>0.3.2-SNAPSHOT</ariesJndiRmiVersion>
- <ariesJndiUrlVersion>0.3.2-SNAPSHOT</ariesJndiUrlVersion>
+ <ariesJndiApiVersion>1.0.0-SNAPSHOT</ariesJndiApiVersion>
+ <ariesJndiVersion>1.0.0-SNAPSHOT</ariesJndiVersion>
+ <ariesJndiCoreVersion>1.0.0-SNAPSHOT</ariesJndiCoreVersion>
+ <ariesJndiLegacySupportVersion>1.0.0-SNAPSHOT</ariesJndiLegacySupportVersion>
+ <ariesJndiRmiVersion>1.0.0-SNAPSHOT</ariesJndiRmiVersion>
+ <ariesJndiUrlVersion>1.0.0-SNAPSHOT</ariesJndiUrlVersion>
<!-- Aries Jpa Versions -->
<ariesJpaApiVersion>1.0.0-SNAPSHOT</ariesJpaApiVersion>