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 [1/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...
Author: hughesj
Date: Thu Apr 29 14:58:10 2010
New Revision: 939335
URL: http://svn.apache.org/viewvc?rev=939335&view=rev
Log:
ARIES-173 Backing out RC2 changes ready for RC3
Modified:
incubator/aries/branches/0.1-incubating-RCx/application/application-api/pom.xml
incubator/aries/branches/0.1-incubating-RCx/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationContext.java (props changed)
incubator/aries/branches/0.1-incubating-RCx/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationContextManager.java (props changed)
incubator/aries/branches/0.1-incubating-RCx/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationEvent.java (props changed)
incubator/aries/branches/0.1-incubating-RCx/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationListener.java (props changed)
incubator/aries/branches/0.1-incubating-RCx/application/application-bundle/pom.xml
incubator/aries/branches/0.1-incubating-RCx/application/application-converters/pom.xml
incubator/aries/branches/0.1-incubating-RCx/application/application-install/pom.xml
incubator/aries/branches/0.1-incubating-RCx/application/application-itest-interface/pom.xml
incubator/aries/branches/0.1-incubating-RCx/application/application-itests/pom.xml
incubator/aries/branches/0.1-incubating-RCx/application/application-management/pom.xml
incubator/aries/branches/0.1-incubating-RCx/application/application-obr-resolver/pom.xml
incubator/aries/branches/0.1-incubating-RCx/application/application-runtime/pom.xml
incubator/aries/branches/0.1-incubating-RCx/application/application-runtime/src/main/java/org/apache/aries/application/runtime/defaults/DefaultLocalPlatform.java (props changed)
incubator/aries/branches/0.1-incubating-RCx/application/application-runtime/src/main/java/org/apache/aries/application/runtime/defaults/NoOpResolver.java (props changed)
incubator/aries/branches/0.1-incubating-RCx/application/application-utils/pom.xml
incubator/aries/branches/0.1-incubating-RCx/application/application-utils/src/main/java/org/apache/aries/application/utils/management/SimpleBundleInfo.java (props changed)
incubator/aries/branches/0.1-incubating-RCx/application/pom.xml
incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-api/ (props changed)
incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-api/pom.xml
incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-bundle/pom.xml
incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-cm/pom.xml
incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-cm/src/main/java/org/apache/aries/ (props changed)
incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/ManagedObjectManager.java (props changed)
incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-cm/src/main/resources/org/apache/aries/ (props changed)
incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-core/pom.xml
incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/ (props changed)
incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/RecipeBuilder.java (props changed)
incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-core/src/main/resources/org/apache/aries/ (props changed)
incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-core/src/test/java/org/apache/aries/ (props changed)
incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-itests/pom.xml
incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/ (props changed)
incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-sample/ (props changed)
incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-sample/pom.xml
incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-sample/src/main/java/org/apache/aries/ (props changed)
incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-testbundlea/pom.xml
incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-testbundleb/pom.xml
incubator/aries/branches/0.1-incubating-RCx/blueprint/pom.xml
incubator/aries/branches/0.1-incubating-RCx/eba-maven-plugin/pom.xml
incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-api/pom.xml
incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-blueprint-api/pom.xml
incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintMetadataMBean.java (props changed)
incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintStateMBean.java (props changed)
incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/Item.java (props changed)
incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/JmxConstants.java (props changed)
incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-blueprint-bundle/pom.xml
incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-blueprint-core/pom.xml
incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/Activator.java (props changed)
incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadata.java (props changed)
incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintState.java (props changed)
incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/RegistrationStandardMBean.java (props changed)
incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/ (props changed)
incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadataTest.java (props changed)
incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintStateTest.java (props changed)
incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-bundle/pom.xml
incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-core/pom.xml
incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-itests/pom.xml
incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java (props changed)
incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ (props changed)
incubator/aries/branches/0.1-incubating-RCx/jmx/pom.xml
incubator/aries/branches/0.1-incubating-RCx/jndi/jndi-bundle/pom.xml
incubator/aries/branches/0.1-incubating-RCx/jndi/jndi-core/pom.xml
incubator/aries/branches/0.1-incubating-RCx/jndi/jndi-core/src/main/java/org/apache/aries/jndi/ (props changed)
incubator/aries/branches/0.1-incubating-RCx/jndi/jndi-core/src/test/java/org/apache/aries/jndi/ObjectFactoryTest.java (props changed)
incubator/aries/branches/0.1-incubating-RCx/jndi/jndi-url/pom.xml
incubator/aries/branches/0.1-incubating-RCx/jndi/jndi-url/src/main/java/org/apache/aries/jndi/ (props changed)
incubator/aries/branches/0.1-incubating-RCx/jndi/jndi-url/src/test/java/org/apache/aries/jndi/ (props changed)
incubator/aries/branches/0.1-incubating-RCx/jndi/pom.xml
incubator/aries/branches/0.1-incubating-RCx/jpa/jpa-api/pom.xml
incubator/aries/branches/0.1-incubating-RCx/jpa/jpa-blueprint-aries/pom.xml
incubator/aries/branches/0.1-incubating-RCx/jpa/jpa-blueprint-testbundle/pom.xml
incubator/aries/branches/0.1-incubating-RCx/jpa/jpa-container-context/pom.xml
incubator/aries/branches/0.1-incubating-RCx/jpa/jpa-container-itest/pom.xml
incubator/aries/branches/0.1-incubating-RCx/jpa/jpa-container-testbundle/pom.xml
incubator/aries/branches/0.1-incubating-RCx/jpa/jpa-container/pom.xml
incubator/aries/branches/0.1-incubating-RCx/jpa/pom.xml
incubator/aries/branches/0.1-incubating-RCx/parent/default-parent/java5-parent/pom.xml
incubator/aries/branches/0.1-incubating-RCx/parent/default-parent/pom.xml
incubator/aries/branches/0.1-incubating-RCx/parent/pom.xml
incubator/aries/branches/0.1-incubating-RCx/samples/ariestrader/assemblies/ariestrader-all-eba/pom.xml
incubator/aries/branches/0.1-incubating-RCx/samples/ariestrader/assemblies/ariestrader-jdbc-eba/pom.xml
incubator/aries/branches/0.1-incubating-RCx/samples/ariestrader/assemblies/equinox-test-harness/pom.xml
incubator/aries/branches/0.1-incubating-RCx/samples/ariestrader/assemblies/pom.xml
incubator/aries/branches/0.1-incubating-RCx/samples/ariestrader/modules/ariestrader-api/pom.xml
incubator/aries/branches/0.1-incubating-RCx/samples/ariestrader/modules/ariestrader-beans/pom.xml
incubator/aries/branches/0.1-incubating-RCx/samples/ariestrader/modules/ariestrader-core/pom.xml
incubator/aries/branches/0.1-incubating-RCx/samples/ariestrader/modules/ariestrader-derby-ds/pom.xml
incubator/aries/branches/0.1-incubating-RCx/samples/ariestrader/modules/ariestrader-entities/pom.xml
incubator/aries/branches/0.1-incubating-RCx/samples/ariestrader/modules/ariestrader-persist-jdbc/pom.xml
incubator/aries/branches/0.1-incubating-RCx/samples/ariestrader/modules/ariestrader-persist-jpa-am/pom.xml
incubator/aries/branches/0.1-incubating-RCx/samples/ariestrader/modules/ariestrader-persist-jpa-cm/pom.xml
incubator/aries/branches/0.1-incubating-RCx/samples/ariestrader/modules/ariestrader-util/pom.xml
incubator/aries/branches/0.1-incubating-RCx/samples/ariestrader/modules/ariestrader-web/pom.xml
incubator/aries/branches/0.1-incubating-RCx/samples/ariestrader/modules/pom.xml
incubator/aries/branches/0.1-incubating-RCx/samples/ariestrader/pom.xml
incubator/aries/branches/0.1-incubating-RCx/samples/blog/blog-api/pom.xml
incubator/aries/branches/0.1-incubating-RCx/samples/blog/blog-assembly/pom.xml
incubator/aries/branches/0.1-incubating-RCx/samples/blog/blog-biz/pom.xml
incubator/aries/branches/0.1-incubating-RCx/samples/blog/blog-datasource/pom.xml
incubator/aries/branches/0.1-incubating-RCx/samples/blog/blog-jdbc-eba/pom.xml
incubator/aries/branches/0.1-incubating-RCx/samples/blog/blog-jpa-eba/pom.xml
incubator/aries/branches/0.1-incubating-RCx/samples/blog/blog-persistence-jdbc/pom.xml
incubator/aries/branches/0.1-incubating-RCx/samples/blog/blog-persistence-jpa/pom.xml
incubator/aries/branches/0.1-incubating-RCx/samples/blog/blog-web/pom.xml
incubator/aries/branches/0.1-incubating-RCx/samples/blog/pom.xml
incubator/aries/branches/0.1-incubating-RCx/samples/blueprint/helloworld/helloworld-api/pom.xml
incubator/aries/branches/0.1-incubating-RCx/samples/blueprint/helloworld/helloworld-assembly/pom.xml
incubator/aries/branches/0.1-incubating-RCx/samples/blueprint/helloworld/helloworld-client/pom.xml
incubator/aries/branches/0.1-incubating-RCx/samples/blueprint/helloworld/helloworld-server/pom.xml
incubator/aries/branches/0.1-incubating-RCx/samples/blueprint/helloworld/pom.xml
incubator/aries/branches/0.1-incubating-RCx/samples/blueprint/idverifier/idverifier-api/pom.xml
incubator/aries/branches/0.1-incubating-RCx/samples/blueprint/idverifier/idverifier-assembly/pom.xml
incubator/aries/branches/0.1-incubating-RCx/samples/blueprint/idverifier/idverifier-client/pom.xml
incubator/aries/branches/0.1-incubating-RCx/samples/blueprint/idverifier/idverifier-server/pom.xml
incubator/aries/branches/0.1-incubating-RCx/samples/blueprint/idverifier/pom.xml
incubator/aries/branches/0.1-incubating-RCx/samples/blueprint/pom.xml
incubator/aries/branches/0.1-incubating-RCx/samples/pom.xml
incubator/aries/branches/0.1-incubating-RCx/testsupport/pom.xml
incubator/aries/branches/0.1-incubating-RCx/testsupport/testsupport-unit/pom.xml
incubator/aries/branches/0.1-incubating-RCx/testsupport/testsupport-unit/src/main/java/org/apache/aries/mocks/ (props changed)
incubator/aries/branches/0.1-incubating-RCx/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/ (props changed)
incubator/aries/branches/0.1-incubating-RCx/transaction/ (props changed)
incubator/aries/branches/0.1-incubating-RCx/transaction/pom.xml
incubator/aries/branches/0.1-incubating-RCx/transaction/transaction-blueprint/pom.xml
incubator/aries/branches/0.1-incubating-RCx/transaction/transaction-itests/pom.xml
incubator/aries/branches/0.1-incubating-RCx/transaction/transaction-manager/pom.xml
incubator/aries/branches/0.1-incubating-RCx/transaction/transaction-testbundle/pom.xml
incubator/aries/branches/0.1-incubating-RCx/transaction/transaction-testds/pom.xml
incubator/aries/branches/0.1-incubating-RCx/transaction/transaction-wrappers/pom.xml
incubator/aries/branches/0.1-incubating-RCx/util/pom.xml
incubator/aries/branches/0.1-incubating-RCx/util/src/test/java/org/apache/aries/util/VersionRangeTest.java (props changed)
incubator/aries/branches/0.1-incubating-RCx/web/pom.xml
incubator/aries/branches/0.1-incubating-RCx/web/web-itests/pom.xml
incubator/aries/branches/0.1-incubating-RCx/web/web-urlhandler/pom.xml
Modified: incubator/aries/branches/0.1-incubating-RCx/application/application-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/application/application-api/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/application/application-api/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/application/application-api/pom.xml Thu Apr 29 14:58:10 2010
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries.application</groupId>
<artifactId>application</artifactId>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.application.api</artifactId>
Propchange: incubator/aries/branches/0.1-incubating-RCx/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationContext.java
('svn:mergeinfo' removed)
Propchange: incubator/aries/branches/0.1-incubating-RCx/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationContextManager.java
('svn:mergeinfo' removed)
Propchange: incubator/aries/branches/0.1-incubating-RCx/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationEvent.java
('svn:mergeinfo' removed)
Propchange: incubator/aries/branches/0.1-incubating-RCx/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationListener.java
('svn:mergeinfo' removed)
Modified: incubator/aries/branches/0.1-incubating-RCx/application/application-bundle/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/application/application-bundle/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/application/application-bundle/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/application/application-bundle/pom.xml Thu Apr 29 14:58:10 2010
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries.application</groupId>
<artifactId>application</artifactId>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.application</artifactId>
Modified: incubator/aries/branches/0.1-incubating-RCx/application/application-converters/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/application/application-converters/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/application/application-converters/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/application/application-converters/pom.xml Thu Apr 29 14:58:10 2010
@@ -20,7 +20,7 @@
<parent>
<artifactId>application</artifactId>
<groupId>org.apache.aries.application</groupId>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/aries/branches/0.1-incubating-RCx/application/application-install/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/application/application-install/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/application/application-install/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/application/application-install/pom.xml Thu Apr 29 14:58:10 2010
@@ -21,7 +21,7 @@
<parent>
<artifactId>application</artifactId>
<groupId>org.apache.aries.application</groupId>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/aries/branches/0.1-incubating-RCx/application/application-itest-interface/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/application/application-itest-interface/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/application/application-itest-interface/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/application/application-itest-interface/pom.xml Thu Apr 29 14:58:10 2010
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries.application</groupId>
<artifactId>application</artifactId>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.application.runtime.itest.interfaces</artifactId>
Modified: incubator/aries/branches/0.1-incubating-RCx/application/application-itests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/application/application-itests/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/application/application-itests/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/application/application-itests/pom.xml Thu Apr 29 14:58:10 2010
@@ -1,199 +1,199 @@
-<?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">
- <parent>
- <artifactId>application</artifactId>
- <groupId>org.apache.aries.application</groupId>
- <version>0.2-incubating-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.apache.aries.application.runtime.itests</artifactId>
- <packaging>jar</packaging>
- <name>Apache Aries Application integration tests</name>
- <description>
- Integration tests for the Application runtime
- </description>
-
- <dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</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.url</groupId>
- <artifactId>pax-url-mvn</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.bundlerepository</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.service.obr</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.aries.application</groupId>
- <artifactId>org.apache.aries.application.runtime.itest.interfaces</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.aries.application</groupId>
- <artifactId>org.apache.aries.application.utils</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.aries.testsupport</groupId>
- <artifactId>org.apache.aries.testsupport.unit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.aries.application</groupId>
- <artifactId>org.apache.aries.application.management</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.aries.application</groupId>
- <artifactId>org.apache.aries.application.runtime</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.aries.application</groupId>
- <artifactId>org.apache.aries.application.resolver.obr</artifactId>
- <scope>test</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>
- <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>
- </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>
+<?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">
+ <parent>
+ <artifactId>application</artifactId>
+ <groupId>org.apache.aries.application</groupId>
+ <version>0.1-incubating-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>org.apache.aries.application.runtime.itests</artifactId>
+ <packaging>jar</packaging>
+ <name>Apache Aries Application integration tests</name>
+ <description>
+ Integration tests for the Application runtime
+ </description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</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.url</groupId>
+ <artifactId>pax-url-mvn</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.bundlerepository</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.service.obr</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.aries.application</groupId>
+ <artifactId>org.apache.aries.application.runtime.itest.interfaces</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.aries.application</groupId>
+ <artifactId>org.apache.aries.application.utils</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.aries.testsupport</groupId>
+ <artifactId>org.apache.aries.testsupport.unit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.aries.application</groupId>
+ <artifactId>org.apache.aries.application.management</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.aries.application</groupId>
+ <artifactId>org.apache.aries.application.runtime</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.aries.application</groupId>
+ <artifactId>org.apache.aries.application.resolver.obr</artifactId>
+ <scope>test</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>
+ <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>
+ </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/application/application-management/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/application/application-management/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/application/application-management/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/application/application-management/pom.xml Thu Apr 29 14:58:10 2010
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries.application</groupId>
<artifactId>application</artifactId>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.application.management</artifactId>
Modified: incubator/aries/branches/0.1-incubating-RCx/application/application-obr-resolver/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/application/application-obr-resolver/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/application/application-obr-resolver/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/application/application-obr-resolver/pom.xml Thu Apr 29 14:58:10 2010
@@ -19,7 +19,7 @@
<parent>
<artifactId>application</artifactId>
<groupId>org.apache.aries.application</groupId>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.application.resolver.obr</artifactId>
<packaging>bundle</packaging>
Modified: incubator/aries/branches/0.1-incubating-RCx/application/application-runtime/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/application/application-runtime/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/application/application-runtime/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/application/application-runtime/pom.xml Thu Apr 29 14:58:10 2010
@@ -21,7 +21,7 @@
<parent>
<artifactId>application</artifactId>
<groupId>org.apache.aries.application</groupId>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Propchange: incubator/aries/branches/0.1-incubating-RCx/application/application-runtime/src/main/java/org/apache/aries/application/runtime/defaults/DefaultLocalPlatform.java
('svn:mergeinfo' removed)
Propchange: incubator/aries/branches/0.1-incubating-RCx/application/application-runtime/src/main/java/org/apache/aries/application/runtime/defaults/NoOpResolver.java
('svn:mergeinfo' removed)
Modified: incubator/aries/branches/0.1-incubating-RCx/application/application-utils/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/application/application-utils/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/application/application-utils/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/application/application-utils/pom.xml Thu Apr 29 14:58:10 2010
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries.application</groupId>
<artifactId>application</artifactId>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.application.utils</artifactId>
Propchange: incubator/aries/branches/0.1-incubating-RCx/application/application-utils/src/main/java/org/apache/aries/application/utils/management/SimpleBundleInfo.java
('svn:mergeinfo' removed)
Modified: incubator/aries/branches/0.1-incubating-RCx/application/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/application/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/application/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/application/pom.xml Thu Apr 29 14:58:10 2010
@@ -19,14 +19,14 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
- <version>0.1-incubating</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.aries.application</groupId>
<artifactId>application</artifactId>
<name>Apache Aries Application</name>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>0.1-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
<description>
@@ -49,22 +49,22 @@
<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>
<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.web</groupId>
<artifactId>org.apache.aries.web.urlhandler</artifactId>
- <version>0.1-incubating</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
Propchange: incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-api/
('svn:mergeinfo' removed)
Modified: incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-api/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-api/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-api/pom.xml Thu Apr 29 14:58:10 2010
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>blueprint</artifactId>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.blueprint.api</artifactId>
Modified: incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-bundle/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-bundle/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-bundle/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-bundle/pom.xml Thu Apr 29 14:58:10 2010
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>blueprint</artifactId>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.blueprint</artifactId>
Modified: incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-cm/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-cm/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-cm/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-cm/pom.xml Thu Apr 29 14:58:10 2010
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>blueprint</artifactId>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.blueprint.cm</artifactId>
Propchange: incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-cm/src/main/java/org/apache/aries/
('svn:mergeinfo' removed)
Propchange: incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/ManagedObjectManager.java
('svn:mergeinfo' removed)
Propchange: incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-cm/src/main/resources/org/apache/aries/
('svn:mergeinfo' removed)
Modified: incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-core/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-core/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-core/pom.xml Thu Apr 29 14:58:10 2010
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>blueprint</artifactId>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.blueprint.core</artifactId>
Propchange: incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/
('svn:mergeinfo' removed)
Propchange: incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/RecipeBuilder.java
('svn:mergeinfo' removed)
Propchange: incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-core/src/main/resources/org/apache/aries/
('svn:mergeinfo' removed)
Propchange: incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-core/src/test/java/org/apache/aries/
('svn:mergeinfo' removed)
Modified: incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-itests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-itests/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-itests/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-itests/pom.xml Thu Apr 29 14:58:10 2010
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>blueprint</artifactId>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.blueprint.itests</artifactId>
Propchange: incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/
('svn:mergeinfo' removed)
Propchange: incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-sample/
('svn:mergeinfo' removed)
Modified: incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-sample/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-sample/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-sample/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-sample/pom.xml Thu Apr 29 14:58:10 2010
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>blueprint</artifactId>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.blueprint.sample</artifactId>
Propchange: incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-sample/src/main/java/org/apache/aries/
('svn:mergeinfo' removed)
Modified: incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-testbundlea/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-testbundlea/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-testbundlea/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-testbundlea/pom.xml Thu Apr 29 14:58:10 2010
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>blueprint</artifactId>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.blueprint.testbundlea</artifactId>
Modified: incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-testbundleb/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-testbundleb/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-testbundleb/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/blueprint/blueprint-testbundleb/pom.xml Thu Apr 29 14:58:10 2010
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>blueprint</artifactId>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.blueprint.testbundleb</artifactId>
Modified: incubator/aries/branches/0.1-incubating-RCx/blueprint/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/blueprint/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/blueprint/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/blueprint/pom.xml Thu Apr 29 14:58:10 2010
@@ -21,14 +21,14 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
- <version>0.1-incubating</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>blueprint</artifactId>
<name>Apache Aries Blueprint</name>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>0.1-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
<description>
@@ -89,7 +89,7 @@
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
- <version>0.1-incubating</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</dependency>
<!-- Use an OSGi enabled cglib version, so that BND can find the version information
and we can use it in integration tests -->
Modified: incubator/aries/branches/0.1-incubating-RCx/eba-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/eba-maven-plugin/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/eba-maven-plugin/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/eba-maven-plugin/pom.xml Thu Apr 29 14:58:10 2010
@@ -25,11 +25,11 @@ under the License.
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
- <version>0.1-incubating</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>eba-maven-plugin</artifactId>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>0.1-incubating-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Aries Maven EBA Plugin</name>
Modified: incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-api/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-api/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-api/pom.xml Thu Apr 29 14:58:10 2010
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>jmx</artifactId>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.jmx.api</artifactId>
Modified: incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-blueprint-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-blueprint-api/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-blueprint-api/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-blueprint-api/pom.xml Thu Apr 29 14:58:10 2010
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>jmx</artifactId>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.jmx.blueprint.api</artifactId>
Propchange: incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintMetadataMBean.java
('svn:mergeinfo' removed)
Propchange: incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintStateMBean.java
('svn:mergeinfo' removed)
Propchange: incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/Item.java
('svn:mergeinfo' removed)
Propchange: incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/JmxConstants.java
('svn:mergeinfo' removed)
Modified: incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-blueprint-bundle/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-blueprint-bundle/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-blueprint-bundle/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-blueprint-bundle/pom.xml Thu Apr 29 14:58:10 2010
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>jmx</artifactId>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.jmx.blueprint</artifactId>
Modified: incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-blueprint-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-blueprint-core/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-blueprint-core/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-blueprint-core/pom.xml Thu Apr 29 14:58:10 2010
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>jmx</artifactId>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.jmx.blueprint.core</artifactId>
Propchange: incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/Activator.java
('svn:mergeinfo' removed)
Propchange: incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadata.java
('svn:mergeinfo' removed)
Propchange: incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintState.java
('svn:mergeinfo' removed)
Propchange: incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/RegistrationStandardMBean.java
('svn:mergeinfo' removed)
Propchange: incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/codec/
('svn:mergeinfo' removed)
Propchange: incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadataTest.java
('svn:mergeinfo' removed)
Propchange: incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintStateTest.java
('svn:mergeinfo' removed)
Modified: incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-bundle/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-bundle/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-bundle/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-bundle/pom.xml Thu Apr 29 14:58:10 2010
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>jmx</artifactId>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.jmx</artifactId>
Modified: incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-core/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-core/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-core/pom.xml Thu Apr 29 14:58:10 2010
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>jmx</artifactId>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.jmx.core</artifactId>
Modified: incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-itests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-itests/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-itests/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-itests/pom.xml Thu Apr 29 14:58:10 2010
@@ -19,11 +19,12 @@
<parent>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>jmx</artifactId>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.itests</artifactId>
+ <version>0.1-incubating-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Apache Aries JMX integration tests</name>
<description>
Propchange: incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java
('svn:mergeinfo' removed)
Propchange: incubator/aries/branches/0.1-incubating-RCx/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/
('svn:mergeinfo' removed)
Modified: incubator/aries/branches/0.1-incubating-RCx/jmx/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/jmx/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/jmx/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/jmx/pom.xml Thu Apr 29 14:58:10 2010
@@ -21,14 +21,14 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
- <version>0.1-incubating</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>jmx</artifactId>
<name>Apache Aries JMX</name>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>0.1-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -77,17 +77,17 @@
<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>
<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>
Modified: incubator/aries/branches/0.1-incubating-RCx/jndi/jndi-bundle/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/jndi/jndi-bundle/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/jndi/jndi-bundle/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/jndi/jndi-bundle/pom.xml Thu Apr 29 14:58:10 2010
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>jndi</artifactId>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.jndi</artifactId>
Modified: incubator/aries/branches/0.1-incubating-RCx/jndi/jndi-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/jndi/jndi-core/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/jndi/jndi-core/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/jndi/jndi-core/pom.xml Thu Apr 29 14:58:10 2010
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>jndi</artifactId>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.jndi.core</artifactId>
Propchange: incubator/aries/branches/0.1-incubating-RCx/jndi/jndi-core/src/main/java/org/apache/aries/jndi/
('svn:mergeinfo' removed)
Propchange: incubator/aries/branches/0.1-incubating-RCx/jndi/jndi-core/src/test/java/org/apache/aries/jndi/ObjectFactoryTest.java
('svn:mergeinfo' removed)
Modified: incubator/aries/branches/0.1-incubating-RCx/jndi/jndi-url/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/jndi/jndi-url/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/jndi/jndi-url/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/jndi/jndi-url/pom.xml Thu Apr 29 14:58:10 2010
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>jndi</artifactId>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>org.apache.aries.jndi.url</artifactId>
Propchange: incubator/aries/branches/0.1-incubating-RCx/jndi/jndi-url/src/main/java/org/apache/aries/jndi/
('svn:mergeinfo' removed)
Propchange: incubator/aries/branches/0.1-incubating-RCx/jndi/jndi-url/src/test/java/org/apache/aries/jndi/
('svn:mergeinfo' removed)
Modified: incubator/aries/branches/0.1-incubating-RCx/jndi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/jndi/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/jndi/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/jndi/pom.xml Thu Apr 29 14:58:10 2010
@@ -21,14 +21,14 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
- <version>0.1-incubating</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.aries.jndi</groupId>
<artifactId>jndi</artifactId>
<name>Apache Aries JNDI</name>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>0.1-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
<description>
@@ -63,12 +63,12 @@
<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</groupId>
<artifactId>org.apache.aries.util</artifactId>
- <version>0.1-incubating</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
Modified: incubator/aries/branches/0.1-incubating-RCx/jpa/jpa-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/jpa/jpa-api/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/jpa/jpa-api/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/jpa/jpa-api/pom.xml Thu Apr 29 14:58:10 2010
@@ -21,7 +21,7 @@
<parent>
<artifactId>jpa</artifactId>
<groupId>org.apache.aries.jpa</groupId>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.apache.aries.jpa.api</artifactId>
Modified: incubator/aries/branches/0.1-incubating-RCx/jpa/jpa-blueprint-aries/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/jpa/jpa-blueprint-aries/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/jpa/jpa-blueprint-aries/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/jpa/jpa-blueprint-aries/pom.xml Thu Apr 29 14:58:10 2010
@@ -21,7 +21,7 @@
<parent>
<artifactId>jpa</artifactId>
<groupId>org.apache.aries.jpa</groupId>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</parent>
<name>Aries JPA Container blueprint integration for Aries blueprint</name>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/aries/branches/0.1-incubating-RCx/jpa/jpa-blueprint-testbundle/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/jpa/jpa-blueprint-testbundle/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/jpa/jpa-blueprint-testbundle/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/jpa/jpa-blueprint-testbundle/pom.xml Thu Apr 29 14:58:10 2010
@@ -21,7 +21,7 @@
<parent>
<artifactId>jpa</artifactId>
<groupId>org.apache.aries.jpa</groupId>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.apache.aries.jpa.blueprint.itest.bundle</artifactId>
Modified: incubator/aries/branches/0.1-incubating-RCx/jpa/jpa-container-context/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/jpa/jpa-container-context/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/jpa/jpa-container-context/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/jpa/jpa-container-context/pom.xml Thu Apr 29 14:58:10 2010
@@ -21,7 +21,7 @@
<parent>
<artifactId>jpa</artifactId>
<groupId>org.apache.aries.jpa</groupId>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.apache.aries.jpa.container.context</artifactId>
Modified: incubator/aries/branches/0.1-incubating-RCx/jpa/jpa-container-itest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/jpa/jpa-container-itest/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/jpa/jpa-container-itest/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/jpa/jpa-container-itest/pom.xml Thu Apr 29 14:58:10 2010
@@ -1,229 +1,229 @@
-<?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">
- <parent>
- <artifactId>jpa</artifactId>
- <groupId>org.apache.aries.jpa</groupId>
- <version>0.2-incubating-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.apache.aries.jpa.container.itest</artifactId>
- <name>Aries JPA iTests</name>
- <!--
-
- For adding EclipseLink as a provider
-
- <repositories>
- <repository>
- <id>EclipseLink Repo</id>
- <url>http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/rt/eclipselink/maven.repo</url>
- </repository>
- </repositories>
- -->
-
- <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>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>provided</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-container-default</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-junit</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.url</groupId>
- <artifactId>pax-url-mvn</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.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_2.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <artifactId>org.apache.aries.jpa.api</artifactId>
- <groupId>org.apache.aries.jpa</groupId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jpa</groupId>
- <artifactId>org.apache.aries.jpa.container</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jpa</groupId>
- <artifactId>org.apache.aries.jpa.container.context</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jpa</groupId>
- <artifactId>org.apache.aries.jpa.blueprint.aries</artifactId>
- <!--<scope>test</scope>-->
- </dependency>
- <!--
-
- For adding EclipseLink as a provider
-
- <dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>org.eclipse.persistence.jpa</artifactId>
- <version>2.0.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>org.eclipse.persistence.core</artifactId>
- <version>2.0.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>org.eclipse.persistence.asm</artifactId>
- <version>2.0.0</version>
- <scope>test</scope>
- </dependency>
- -->
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.serp</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jpa</groupId>
- <artifactId>org.apache.aries.jpa.container.itest.bundle</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.jpa</groupId>
- <artifactId>org.apache.aries.jpa.blueprint.itest.bundle</artifactId>
- <scope>test</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>
+<?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">
+ <parent>
+ <artifactId>jpa</artifactId>
+ <groupId>org.apache.aries.jpa</groupId>
+ <version>0.1-incubating-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>org.apache.aries.jpa.container.itest</artifactId>
+ <name>Aries JPA iTests</name>
+ <!--
+
+ For adding EclipseLink as a provider
+
+ <repositories>
+ <repository>
+ <id>EclipseLink Repo</id>
+ <url>http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/rt/eclipselink/maven.repo</url>
+ </repository>
+ </repositories>
+ -->
+
+ <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>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>provided</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-container-default</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-junit</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.url</groupId>
+ <artifactId>pax-url-mvn</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.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <artifactId>org.apache.aries.jpa.api</artifactId>
+ <groupId>org.apache.aries.jpa</groupId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.jpa</groupId>
+ <artifactId>org.apache.aries.jpa.container</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.jpa</groupId>
+ <artifactId>org.apache.aries.jpa.container.context</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.jpa</groupId>
+ <artifactId>org.apache.aries.jpa.blueprint.aries</artifactId>
+ <!--<scope>test</scope>-->
+ </dependency>
+ <!--
+
+ For adding EclipseLink as a provider
+
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>org.eclipse.persistence.jpa</artifactId>
+ <version>2.0.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>org.eclipse.persistence.core</artifactId>
+ <version>2.0.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>org.eclipse.persistence.asm</artifactId>
+ <version>2.0.0</version>
+ <scope>test</scope>
+ </dependency>
+ -->
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.serp</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.jpa</groupId>
+ <artifactId>org.apache.aries.jpa.container.itest.bundle</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.jpa</groupId>
+ <artifactId>org.apache.aries.jpa.blueprint.itest.bundle</artifactId>
+ <scope>test</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/jpa/jpa-container-testbundle/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/jpa/jpa-container-testbundle/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/jpa/jpa-container-testbundle/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/jpa/jpa-container-testbundle/pom.xml Thu Apr 29 14:58:10 2010
@@ -21,7 +21,7 @@
<parent>
<artifactId>jpa</artifactId>
<groupId>org.apache.aries.jpa</groupId>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.apache.aries.jpa.container.itest.bundle</artifactId>
Modified: incubator/aries/branches/0.1-incubating-RCx/jpa/jpa-container/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.1-incubating-RCx/jpa/jpa-container/pom.xml?rev=939335&r1=939334&r2=939335&view=diff
==============================================================================
--- incubator/aries/branches/0.1-incubating-RCx/jpa/jpa-container/pom.xml (original)
+++ incubator/aries/branches/0.1-incubating-RCx/jpa/jpa-container/pom.xml Thu Apr 29 14:58:10 2010
@@ -21,7 +21,7 @@
<parent>
<artifactId>jpa</artifactId>
<groupId>org.apache.aries.jpa</groupId>
- <version>0.2-incubating-SNAPSHOT</version>
+ <version>0.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.apache.aries.jpa.container</artifactId>