You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by hu...@apache.org on 2010/04/29 16:58:14 UTC
svn commit: r939335 [3/3] - in /incubator/aries/branches/0.1-incubating-RCx:
application/ application/application-api/
application/application-api/src/main/java/org/apache/aries/application/management/
application/application-bundle/ application/applic...
Modified: incubator/aries/branches/0.1-incubating-RCx/transaction/transaction-wrappers/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/transaction/transaction-wrappers/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/transaction/transaction-wrappers/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/transaction/transaction-wrappers/pom.xml Thu Apr 29 14:58:10 2010
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries.transaction</groupId>
<artifactId>transaction</artifactId>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.aries.transaction</groupId>
<artifactId>org.apache.aries.transaction.wrappers</artifactId>
Modified: incubator/aries/branches/0.1-incubating-RCx/util/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/util/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/util/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/util/pom.xml Thu Apr 29 14:58:10 2010
@@ -21,12 +21,12 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
- <version>0.1-incubating</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.util</artifactId>
<packaging>bundle</packaging>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>0.1-incubating-SNAPSHOT</version>
<name>Apache Aries Util</name>
<description>
This bundle contains the OSGi common util for Apache Aries
@@ -73,7 +73,7 @@
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
- <version>0.1-incubating</version>
+ <version>0.1-incubating-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Propchange: incubator/aries/branches/0.1-incubating-RCx/util/src/test/java/org/apache/aries/util/VersionRangeTest.java
('svn:mergeinfo' removed)
Modified: incubator/aries/branches/0.1-incubating-RCx/web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/web/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/web/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/web/pom.xml Thu Apr 29 14:58:10 2010
@@ -20,7 +20,7 @@
<parent>
<artifactId>java5-parent</artifactId>
<groupId>org.apache.aries</groupId>
- <version>0.1-incubating</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -28,7 +28,7 @@
<artifactId>web</artifactId>
<packaging>pom</packaging>
<name>Apache Aries Web Component</name>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>0.1-incubating-SNAPSHOT</version>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/incubator/aries/branches/0.1-incubating-RCx/web</connection>
@@ -65,13 +65,13 @@
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
- <version>0.1-incubating</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.sample</artifactId>
- <version>0.1-incubating</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -81,12 +81,12 @@
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
- <version>0.1-incubating</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
- <version>0.1-incubating</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
Modified: incubator/aries/branches/0.1-incubating-RCx/web/web-itests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/web/web-itests/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/web/web-itests/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/web/web-itests/pom.xml Thu Apr 29 14:58:10 2010
@@ -1,159 +1,159 @@
-<!--
- 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">
- <parent>
- <artifactId>web</artifactId>
- <groupId>org.apache.aries.web</groupId>
- <version>0.2-incubating-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>org.apache.aries.web.itests</artifactId>
- <packaging>jar</packaging>
- <name>Apache Aries Web integration tests</name>
-
- <dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm-all</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.testsupport</groupId>
- <artifactId>org.apache.aries.testsupport.unit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint.sample</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.util</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint</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.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.swissbox</groupId>
- <artifactId>pax-swissbox-tinybundles</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.aries.web</groupId>
- <artifactId>org.apache.aries.web.urlhandler</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.servicemix.tooling</groupId>
- <artifactId>depends-maven-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <id>generate-depends-file</id>
- <goals>
- <goal>generate-depends-file</goal>
- </goals>
- </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">
+ <parent>
+ <artifactId>web</artifactId>
+ <groupId>org.apache.aries.web</groupId>
+ <version>0.1-incubating-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>org.apache.aries.web.itests</artifactId>
+ <packaging>jar</packaging>
+ <name>Apache Aries Web integration tests</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-all</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.testsupport</groupId>
+ <artifactId>org.apache.aries.testsupport.unit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint.sample</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.util</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint</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.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.swissbox</groupId>
+ <artifactId>pax-swissbox-tinybundles</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.aries.web</groupId>
+ <artifactId>org.apache.aries.web.urlhandler</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.servicemix.tooling</groupId>
+ <artifactId>depends-maven-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <id>generate-depends-file</id>
+ <goals>
+ <goal>generate-depends-file</goal>
+ </goals>
+ </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: incubator/aries/branches/0.1-incubating-RCx/web/web-urlhandler/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/web/web-urlhandler/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/web/web-urlhandler/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/web/web-urlhandler/pom.xml Thu Apr 29 14:58:10 2010
@@ -20,7 +20,7 @@
<parent>
<artifactId>web</artifactId>
<groupId>org.apache.aries.web</groupId>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>