Author: jbonofre
Date: Fri May 30 16:07:42 2014
New Revision: 1598650
URL: http://svn.apache.org/r1598650
Log:
[ARIES-1006] Upgrade to the "new" parent pom and OSGi 4.3.1
Modified:
aries/trunk/samples/pom.xml
aries/trunk/spi-fly/pom.xml
aries/trunk/spi-fly/spi-fly-core/pom.xml
aries/trunk/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizerGenericCapabilityTest.java
aries/trunk/spi-fly/spi-fly-dynamic-bundle/pom.xml
aries/trunk/spi-fly/spi-fly-examples/pom.xml
aries/trunk/spi-fly/spi-fly-static-bundle/pom.xml
aries/trunk/spi-fly/spi-fly-static-tool/pom.xml
aries/trunk/spi-fly/spi-fly-weaver/pom.xml
aries/trunk/subsystem/pom.xml
aries/trunk/subsystem/subsystem-api/pom.xml
aries/trunk/subsystem/subsystem-bundle/pom.xml
aries/trunk/subsystem/subsystem-core/pom.xml
aries/trunk/subsystem/subsystem-example/pom.xml
aries/trunk/subsystem/subsystem-itests-api-bundle/pom.xml
aries/trunk/subsystem/subsystem-itests/pom.xml
aries/trunk/subsystem/subsystem-obr/pom.xml
Modified: aries/trunk/samples/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/samples/pom.xml?rev=1598650&r1=1598649&r2=1598650&view=diff
==============================================================================
--- aries/trunk/samples/pom.xml (original)
+++ aries/trunk/samples/pom.xml Fri May 30 16:07:42 2014
@@ -1,37 +1,39 @@
<?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>
-
- <modelVersion>4.0.0</modelVersion>
-
+
<groupId>org.apache.aries.samples</groupId>
<version>1.0.1-SNAPSHOT</version>
<artifactId>samples</artifactId>
<name>Apache Aries Samples</name>
<packaging>pom</packaging>
-
+
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/samples</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/samples</developerConnection>
@@ -96,7 +98,7 @@
<ariesJpaBlueprintAriesVersion>1.0.0</ariesJpaBlueprintAriesVersion>
<ariesJpaContainerVersion>1.0.0</ariesJpaContainerVersion>
<ariesJpaContainerContextVersion>1.0.0</ariesJpaContainerContextVersion>
-
+
<!-- Aries Proxy Versions -->
<ariesProxyApiVersion>1.0.0</ariesProxyApiVersion>
<ariesProxyVersion>1.0.0</ariesProxyVersion>
@@ -105,7 +107,7 @@
<!-- Aries Quiesce Versions -->
<ariesQuiesceApiVersion>1.0.0</ariesQuiesceApiVersion>
<ariesQuiesceManagerVersion>1.0.0</ariesQuiesceManagerVersion>
-
+
<!-- Aries Testsupport Versions -->
<ariesTestsupportUnitVersion>1.0.0</ariesTestsupportUnitVersion>
@@ -122,8 +124,6 @@
<!-- Aries Web Versions -->
<ariesWebVersion>1.0.0</ariesWebVersion>
-
-
<!-- External Dependencies -->
<cmVersion>3.2.0-v20070116</cmVersion>
<servicesVersion>3.1.200-v20070605</servicesVersion>
@@ -164,10 +164,9 @@
<aries.javadoc.exclude.packages>*</aries.javadoc.exclude.packages>
</properties>
-
+
<dependencyManagement>
<dependencies>
- <!--
ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ -->
<!-- External project dependencies -->
<dependency>
<groupId>asm</groupId>
@@ -310,15 +309,13 @@
<artifactId>org.apache.felix.bundlerepository</artifactId>
<version>${felixBundlerepositoryVersion}</version>
</dependency>
-
+
<dependency>
<groupId>net.homeip.yusuke</groupId>
<artifactId>twitter4j</artifactId>
<version>${twitter4jVersion}</version>
</dependency>
-
- <!--
ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ -->
<!-- other aries subproject dependency management -->
<!--application-->
<dependency>
@@ -541,7 +538,7 @@
<artifactId>org.apache.aries.proxy.impl</artifactId>
<version>${ariesProxyImplVersion}</version>
</dependency>
- <!-- quiesce -->
+ <!-- quiesce -->
<dependency>
<groupId>org.apache.aries.quiesce</groupId>
<artifactId>org.apache.aries.quiesce.api</artifactId>
@@ -558,7 +555,7 @@
<artifactId>org.apache.aries.testsupport.unit</artifactId>
<version>${ariesTestsupportUnitVersion}</version>
</dependency>
- <!-- transaction -->
+ <!-- transaction -->
<dependency>
<groupId>org.apache.aries.transaction</groupId>
<artifactId>org.apache.aries.transaction.blueprint</artifactId>
@@ -591,7 +588,7 @@
<artifactId>org.apache.aries.web.urlhandler</artifactId>
<version>${ariesWebVersion}</version>
</dependency>
- <!--
ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ -->
+
<!-- internal samples dependencies -->
<dependency>
<groupId>org.apache.aries.samples.ariestrader</groupId>
Modified: aries/trunk/spi-fly/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/spi-fly/pom.xml?rev=1598650&r1=1598649&r2=1598650&view=diff
==============================================================================
--- aries/trunk/spi-fly/pom.xml (original)
+++ aries/trunk/spi-fly/pom.xml Fri May 30 16:07:42 2014
@@ -10,8 +10,6 @@
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
@@ -19,13 +17,15 @@
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";>
+<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>
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.spifly</groupId>
@@ -33,11 +33,10 @@
<name>Apache Aries SPI Fly</name>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
-
<description>
SPI support for OSGi
</description>
-
+
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/spi-fly</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/spi-fly</developerConnection>
@@ -52,4 +51,5 @@
<module>spi-fly-static-bundle</module>
<module>spi-fly-examples</module>
</modules>
+
</project>
Modified: aries/trunk/spi-fly/spi-fly-core/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-core/pom.xml?rev=1598650&r1=1598649&r2=1598650&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-core/pom.xml (original)
+++ aries/trunk/spi-fly/spi-fly-core/pom.xml Fri May 30 16:07:42 2014
@@ -1,5 +1,5 @@
<?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
@@ -16,13 +16,16 @@
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>
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.spifly</groupId>
@@ -31,11 +34,11 @@
<packaging>jar</packaging>
<name>Apache Aries SPI Fly Core (internal module)</name>
<description>
-This bundle contains an extender that facilitates the use
-of JRE SPI providers (components typically plugged in to the
-JRE through META-INF/services resources).
+ This bundle contains an extender that facilitates the use
+ of JRE SPI providers (components typically plugged in to the
+ JRE through META-INF/services resources).
</description>
-
+
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/spi-fly/spi-fly-core</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/spi-fly/spi-fly-core</developerConnection>
@@ -53,7 +56,7 @@ JRE through META-INF/services resources)
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.aries</groupId>
@@ -74,4 +77,5 @@ JRE through META-INF/services resources)
<scope>test</scope>
</dependency>
</dependencies>
+
</project>
Modified:
aries/trunk/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizerGenericCapabilityTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizerGenericCapabilityTest.java?rev=1598650&r1=1598649&r2=1598650&view=diff
==============================================================================
---
aries/trunk/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizerGenericCapabilityTest.java
(original)
+++
aries/trunk/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizerGenericCapabilityTest.java
Fri May 30 16:07:42 2014
@@ -442,9 +442,9 @@ public class ProviderBundleTrackerCustom
BundleContext implBC = EasyMock.createNiceMock(BundleContext.class);
EasyMock.expect(implBC.registerService((String) EasyMock.anyObject(),
EasyMock.anyObject(), (Dictionary<String,?>)EasyMock.anyObject())).
- andAnswer(new IAnswer<ServiceRegistration>() {
+ andAnswer(new IAnswer<ServiceRegistration<?>>() {
@Override
- public ServiceRegistration answer() throws Throwable {
+ public ServiceRegistration<?> answer() throws Throwable {
final String className = (String)
EasyMock.getCurrentArguments()[0];
final Object serviceObject =
EasyMock.getCurrentArguments()[1];
final Dictionary<String, Object> registrationProps =
@@ -499,7 +499,7 @@ public class ProviderBundleTrackerCustom
return implBundle;
}
- private static class ServiceRegistrationImpl implements
ServiceRegistration, ServiceReference {
+ private static class ServiceRegistrationImpl implements
ServiceRegistration<Object>, ServiceReference {
private final Object serviceObject;
private final Dictionary<String, Object> properties;
@@ -514,12 +514,12 @@ public class ProviderBundleTrackerCustom
}
@Override
- public ServiceReference getReference() {
+ public ServiceReference<Object> getReference() {
return this;
}
@Override
- public void setProperties(@SuppressWarnings("rawtypes") Dictionary
properties) {
+ public void setProperties(Dictionary<String, ?> properties) {
throw new UnsupportedOperationException();
}
Modified: aries/trunk/spi-fly/spi-fly-dynamic-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-dynamic-bundle/pom.xml?rev=1598650&r1=1598649&r2=1598650&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-dynamic-bundle/pom.xml (original)
+++ aries/trunk/spi-fly/spi-fly-dynamic-bundle/pom.xml Fri May 30 16:07:42 2014
@@ -1,5 +1,5 @@
<?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
@@ -16,14 +16,16 @@
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>
<groupId>org.apache.aries.spifly</groupId>
@@ -32,12 +34,11 @@
<packaging>bundle</packaging>
<name>Apache Aries SPI Fly Dynamic Weaving Bundle</name>
<description>
-This bundle contains an extender that facilitates the use
-of JRE SPI providers (components typically plugged in to the
-JRE through META-INF/services resources).
+ This bundle contains an extender that facilitates the use
+ of JRE SPI providers (components typically plugged in to the
+ JRE through META-INF/services resources).
</description>
-
-
+
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/spi-fly/spi-fly-dynamic-bundle</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/spi-fly/spi-fly-dynamic-bundle</developerConnection>
@@ -58,12 +59,12 @@ JRE through META-INF/services resources)
<exclusions>
<exclusion>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>org.osgi.core</artifactId>
</exclusion>
<exclusion>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>org.osgi.compendium</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -73,11 +74,10 @@ JRE through META-INF/services resources)
<artifactId>org.apache.aries.spifly.weaver-internal</artifactId>
<version>1.0.1-SNAPSHOT</version>
</dependency>
-
+
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.3.0</version>
<scope>provided</scope>
</dependency>
@@ -85,7 +85,7 @@ JRE through META-INF/services resources)
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>junit</groupId>
@@ -119,7 +119,9 @@ JRE through META-INF/services resources)
org.apache.aries.spifly.dynamic
</Private-Package>
<Embed-Dependency>org.apache.aries.spifly.*;scope=compile;inline=true</Embed-Dependency>
-
<Provide-Capability>osgi.extender;osgi.extender=osgi.serviceloader.registrar,osgi.extender;osgi.extender=osgi.serviceloader.processor</Provide-Capability>
+ <Provide-Capability>
+
osgi.extender;osgi.extender=osgi.serviceloader.registrar,osgi.extender;osgi.extender=osgi.serviceloader.processor
+ </Provide-Capability>
</instructions>
</configuration>
</plugin>
@@ -135,11 +137,13 @@ JRE through META-INF/services resources)
<goal>version-check</goal>
</goals>
<configuration>
-
<oldArtifact>org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.0.0</oldArtifact>
+
<oldArtifact>org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.0.0
+ </oldArtifact>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
+
</project>
Modified: aries/trunk/spi-fly/spi-fly-examples/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-examples/pom.xml?rev=1598650&r1=1598649&r2=1598650&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-examples/pom.xml (original)
+++ aries/trunk/spi-fly/spi-fly-examples/pom.xml Fri May 30 16:07:42 2014
@@ -10,8 +10,6 @@
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
@@ -20,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.spifly.examples</groupId>
@@ -33,10 +33,10 @@
<name>Apache Aries SPI Fly Examples</name>
<version>1.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
-
<description>
SPI examples
</description>
+
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/spi-fly/spi-fly-examples</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/spi-fly/spi-fly-examples</developerConnection>
@@ -55,4 +55,5 @@
<module>spi-fly-example-resource-provider-bundle</module>
<module>spi-fly-example-resource-client-bundle</module>
</modules>
+
</project>
Modified: aries/trunk/spi-fly/spi-fly-static-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-static-bundle/pom.xml?rev=1598650&r1=1598649&r2=1598650&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-static-bundle/pom.xml (original)
+++ aries/trunk/spi-fly/spi-fly-static-bundle/pom.xml Fri May 30 16:07:42 2014
@@ -1,5 +1,5 @@
<?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
@@ -16,14 +16,16 @@
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>
<groupId>org.apache.aries.spifly</groupId>
@@ -36,7 +38,7 @@
woven using the static weaving done through the
org.apache.aries.spifly.static
component.
</description>
-
+
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/spi-fly/spi-fly-static-bundle</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/spi-fly/spi-fly-static-bundle</developerConnection>
@@ -49,18 +51,18 @@
<artifactId>org.apache.aries.spifly.core-internal</artifactId>
<version>1.0.1-SNAPSHOT</version>
</dependency>
-
+
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
- </dependency>
+ </dependency>
</dependencies>
<build>
@@ -80,7 +82,8 @@
org.apache.aries.spifly.staticbundle
</Private-Package>
<Bundle-Activator>org.apache.aries.spifly.staticbundle.StaticWeavingActivator</Bundle-Activator>
-
<Provide-Capability>osgi.extender;osgi.extender=osgi.serviceloader.registrar</Provide-Capability>
+
<Provide-Capability>osgi.extender;osgi.extender=osgi.serviceloader.registrar
+ </Provide-Capability>
</instructions>
</configuration>
</plugin>
@@ -96,11 +99,13 @@
<goal>version-check</goal>
</goals>
<configuration>
-
<oldArtifact>org.apache.aries.spifly:org.apache.aries.spifly.static.bundle:1.0.0</oldArtifact>
+
<oldArtifact>org.apache.aries.spifly:org.apache.aries.spifly.static.bundle:1.0.0
+ </oldArtifact>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
+
</project>
Modified: aries/trunk/spi-fly/spi-fly-static-tool/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-static-tool/pom.xml?rev=1598650&r1=1598649&r2=1598650&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-static-tool/pom.xml (original)
+++ aries/trunk/spi-fly/spi-fly-static-tool/pom.xml Fri May 30 16:07:42 2014
@@ -1,5 +1,5 @@
<?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
@@ -16,14 +16,16 @@
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>
<groupId>org.apache.aries.spifly</groupId>
@@ -35,13 +37,12 @@
This tool does the weaving to support SPI ServiceLoader statically.
</description>
-
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/spi-fly/spi-fly-static-tool</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/spi-fly/spi-fly-static-tool</developerConnection>
<url>http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-static-tool</url>
</scm>
-
+
<dependencies>
<dependency>
<groupId>org.ow2.asm</groupId>
@@ -65,14 +66,14 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
-
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
</dependencies>
-
+
<build>
<plugins>
<plugin>
@@ -95,7 +96,8 @@
</goals>
</execution>
</executions>
- </plugin>
+ </plugin>
</plugins>
</build>
+
</project>
Modified: aries/trunk/spi-fly/spi-fly-weaver/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-weaver/pom.xml?rev=1598650&r1=1598649&r2=1598650&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-weaver/pom.xml (original)
+++ aries/trunk/spi-fly/spi-fly-weaver/pom.xml Fri May 30 16:07:42 2014
@@ -1,5 +1,5 @@
<?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
@@ -16,14 +16,16 @@
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>
<groupId>org.apache.aries.spifly</groupId>
@@ -37,7 +39,7 @@
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/spi-fly/spi-fly-weaver</developerConnection>
<url>http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-weaver</url>
</scm>
-
+
<dependencies>
<dependency>
<groupId>org.ow2.asm</groupId>
@@ -65,4 +67,5 @@
<scope>test</scope>
</dependency>
</dependencies>
+
</project>
Modified: aries/trunk/subsystem/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/subsystem/pom.xml?rev=1598650&r1=1598649&r2=1598650&view=diff
==============================================================================
--- aries/trunk/subsystem/pom.xml (original)
+++ aries/trunk/subsystem/pom.xml Fri May 30 16:07:42 2014
@@ -1,52 +1,53 @@
<?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>
- <modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.aries.subsystem</groupId>
<artifactId>subsystem</artifactId>
<name>Apache Aries Subsystem</name>
<packaging>pom</packaging>
<version>1.0.0-SNAPSHOT</version>
<description>Subsystems support for Aries</description>
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/subsystem</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/subsystem</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/subsystem</url>
- </scm>
- <profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>subsystem-api</module>
- <module>subsystem-core</module>
- <module>subsystem-obr</module>
- <module>subsystem-itests</module>
- <module>subsystem-itests-api-bundle</module>
- <module>subsystem-bundle</module>
- </modules>
- </profile>
- </profiles>
+
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/subsystem</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/subsystem</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/subsystem</url>
+ </scm>
+
+ <modules>
+ <module>subsystem-api</module>
+ <module>subsystem-core</module>
+ <module>subsystem-obr</module>
+ <module>subsystem-itests</module>
+ <module>subsystem-itests-api-bundle</module>
+ <module>subsystem-bundle</module>
+ </modules>
+
</project>
Modified: aries/trunk/subsystem/subsystem-api/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-api/pom.xml?rev=1598650&r1=1598649&r2=1598650&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-api/pom.xml (original)
+++ aries/trunk/subsystem/subsystem-api/pom.xml Fri May 30 16:07:42 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.subsystem</groupId>
@@ -32,28 +35,28 @@
<version>1.0.1-SNAPSHOT</version>
<description>Subsystems API.</description>
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/subsystem/subsystem-api</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/subsystem/subsystem-api</developerConnection>
-
<url>http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-api</url>
- </scm>
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/subsystem/subsystem-api</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/subsystem/subsystem-api</developerConnection>
+
<url>http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-api</url>
+ </scm>
<properties>
- <!-- Export package versions are maintained in packageinfo files -->
+ <!-- Export package versions are maintained in packageinfo files -->
<aries.osgi.export.pkg>
- org.apache.aries.subsystem,
- org.osgi.service.repository,
+ org.apache.aries.subsystem,
+ org.osgi.service.repository,
org.osgi.service.subsystem
</aries.osgi.export.pkg>
<aries.osgi.import>
- org.osgi.service.repository;version="[1.0,2)",
- org.osgi.service.subsystem;version="[1.0,2)",
- *
- </aries.osgi.import>
+ org.osgi.service.repository;version="[1.0,2)",
+ org.osgi.service.subsystem;version="[1.0,2)",
+ *
+ </aries.osgi.import>
</properties>
<dependencies>
- <dependency>
+ <dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
<version>1.1.0</version>
@@ -65,12 +68,13 @@
<scope>provided</scope>
</dependency>
</dependencies>
-
+
<build>
<plugins>
<plugin>
<groupId>org.apache.aries.versioning</groupId>
<artifactId>org.apache.aries.versioning.plugin</artifactId>
+ <version>0.1.0</version>
<executions>
<execution>
<id>default-verify</id>
Modified: aries/trunk/subsystem/subsystem-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-bundle/pom.xml?rev=1598650&r1=1598649&r2=1598650&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-bundle/pom.xml (original)
+++ aries/trunk/subsystem/subsystem-bundle/pom.xml Fri May 30 16:07:42 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.subsystem</groupId>
@@ -32,25 +35,25 @@
<version>1.0.1-SNAPSHOT</version>
<description>This is a standalone bundle to support Aries
Subsystems.</description>
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/subsystem/subsystem-bundle</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/subsystem/subsystem-bundle</developerConnection>
-
<url>http://svn.apache.org/viewvc/aries/trunk/application/subsystem-bundle</url>
- </scm>
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/subsystem/subsystem-bundle</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/subsystem/subsystem-bundle</developerConnection>
+
<url>http://svn.apache.org/viewvc/aries/trunk/application/subsystem-bundle</url>
+ </scm>
<properties>
- <aries.osgi.activator>
+ <aries.osgi.activator>
org.apache.aries.subsystem.core.internal.Activator
</aries.osgi.activator>
- <aries.osgi.import>
- org.osgi.service.repository;version="[1.0,2)",
- org.osgi.service.subsystem;version="[1.0,2)",
+ <aries.osgi.import>
+ org.osgi.service.repository;version="[1.0,2)",
+ org.osgi.service.subsystem;version="[1.0,2)",
org.apache.aries.application.*;resolution:=optional,
- *
- </aries.osgi.import>
+ *
+ </aries.osgi.import>
<aries.osgi.export.pkg>
- org.apache.aries.subsystem;version="1.0",
- org.osgi.service.repository;version="1.0",
+ org.apache.aries.subsystem;version="1.0",
+ org.osgi.service.repository;version="1.0",
org.osgi.service.subsystem;version="1.0"
</aries.osgi.export.pkg>
<aries.osgi.private.pkg>
@@ -105,11 +108,11 @@
<version>1.0.0</version>
</dependency>
<dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>org.eclipse.equinox.coordinator</artifactId>
- <version>1.1.0.v20120522-1841</version>
- </dependency>
- <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>org.eclipse.equinox.coordinator</artifactId>
+ <version>1.1.0.v20120522-1841</version>
+ </dependency>
+ <dependency>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.region</artifactId>
<version>1.1.0.v20120522-1841</version>
@@ -120,7 +123,7 @@
<version>3.8.0.v20120529-1548</version>
</dependency>
</dependencies>
-
+
<build>
<plugins>
<!-- Use the shade plugin with the dependency plugin to unjar the
various jars
@@ -143,7 +146,7 @@
</includes>
</artifactSet>
<filters>
- <filter>
+ <filter>
<artifact>org.apache.aries.subsystem:org.apache.aries.subsystem.api</artifact>
<excludes>
<exclude>org/**</exclude>
@@ -166,6 +169,7 @@
<plugin>
<groupId>org.apache.aries.versioning</groupId>
<artifactId>org.apache.aries.versioning.plugin</artifactId>
+ <version>0.1.0</version>
<executions>
<execution>
<id>default-verify</id>
Modified: aries/trunk/subsystem/subsystem-core/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-core/pom.xml?rev=1598650&r1=1598649&r2=1598650&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-core/pom.xml (original)
+++ aries/trunk/subsystem/subsystem-core/pom.xml Fri May 30 16:07:42 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.subsystem</groupId>
@@ -32,31 +35,31 @@
<version>1.0.1-SNAPSHOT</version>
<description>Subsystems Core.</description>
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/subsystem/subsystem-core</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/subsystem/subsystem-core</developerConnection>
-
<url>http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-core</url>
- </scm>
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/subsystem/subsystem-core</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/subsystem/subsystem-core</developerConnection>
+
<url>http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-core</url>
+ </scm>
<properties>
- <aries.osgi.activator>
+ <aries.osgi.activator>
org.apache.aries.subsystem.core.internal.Activator
</aries.osgi.activator>
- <aries.osgi.import>
- org.osgi.service.repository;version="[1.0,2)",
- org.osgi.service.subsystem;version="[1.0,2)",
- org.apache.aries.subsystem;version="[1.0,2)",
+ <aries.osgi.import>
+ org.osgi.service.repository;version="[1.0,2)",
+ org.osgi.service.subsystem;version="[1.0,2)",
+ org.apache.aries.subsystem;version="[1.0,2)",
org.apache.aries.application.*;resolution:=optional,
- *
- </aries.osgi.import>
- <aries.osgi.export.pkg />
+ *
+ </aries.osgi.import>
+ <aries.osgi.export.pkg/>
<aries.osgi.private.pkg>
org.apache.aries.subsystem.core.*
</aries.osgi.private.pkg>
</properties>
<dependencies>
- <dependency>
+ <dependency>
<groupId>org.apache.aries.subsystem</groupId>
<artifactId>org.apache.aries.subsystem.api</artifactId>
<version>1.0.0</version>
@@ -76,7 +79,7 @@
<artifactId>org.apache.aries.application.utils</artifactId>
<version>1.0.0</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>5.0.0</version>
@@ -88,12 +91,12 @@
<version>5.0.0</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>org.eclipse.equinox.coordinator</artifactId>
- <version>1.1.0.v20120522-1841</version>
- </dependency>
- <dependency>
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>org.eclipse.equinox.coordinator</artifactId>
+ <version>1.1.0.v20120522-1841</version>
+ </dependency>
+ <dependency>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.region</artifactId>
<version>1.1.0.v20120522-1841</version>
@@ -104,17 +107,17 @@
<version>1.0.0</version>
<scope>test</scope>
<exclusions>
- <exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>3.0</version>
- <scope>test</scope>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>3.0</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -131,12 +134,13 @@
<scope>test</scope>
</dependency>
</dependencies>
-
+
<build>
<plugins>
<plugin>
<groupId>org.apache.aries.versioning</groupId>
<artifactId>org.apache.aries.versioning.plugin</artifactId>
+ <version>0.1.0</version>
<executions>
<execution>
<id>default-verify</id>
Modified: aries/trunk/subsystem/subsystem-example/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-example/pom.xml?rev=1598650&r1=1598649&r2=1598650&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-example/pom.xml (original)
+++ aries/trunk/subsystem/subsystem-example/pom.xml Fri May 30 16:07:42 2014
@@ -1,28 +1,28 @@
<?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
+<!--
+ 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.
- -->
+ 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";>
+ 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>0.4</version>
- <relativePath />
+ <relativePath/>
</parent>
<groupId>org.apache.aries.subsystem</groupId>
@@ -32,11 +32,12 @@
<version>0.1-SNAPSHOT</version>
<description>Subsystems example for Aries</description>
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/subsystem/subsystem-example</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/subsystem/subsystem-example</developerConnection>
-
<url>http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-example</url>
- </scm>
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/subsystem/subsystem-example</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/subsystem/subsystem-example
+ </developerConnection>
+
<url>http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-example</url>
+ </scm>
<modules>
<module>subsystem-helloIsolation</module>
Modified: aries/trunk/subsystem/subsystem-itests-api-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests-api-bundle/pom.xml?rev=1598650&r1=1598649&r2=1598650&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-itests-api-bundle/pom.xml (original)
+++ aries/trunk/subsystem/subsystem-itests-api-bundle/pom.xml Fri May 30
16:07:42 2014
@@ -1,21 +1,31 @@
-<!-- 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";>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.aries</groupId>
- <artifactId>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.subsystem</groupId>
@@ -26,11 +36,12 @@
<description>
Application interfaces used in subsystem itests
</description>
-
+
<properties>
- <aries.osgi.export.pkg>
- org.apache.aries.subsystem.itests.hello.api
- </aries.osgi.export.pkg>
- <aries.osgi.private.pkg />
- </properties>
+ <aries.osgi.export.pkg>
+ org.apache.aries.subsystem.itests.hello.api
+ </aries.osgi.export.pkg>
+ <aries.osgi.private.pkg/>
+ </properties>
+
</project>
