You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by jb...@apache.org on 2014/05/30 14:26:42 UTC
svn commit: r1598566 [1/4] - in /aries/trunk: application/
application/application-api/ application/application-bundle/
application/application-converters/
application/application-default-local-platform/
application/application-deployment-management/ a...
Author: jbonofre
Date: Fri May 30 12:26:39 2014
New Revision: 1598566
URL: http://svn.apache.org/r1598566
Log:
[ARIES-1006] Refactoring of the parent pom, upgrade to OSGi 4.3.1 and full Java7 compilation support
Removed:
aries/trunk/parent/default-parent/java5-parent/pom.xml
aries/trunk/parent/default-parent/java6-parent/pom.xml
aries/trunk/parent/default-parent/pom.xml
Modified:
aries/trunk/application/application-api/pom.xml
aries/trunk/application/application-bundle/pom.xml
aries/trunk/application/application-converters/pom.xml
aries/trunk/application/application-default-local-platform/pom.xml
aries/trunk/application/application-deployment-management/pom.xml
aries/trunk/application/application-distro/pom.xml
aries/trunk/application/application-install/pom.xml
aries/trunk/application/application-isolated-distro/pom.xml
aries/trunk/application/application-itest-interface/pom.xml
aries/trunk/application/application-itests/pom.xml
aries/trunk/application/application-management/pom.xml
aries/trunk/application/application-modeller-common-test/pom.xml
aries/trunk/application/application-modeller-standalone/pom.xml
aries/trunk/application/application-modeller/pom.xml
aries/trunk/application/application-noop-resolver/pom.xml
aries/trunk/application/application-obr-resolver/pom.xml
aries/trunk/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/impl/ApplicationResourceImpl.java
aries/trunk/application/application-resolve-transform-cm-itests/pom.xml
aries/trunk/application/application-resolve-transform-cm/pom.xml
aries/trunk/application/application-runtime-framework-management/pom.xml
aries/trunk/application/application-runtime-framework/pom.xml
aries/trunk/application/application-runtime-isolated/pom.xml
aries/trunk/application/application-runtime-repository/pom.xml
aries/trunk/application/application-runtime/pom.xml
aries/trunk/application/application-tooling-repository-generator/pom.xml
aries/trunk/application/application-utils/pom.xml
aries/trunk/application/pom.xml
aries/trunk/blueprint/blueprint-annotation-api/pom.xml
aries/trunk/blueprint/blueprint-annotation-impl/pom.xml
aries/trunk/blueprint/blueprint-api/pom.xml
aries/trunk/blueprint/blueprint-bundle/pom.xml
aries/trunk/blueprint/blueprint-cm/pom.xml
aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmManagedServiceFactory.java
aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/ManagedObjectManager.java
aries/trunk/blueprint/blueprint-compatibility/pom.xml
aries/trunk/blueprint/blueprint-core-compatibility/pom.xml
aries/trunk/blueprint/blueprint-core/pom.xml
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/AbstractServiceReferenceRecipe.java
aries/trunk/blueprint/blueprint-core/src/test/java/org/apache/aries/blueprint/TestBundleContext.java
aries/trunk/blueprint/blueprint-distro/pom.xml
aries/trunk/blueprint/blueprint-itests/pom.xml
aries/trunk/blueprint/blueprint-jexl-evaluator/pom.xml
aries/trunk/blueprint/blueprint-noosgi/pom.xml
aries/trunk/blueprint/blueprint-parser/pom.xml
aries/trunk/blueprint/blueprint-sample-annotation/pom.xml
aries/trunk/blueprint/blueprint-sample-fragment/pom.xml
aries/trunk/blueprint/blueprint-sample-war/pom.xml
aries/trunk/blueprint/blueprint-sample/pom.xml
aries/trunk/blueprint/blueprint-testbundlea/pom.xml
aries/trunk/blueprint/blueprint-testbundleb/pom.xml
aries/trunk/blueprint/blueprint-testquiescebundle/pom.xml
aries/trunk/blueprint/blueprint-web-osgi/pom.xml
aries/trunk/blueprint/blueprint-web/pom.xml
aries/trunk/blueprint/pom.xml
aries/trunk/eba-maven-plugin/pom.xml
aries/trunk/ejb/ejb-modeller-itest/pom.xml
aries/trunk/ejb/ejb-modeller/pom.xml
aries/trunk/ejb/openejb-extender-itest/pom.xml
aries/trunk/ejb/openejb-extender/pom.xml
aries/trunk/ejb/openejb-extender/src/main/java/org/apache/aries/ejb/openejb/extender/EJBServiceFactory.java
aries/trunk/ejb/pom.xml
aries/trunk/esa-maven-plugin/pom.xml
aries/trunk/jmx/jmx-api/pom.xml
aries/trunk/jmx/jmx-blueprint-api/pom.xml
aries/trunk/jmx/jmx-blueprint-bundle/pom.xml
aries/trunk/jmx/jmx-blueprint-core/pom.xml
aries/trunk/jmx/jmx-bundle/pom.xml
aries/trunk/jmx/jmx-core-whiteboard/pom.xml
aries/trunk/jmx/jmx-core/pom.xml
aries/trunk/jmx/jmx-itests/pom.xml
aries/trunk/jmx/jmx-whiteboard/pom.xml
aries/trunk/jmx/pom.xml
aries/trunk/jndi/jndi-api/pom.xml
aries/trunk/jndi/jndi-bundle/pom.xml
aries/trunk/jndi/jndi-core/pom.xml
aries/trunk/jndi/jndi-core/src/test/java/org/apache/aries/jndi/InitialContextTest.java
aries/trunk/jndi/jndi-core/src/test/java/org/apache/aries/jndi/ObjectFactoryTest.java
aries/trunk/jndi/jndi-legacy-support/pom.xml
aries/trunk/jndi/jndi-rmi/pom.xml
aries/trunk/jndi/jndi-rmi/src/main/java/org/apache/aries/jndi/rmi/Activator.java
aries/trunk/jndi/jndi-url-itest-biz/pom.xml
aries/trunk/jndi/jndi-url-itest-web/pom.xml
aries/trunk/jndi/jndi-url-itest/pom.xml
aries/trunk/jndi/jndi-url/pom.xml
aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi/services/ServiceHelper.java
aries/trunk/jndi/jndi-url/src/main/java/org/apache/aries/jndi/url/Activator.java
aries/trunk/jndi/pom.xml
aries/trunk/jpa/jpa-api/pom.xml
aries/trunk/jpa/jpa-blueprint-aries/pom.xml
aries/trunk/jpa/jpa-blueprint-testbundle/pom.xml
aries/trunk/jpa/jpa-container-advancedtestbundle/pom.xml
aries/trunk/jpa/jpa-container-context/pom.xml
aries/trunk/jpa/jpa-container-eclipselink-adapter/pom.xml
aries/trunk/jpa/jpa-container-itest/pom.xml
aries/trunk/jpa/jpa-container-testbundle-eclipselink/pom.xml
aries/trunk/jpa/jpa-container-testbundle/pom.xml
aries/trunk/jpa/jpa-container/pom.xml
aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/tx/impl/ConnectionWrapper.java
aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/tx/impl/XADatasourceEnlistingWrapper.java
aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/DataSourceFactoryDataSource.java
aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/JndiDataSource.java
aries/trunk/jpa/pom.xml
aries/trunk/parent/pom.xml
Modified: aries/trunk/application/application-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-api/pom.xml?rev=1598566&r1=1598565&r2=1598566&view=diff
==============================================================================
--- aries/trunk/application/application-api/pom.xml (original)
+++ aries/trunk/application/application-api/pom.xml Fri May 30 12:26:39 2014
@@ -1,3 +1,4 @@
+<?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
@@ -17,12 +18,14 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
+
<parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>java5-parent</artifactId>
- <version>1.0.0</version>
- <relativePath />
+ <groupId>org.apache.aries</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.application</groupId>
@@ -34,12 +37,11 @@
Application API.
</description>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-api</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/application/application-api</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/application/application-api</url>
- </scm>
-
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-api</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/application/application-api</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/application/application-api</url>
+ </scm>
<properties>
<!-- Export package versions are maintained in packageinfo files -->
@@ -52,8 +54,6 @@
org.apache.aries.application.modelling.utils,
</aries.osgi.export.pkg>
<aries.osgi.private.pkg />
-
-
</properties>
<dependencies>
@@ -68,6 +68,7 @@
<version>1.0.0</version>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
Modified: aries/trunk/application/application-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-bundle/pom.xml?rev=1598566&r1=1598565&r2=1598566&view=diff
==============================================================================
--- aries/trunk/application/application-bundle/pom.xml (original)
+++ aries/trunk/application/application-bundle/pom.xml Fri May 30 12:26:39 2014
@@ -1,3 +1,4 @@
+<?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
@@ -17,12 +18,14 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.aries</groupId>
- <artifactId>java6-parent</artifactId>
- <version>1.0.0</version>
- <relativePath />
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.application</groupId>
@@ -35,11 +38,11 @@
Aries applications.
</description>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-bundle</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/application/application-bundle</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/application/application-bundle</url>
- </scm>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-bundle</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/application/application-bundle</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/application/application-bundle</url>
+ </scm>
<properties>
<aries.osgi.symbolic.name>
@@ -47,7 +50,7 @@
</aries.osgi.symbolic.name>
<aries.osgi.import>
org.osgi.framework;version="[1.5,2)",
- org.slf4j;version="[1.5,2)",
+ org.slf4j;version="[1.5,2)";resolution:=optional,
*
</aries.osgi.import>
<aries.osgi.export.pkg>
Modified: aries/trunk/application/application-converters/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-converters/pom.xml?rev=1598566&r1=1598565&r2=1598566&view=diff
==============================================================================
--- aries/trunk/application/application-converters/pom.xml (original)
+++ aries/trunk/application/application-converters/pom.xml Fri May 30 12:26:39 2014
@@ -1,3 +1,4 @@
+<?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
@@ -17,12 +18,15 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>java6-parent</artifactId>
- <version>1.0.0</version>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.converters</artifactId>
@@ -36,14 +40,13 @@
<url>http://svn.apache.org/viewvc/aries/trunk/application/application-converters</url>
</scm>
-
<properties>
<aries.osgi.export.pkg>
</aries.osgi.export.pkg>
<aries.osgi.import.pkg>
- org.apache.aries.application.management.spi.convert;provide:=true,
- org.apache.aries.web.converter;provide:=true,
- *
+ org.apache.aries.application.management.spi.convert;provide:=true,
+ org.apache.aries.web.converter;provide:=true,
+ *
</aries.osgi.import.pkg>
<aries.osgi.private.pkg>
org.apache.aries.application.converters;
@@ -76,7 +79,7 @@
<scope>provided</scope>
<version>1.0.0</version>
</dependency>
- <!--External dependencies. Versions may be specified in default parent -->
+ <!--External dependencies. Versions may be specified in parent -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
@@ -91,7 +94,7 @@
<groupId>org.ow2.asm</groupId>
<artifactId>asm-all</artifactId>
<scope>provided</scope>
- <version>4.0</version>
+ <version>5.0.2</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -99,6 +102,7 @@
<scope>provided</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
Modified: aries/trunk/application/application-default-local-platform/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-default-local-platform/pom.xml?rev=1598566&r1=1598565&r2=1598566&view=diff
==============================================================================
--- aries/trunk/application/application-default-local-platform/pom.xml (original)
+++ aries/trunk/application/application-default-local-platform/pom.xml Fri May 30 12:26:39 2014
@@ -1,26 +1,31 @@
<?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.
+ 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/xsd/maven-4.0.0.xsd">
+
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.aries</groupId>
- <artifactId>java6-parent</artifactId>
- <version>1.0.0</version>
- <relativePath />
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.application</groupId>
@@ -28,16 +33,16 @@
<packaging>bundle</packaging>
<name>Apache Aries Application Default local platform</name>
<version>1.0.1-SNAPSHOT</version>
-
<description>
Implementation of the default local Platform Repository
</description>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-default-local-platform</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/application/application-default-local-platform</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/application/application-default-local-platform</url>
- </scm>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-default-local-platform</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/application/application-default-local-platform</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/application/application-default-local-platform</url>
+ </scm>
+
<properties>
<aries.osgi.export.pkg>
</aries.osgi.export.pkg>
@@ -49,6 +54,7 @@
org.apache.aries.application.local.platform.impl
</aries.osgi.private.pkg>
</properties>
+
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
@@ -61,6 +67,7 @@
<version>1.0.0</version>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -82,4 +89,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: aries/trunk/application/application-deployment-management/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-deployment-management/pom.xml?rev=1598566&r1=1598565&r2=1598566&view=diff
==============================================================================
--- aries/trunk/application/application-deployment-management/pom.xml (original)
+++ aries/trunk/application/application-deployment-management/pom.xml Fri May 30 12:26:39 2014
@@ -1,3 +1,4 @@
+<?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
@@ -17,12 +18,14 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.aries</groupId>
- <artifactId>java6-parent</artifactId>
- <version>1.0.0</version>
- <relativePath />
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.application</groupId>
@@ -34,11 +37,11 @@
Deployment Manager for resolving an Aries Applications.
</description>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-deployment-management</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/application/application-deployment-management</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/application/application-deployment-management</url>
- </scm>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-deployment-management</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/application/application-deployment-management</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/application/application-deployment-management</url>
+ </scm>
<properties>
<aries.osgi.export.pkg />
@@ -49,10 +52,11 @@
</properties>
<dependencies>
- <!-- We need OSGi in the classpath before the pax bundles
- which testsupport pulls in as transitive dependencies
- or risk an "java.lang.NoClassDefFoundError: org.osgi.vendor.framework
- property not set" error. -->
+ <!-- We need OSGi in the classpath before the pax bundles
+ which testsupport pulls in as transitive dependencies
+ or risk an "java.lang.NoClassDefFoundError: org.osgi.vendor.framework
+ property not set" error.
+ -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
@@ -100,6 +104,7 @@
<version>1.0.0</version>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
Modified: aries/trunk/application/application-distro/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-distro/pom.xml?rev=1598566&r1=1598565&r2=1598566&view=diff
==============================================================================
--- aries/trunk/application/application-distro/pom.xml (original)
+++ aries/trunk/application/application-distro/pom.xml Fri May 30 12:26:39 2014
@@ -1,31 +1,33 @@
<?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.
- -->
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.aries</groupId>
- <artifactId>java5-parent</artifactId>
- <version>1.0.0</version>
- <relativePath />
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
-
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application-distro</artifactId>
<name>Application distribution</name>
@@ -38,7 +40,6 @@
<url>http://svn.apache.org/viewvc/aries/trunk/application/application-distro</url>
</scm>
-
<dependencies>
<dependency>
<groupId>org.apache.aries.application</groupId>
@@ -108,4 +109,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: aries/trunk/application/application-install/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-install/pom.xml?rev=1598566&r1=1598565&r2=1598566&view=diff
==============================================================================
--- aries/trunk/application/application-install/pom.xml (original)
+++ aries/trunk/application/application-install/pom.xml Fri May 30 12:26:39 2014
@@ -18,14 +18,15 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.aries</groupId>
- <artifactId>java6-parent</artifactId>
- <version>1.0.0</version>
- <relativePath />
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
-
- <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.install</artifactId>
@@ -36,15 +37,12 @@
A very basic application installer
</description>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-install</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/application/application-install</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/application/application-install</url>
- </scm>
-
- <properties>
- </properties>
-
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-install</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/application/application-install</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/application/application-install</url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -93,6 +91,7 @@
<version>1.0.0</version>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
Modified: aries/trunk/application/application-isolated-distro/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-isolated-distro/pom.xml?rev=1598566&r1=1598565&r2=1598566&view=diff
==============================================================================
--- aries/trunk/application/application-isolated-distro/pom.xml (original)
+++ aries/trunk/application/application-isolated-distro/pom.xml Fri May 30 12:26:39 2014
@@ -1,31 +1,33 @@
<?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.
- -->
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.aries</groupId>
- <artifactId>java5-parent</artifactId>
- <version>1.0.0</version>
- <relativePath />
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
-
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application-isolated-distro</artifactId>
<name>Application distribution for isolated application support</name>
@@ -38,7 +40,6 @@
<url>http://svn.apache.org/viewvc/aries/trunk/application/application-isolated-distro</url>
</scm>
-
<dependencies>
<dependency>
<groupId>org.apache.aries.application</groupId>
@@ -123,4 +124,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: aries/trunk/application/application-itest-interface/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itest-interface/pom.xml?rev=1598566&r1=1598565&r2=1598566&view=diff
==============================================================================
--- aries/trunk/application/application-itest-interface/pom.xml (original)
+++ aries/trunk/application/application-itest-interface/pom.xml Fri May 30 12:26:39 2014
@@ -1,3 +1,4 @@
+<?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
@@ -17,12 +18,14 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.aries</groupId>
- <artifactId>java6-parent</artifactId>
- <version>1.0.0</version>
- <relativePath />
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.application</groupId>
@@ -34,19 +37,17 @@
Interface class(es) for aplication runtime itests.
</description>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-itest-interface</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/application/application-itest-interface</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/application/application-itest-interface</url>
- </scm>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-itest-interface</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/application/application-itest-interface</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/application/application-itest-interface</url>
+ </scm>
<properties>
<!-- Export package versions are maintained in packageinfo files -->
-
<aries.osgi.export.pkg>
org.apache.aries.sample
</aries.osgi.export.pkg>
-
<aries.osgi.private.pkg />
</properties>
Modified: aries/trunk/application/application-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/pom.xml?rev=1598566&r1=1598565&r2=1598566&view=diff
==============================================================================
--- aries/trunk/application/application-itests/pom.xml (original)
+++ aries/trunk/application/application-itests/pom.xml Fri May 30 12:26:39 2014
@@ -18,14 +18,16 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.aries</groupId>
- <artifactId>java6-parent</artifactId>
- <version>1.0.0</version>
- <relativePath />
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
-
- <modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.runtime.isolated.itests</artifactId>
<packaging>jar</packaging>
@@ -35,16 +37,17 @@
Integration tests for the Application runtime
</description>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-itests</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/application/application-itests</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/application/application-itests</url>
- </scm>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-itests</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/application/application-itests</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/application/application-itests</url>
+ </scm>
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
+ <version>4.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -83,7 +86,7 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-all</artifactId>
- <version>4.0</version>
+ <version>5.0.2</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -99,18 +102,21 @@
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam</artifactId>
+ <version>1.2.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit</artifactId>
+ <version>1.2.4</version>
<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-container-default</artifactId>
+ <version>1.2.4</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-mvn</artifactId>
@@ -125,6 +131,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
+ <version>4.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -375,4 +382,5 @@
</build>
</profile>
</profiles>
+
</project>
Modified: aries/trunk/application/application-management/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-management/pom.xml?rev=1598566&r1=1598565&r2=1598566&view=diff
==============================================================================
--- aries/trunk/application/application-management/pom.xml (original)
+++ aries/trunk/application/application-management/pom.xml Fri May 30 12:26:39 2014
@@ -1,3 +1,4 @@
+<?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
@@ -17,12 +18,14 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.aries</groupId>
- <artifactId>java6-parent</artifactId>
- <version>1.0.0</version>
- <relativePath />
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.application</groupId>
@@ -34,11 +37,11 @@
Implementation of the application management API
</description>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-management</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/application/application-management</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/application/application-management</url>
- </scm>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-management</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/application/application-management</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/application/application-management</url>
+ </scm>
<properties>
<aries.osgi.export.pkg>
@@ -99,6 +102,7 @@
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -120,4 +124,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: aries/trunk/application/application-modeller-common-test/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-modeller-common-test/pom.xml?rev=1598566&r1=1598565&r2=1598566&view=diff
==============================================================================
--- aries/trunk/application/application-modeller-common-test/pom.xml (original)
+++ aries/trunk/application/application-modeller-common-test/pom.xml Fri May 30 12:26:39 2014
@@ -1,3 +1,4 @@
+<?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
@@ -17,12 +18,14 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.aries</groupId>
- <artifactId>java5-parent</artifactId>
- <version>1.0.0</version>
- <relativePath />
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.application</groupId>
@@ -34,11 +37,11 @@
Modelling utilities for working with Aries Applications (distribution for offline use).
</description>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-modeller-common-test</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/application/application-modeller-common-test</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/application/application-modeller-common-test</url>
- </scm>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-modeller-common-test</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/application/application-modeller-common-test</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/application/application-modeller-common-test</url>
+ </scm>
<dependencies>
<dependency>
Modified: aries/trunk/application/application-modeller-standalone/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-modeller-standalone/pom.xml?rev=1598566&r1=1598565&r2=1598566&view=diff
==============================================================================
--- aries/trunk/application/application-modeller-standalone/pom.xml (original)
+++ aries/trunk/application/application-modeller-standalone/pom.xml Fri May 30 12:26:39 2014
@@ -1,3 +1,4 @@
+<?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
@@ -17,12 +18,14 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.aries</groupId>
- <artifactId>java5-parent</artifactId>
- <version>1.0.0</version>
- <relativePath />
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.application</groupId>
@@ -34,11 +37,11 @@
Modelling utilities for working with Aries Applications (distribution for offline use).
</description>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-modeller-standalone</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/application/application-modeller-standalone</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/application/application-modeller-standalone</url>
- </scm>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-modeller-standalone</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/application/application-modeller-standalone</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/application/application-modeller-standalone</url>
+ </scm>
<dependencies>
<dependency>
Modified: aries/trunk/application/application-modeller/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-modeller/pom.xml?rev=1598566&r1=1598565&r2=1598566&view=diff
==============================================================================
--- aries/trunk/application/application-modeller/pom.xml (original)
+++ aries/trunk/application/application-modeller/pom.xml Fri May 30 12:26:39 2014
@@ -1,3 +1,4 @@
+<?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
@@ -17,12 +18,14 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.aries</groupId>
- <artifactId>java5-parent</artifactId>
- <version>1.0.0</version>
- <relativePath />
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.application</groupId>
@@ -34,11 +37,11 @@
Modelling utilities for working with Aries Applications.
</description>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-modeller</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/application/application-modeller</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/application/application-modeller</url>
- </scm>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-modeller</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/application/application-modeller</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/application/application-modeller</url>
+ </scm>
<properties>
<aries.osgi.private.pkg>
@@ -52,7 +55,6 @@
org.apache.aries.application.modelling.utils;provide:=true,
*
</aries.osgi.import.pkg>
-
</properties>
<dependencies>
@@ -91,8 +93,7 @@
<artifactId>org.apache.aries.blueprint.core</artifactId>
<version>1.2.0</version>
</dependency>
-
-
+
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
@@ -119,6 +120,7 @@
<version>1.0.0</version>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -140,6 +142,5 @@
</plugin>
</plugins>
</build>
-
</project>
Modified: aries/trunk/application/application-noop-resolver/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-noop-resolver/pom.xml?rev=1598566&r1=1598565&r2=1598566&view=diff
==============================================================================
--- aries/trunk/application/application-noop-resolver/pom.xml (original)
+++ aries/trunk/application/application-noop-resolver/pom.xml Fri May 30 12:26:39 2014
@@ -1,26 +1,31 @@
<?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.
+ 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/xsd/maven-4.0.0.xsd">
+
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.aries</groupId>
- <artifactId>java6-parent</artifactId>
- <version>1.0.0</version>
- <relativePath />
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.application</groupId>
@@ -32,11 +37,11 @@
Dummy implementation of the AriesApplicationResolver
</description>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-noop-resolver</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/application/application-noop-resolver</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/application/application-noop-resolver</url>
- </scm>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-noop-resolver</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/application/application-noop-resolver</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/application/application-noop-resolver</url>
+ </scm>
<properties>
<aries.osgi.export.pkg>
@@ -49,6 +54,7 @@
org.apache.aries.application.resolver.noop.impl
</aries.osgi.private.pkg>
</properties>
+
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
@@ -61,6 +67,7 @@
<version>1.0.0</version>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
Modified: aries/trunk/application/application-obr-resolver/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-obr-resolver/pom.xml?rev=1598566&r1=1598565&r2=1598566&view=diff
==============================================================================
--- aries/trunk/application/application-obr-resolver/pom.xml (original)
+++ aries/trunk/application/application-obr-resolver/pom.xml Fri May 30 12:26:39 2014
@@ -1,27 +1,33 @@
<?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.
+ 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/xsd/maven-4.0.0.xsd">
+
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.aries</groupId>
- <artifactId>java6-parent</artifactId>
- <version>1.0.0</version>
- <relativePath />
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
+
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.resolver.obr</artifactId>
<packaging>bundle</packaging>
@@ -31,15 +37,14 @@
Implementation of the AriesApplicationResolver using OBR
</description>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-obr-resolver</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/application/application-obr-resolver</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/application/application-obr-resolver</url>
- </scm>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-obr-resolver</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/application/application-obr-resolver</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/application/application-obr-resolver</url>
+ </scm>
<properties>
<!-- Export package versions are maintained in packageinfo files -->
-
<aries.osgi.export.pkg>
org.apache.aries.application.resolver.obr.ext;
</aries.osgi.export.pkg>
@@ -55,6 +60,7 @@
org.apache.aries.application.resolver.internal;
</aries.osgi.private.pkg>
</properties>
+
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
@@ -98,6 +104,7 @@
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
Modified: aries/trunk/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/impl/ApplicationResourceImpl.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/impl/ApplicationResourceImpl.java?rev=1598566&r1=1598565&r2=1598566&view=diff
==============================================================================
--- aries/trunk/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/impl/ApplicationResourceImpl.java (original)
+++ aries/trunk/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/impl/ApplicationResourceImpl.java Fri May 30 12:26:39 2014
@@ -66,6 +66,10 @@ public class ApplicationResourceImpl imp
{
return delgate.matchCase(dictionary);
}
+
+ public boolean matches(Map<java.lang.String,?> map) {
+ return delgate.matches(map);
+ }
public String toString()
{
Modified: aries/trunk/application/application-resolve-transform-cm-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-resolve-transform-cm-itests/pom.xml?rev=1598566&r1=1598565&r2=1598566&view=diff
==============================================================================
--- aries/trunk/application/application-resolve-transform-cm-itests/pom.xml (original)
+++ aries/trunk/application/application-resolve-transform-cm-itests/pom.xml Fri May 30 12:26:39 2014
@@ -1,38 +1,46 @@
<?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.
+ 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/xsd/maven-4.0.0.xsd">
+
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.aries</groupId>
- <artifactId>java6-parent</artifactId>
- <version>1.0.0</version>
- <relativePath />
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
+
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.resolve.transform.cm.itests</artifactId>
<packaging>bundle</packaging>
<version>1.0.1-SNAPSHOT</version>
<name>Apache Aries Application Resolve CM Transform iTests</name>
<description>Apache Aries Application Resolve CM Transformer iTests</description>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-resolve-transform-cm-itests</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/application/application-resolve-transform-cm-itests</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/application/application-resolve-transform-cm-itests</url>
- </scm>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-resolve-transform-cm-itests</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/application/application-resolve-transform-cm-itests</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/application/application-resolve-transform-cm-itests</url>
+ </scm>
+
<properties>
<aries.osgi.export.pkg>
</aries.osgi.export.pkg>
@@ -40,6 +48,7 @@
org.apache.aries.application.resolve.transform.cm.itests;
</aries.osgi.private.pkg>
</properties>
+
<dependencies>
<dependency>
<groupId>org.apache.aries.application</groupId>
@@ -110,16 +119,19 @@
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam</artifactId>
+ <version>1.2.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit</artifactId>
+ <version>1.2.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-container-default</artifactId>
+ <version>1.2.4</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -129,6 +141,7 @@
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -164,4 +177,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: aries/trunk/application/application-resolve-transform-cm/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-resolve-transform-cm/pom.xml?rev=1598566&r1=1598565&r2=1598566&view=diff
==============================================================================
--- aries/trunk/application/application-resolve-transform-cm/pom.xml (original)
+++ aries/trunk/application/application-resolve-transform-cm/pom.xml Fri May 30 12:26:39 2014
@@ -1,38 +1,46 @@
<?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.
+ 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/xsd/maven-4.0.0.xsd">
+
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.aries</groupId>
- <artifactId>java6-parent</artifactId>
- <version>1.0.0</version>
- <relativePath />
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
+
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.resolve.transform.cm</artifactId>
<packaging>bundle</packaging>
<version>1.0.1-SNAPSHOT</version>
<name>Apache Aries Application Resolve CM Transform</name>
<description>Apache Aries Application Resolve CM Transformers</description>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-resolve-transform-cm</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/application/application-resolve-transform-cm</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/application/application-resolve-transform-cm</url>
- </scm>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-resolve-transform-cm</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/application/application-resolve-transform-cm</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/application/application-resolve-transform-cm</url>
+ </scm>
+
<properties>
<aries.osgi.export.pkg>
</aries.osgi.export.pkg>
@@ -44,6 +52,7 @@
org.apache.aries.application.resolve.transform.cm
</aries.osgi.private.pkg>
</properties>
+
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
@@ -61,6 +70,7 @@
<version>1.0.0</version>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
Modified: aries/trunk/application/application-runtime-framework-management/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-runtime-framework-management/pom.xml?rev=1598566&r1=1598565&r2=1598566&view=diff
==============================================================================
--- aries/trunk/application/application-runtime-framework-management/pom.xml (original)
+++ aries/trunk/application/application-runtime-framework-management/pom.xml Fri May 30 12:26:39 2014
@@ -18,14 +18,16 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.aries</groupId>
- <artifactId>java6-parent</artifactId>
- <version>1.0.0</version>
- <relativePath />
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
-
- <modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.runtime.framework.management</artifactId>
<packaging>bundle</packaging>
@@ -35,11 +37,11 @@
A bundle framework manager implementation
</description>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-runtime-framework-management</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/application/application-runtime-framework-management</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/application/application-runtime-framework-management</url>
- </scm>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-runtime-framework-management</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/application/application-runtime-framework-management</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/application/application-runtime-framework-management</url>
+ </scm>
<properties>
<aries.osgi.export.pkg>
@@ -102,6 +104,7 @@
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
Modified: aries/trunk/application/application-runtime-framework/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-runtime-framework/pom.xml?rev=1598566&r1=1598565&r2=1598566&view=diff
==============================================================================
--- aries/trunk/application/application-runtime-framework/pom.xml (original)
+++ aries/trunk/application/application-runtime-framework/pom.xml Fri May 30 12:26:39 2014
@@ -18,14 +18,16 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.aries</groupId>
- <artifactId>java6-parent</artifactId>
- <version>1.0.0</version>
- <relativePath />
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
-
- <modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.runtime.framework</artifactId>
<packaging>bundle</packaging>
@@ -35,15 +37,14 @@
An equinox based bundle framework runtime implementation
</description>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-runtime-framework</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/application/application-runtime-framework</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/application/application-runtime-framework</url>
- </scm>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-runtime-framework</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/application/application-runtime-framework</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/application/application-runtime-framework</url>
+ </scm>
<properties>
<!-- Export package versions are maintained in packageinfo files -->
-
<aries.osgi.export.pkg>
org.apache.aries.application.runtime.framework.utils
</aries.osgi.export.pkg>
@@ -107,6 +108,7 @@
<scope>provided</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
Modified: aries/trunk/application/application-runtime-isolated/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-runtime-isolated/pom.xml?rev=1598566&r1=1598565&r2=1598566&view=diff
==============================================================================
--- aries/trunk/application/application-runtime-isolated/pom.xml (original)
+++ aries/trunk/application/application-runtime-isolated/pom.xml Fri May 30 12:26:39 2014
@@ -18,14 +18,16 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.aries</groupId>
- <artifactId>java6-parent</artifactId>
- <version>1.0.0</version>
- <relativePath />
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
-
- <modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.runtime.isolated</artifactId>
<packaging>bundle</packaging>
@@ -35,11 +37,11 @@
An isolated application runtime implementation
</description>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-runtime-isolated</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/application/application-runtime-isolated</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/application/application-runtime-isolated</url>
- </scm>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-runtime-isolated</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/application/application-runtime-isolated</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/application/application-runtime-isolated</url>
+ </scm>
<properties>
<aries.osgi.export.pkg>
@@ -105,6 +107,7 @@
<scope>provided</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
Modified: aries/trunk/application/application-runtime-repository/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-runtime-repository/pom.xml?rev=1598566&r1=1598565&r2=1598566&view=diff
==============================================================================
--- aries/trunk/application/application-runtime-repository/pom.xml (original)
+++ aries/trunk/application/application-runtime-repository/pom.xml Fri May 30 12:26:39 2014
@@ -18,14 +18,16 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.aries</groupId>
- <artifactId>java6-parent</artifactId>
- <version>1.0.0</version>
- <relativePath />
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
-
- <modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.runtime.repository</artifactId>
<packaging>bundle</packaging>
@@ -35,11 +37,11 @@
An bundle repository runtime implementation
</description>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-runtime-repository</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/application/application-runtime-repository</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/application/application-runtime-repository</url>
- </scm>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-runtime-repository</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/application/application-runtime-repository</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/application/application-runtime-repository</url>
+ </scm>
<properties>
<aries.osgi.export.pkg>
@@ -96,6 +98,7 @@
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
Modified: aries/trunk/application/application-runtime/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-runtime/pom.xml?rev=1598566&r1=1598565&r2=1598566&view=diff
==============================================================================
--- aries/trunk/application/application-runtime/pom.xml (original)
+++ aries/trunk/application/application-runtime/pom.xml Fri May 30 12:26:39 2014
@@ -18,14 +18,16 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.aries</groupId>
- <artifactId>java6-parent</artifactId>
- <version>1.0.0</version>
- <relativePath />
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
-
- <modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.runtime</artifactId>
<packaging>bundle</packaging>
@@ -35,20 +37,19 @@
A very basic runtime implementation
</description>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-runtime</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/application/application-runtime</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/application/application-runtime</url>
- </scm>
-
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-runtime</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/application/application-runtime</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/application/application-runtime</url>
+ </scm>
<properties>
- <aries.osgi.export.pkg />
- <aries.osgi.import.pkg>
- org.apache.aries.application.management;provide:=true,
- org.apache.aries.application.management.spi.runtime;provide:=true,
- *
- </aries.osgi.import.pkg>
+ <aries.osgi.export.pkg />
+ <aries.osgi.import.pkg>
+ org.apache.aries.application.management;provide:=true,
+ org.apache.aries.application.management.spi.runtime;provide:=true,
+ *
+ </aries.osgi.import.pkg>
</properties>
<dependencies>
@@ -89,6 +90,7 @@
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -110,4 +112,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: aries/trunk/application/application-tooling-repository-generator/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-tooling-repository-generator/pom.xml?rev=1598566&r1=1598565&r2=1598566&view=diff
==============================================================================
--- aries/trunk/application/application-tooling-repository-generator/pom.xml (original)
+++ aries/trunk/application/application-tooling-repository-generator/pom.xml Fri May 30 12:26:39 2014
@@ -1,40 +1,46 @@
<?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.
- -->
+<!--
+ 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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.aries</groupId>
- <artifactId>java6-parent</artifactId>
- <version>1.0.0</version>
- <relativePath />
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
+
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.tooling.repository.generator</artifactId>
<packaging>bundle</packaging>
<version>1.0.1-SNAPSHOT</version>
<name>Apache Aries repository generator tool</name>
+ <description>Command line tool for generating repository xml</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-tooling-repository-generator</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/application/application-tooling-repository-generator</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/application/application-tooling-repository-generator</url>
- </scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/application/application-tooling-repository-generator</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/application/application-tooling-repository-generator</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/application/application-tooling-repository-generator</url>
+ </scm>
+
<properties>
<aries.osgi.export.pkg>
</aries.osgi.export.pkg>
@@ -42,6 +48,7 @@
org.apache.aries.application.repository.generator
</aries.osgi.private.pkg>
</properties>
+
<dependencies>
<dependency>
<groupId>org.eclipse</groupId>
@@ -169,7 +176,6 @@
</dependencies>
- <description>Command line tool for generating repository xml</description>
<build>
<plugins>
<plugin>
Modified: aries/trunk/application/application-utils/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-utils/pom.xml?rev=1598566&r1=1598565&r2=1598566&view=diff
==============================================================================
--- aries/trunk/application/application-utils/pom.xml (original)
+++ aries/trunk/application/application-utils/pom.xml Fri May 30 12:26:39 2014
@@ -1,3 +1,4 @@
+<?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
@@ -17,12 +18,14 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.aries</groupId>
- <artifactId>java5-parent</artifactId>
- <version>1.0.0</version>
- <relativePath />
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.application</groupId>
@@ -40,7 +43,6 @@
<url>http://svn.apache.org/viewvc/aries/trunk/application/application-utils</url>
</scm>
-
<properties>
<!-- Export package versions are maintained in packageinfo files -->
<aries.osgi.export.pkg>
@@ -84,7 +86,6 @@
<version>1.0.0</version>
</dependency>
-
<!--External dependencies. Versions may be specified in default parent -->
<dependency>
<groupId>junit</groupId>
@@ -107,6 +108,7 @@
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -128,4 +130,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: aries/trunk/application/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/pom.xml?rev=1598566&r1=1598565&r2=1598566&view=diff
==============================================================================
--- aries/trunk/application/pom.xml (original)
+++ aries/trunk/application/pom.xml Fri May 30 12:26:39 2014
@@ -1,35 +1,38 @@
<?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.
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.aries</groupId>
- <artifactId>java6-parent</artifactId>
- <version>1.0.0</version>
- <relativePath />
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.aries.application</groupId>
<artifactId>application</artifactId>
<name>Apache Aries Application</name>
<packaging>pom</packaging>
<version>1.0.0-SNAPSHOT</version>
-
<description>
Reactor pom for the Aries Application module
</description>
@@ -39,7 +42,7 @@
<module>application-utils</module>
<module>application-bundle</module>
<module>application-converters</module>
- <module>application-default-local-platform</module>
+ <module>application-default-local-platform</module>
<module>application-deployment-management</module>
<module>application-install</module>
<module>application-itest-interface</module>
@@ -53,10 +56,10 @@
<module>application-resolve-transform-cm</module>
<module>application-resolve-transform-cm-itests</module>
<module>application-runtime</module>
- <module>application-runtime-isolated</module>
- <module>application-runtime-framework</module>
- <module>application-runtime-framework-management</module>
- <module>application-tooling-repository-generator</module>
+ <module>application-runtime-isolated</module>
+ <module>application-runtime-framework</module>
+ <module>application-runtime-framework-management</module>
+ <module>application-tooling-repository-generator</module>
<module>application-runtime-repository</module>
<module>application-distro</module>
<module>application-isolated-distro</module>