You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by tj...@apache.org on 2014/06/30 18:55:06 UTC
svn commit: r1606837 [6/27] - in /aries/branches/subsystemsR6: ./
application/ application/application-api/ application/application-bundle/
application/application-converters/
application/application-default-local-platform/
application/application-depl...
Modified: aries/branches/subsystemsR6/application/application-resolve-transform-cm-itests/src/test/java/org/apache/aries/application/resolve/transform/cm/itest/ConfigurationPostResolverTest.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/application/application-resolve-transform-cm-itests/src/test/java/org/apache/aries/application/resolve/transform/cm/itest/ConfigurationPostResolverTest.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/application/application-resolve-transform-cm-itests/src/test/java/org/apache/aries/application/resolve/transform/cm/itest/ConfigurationPostResolverTest.java (original)
+++ aries/branches/subsystemsR6/application/application-resolve-transform-cm-itests/src/test/java/org/apache/aries/application/resolve/transform/cm/itest/ConfigurationPostResolverTest.java Mon Jun 30 16:54:57 2014
@@ -16,14 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.aries.application.resolve.transform.cm.itest;
-import static org.apache.aries.itest.ExtraOptions.mavenBundle;
-import static org.apache.aries.itest.ExtraOptions.paxLogging;
-import static org.apache.aries.itest.ExtraOptions.testOptions;
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.repository;
+import static org.ops4j.pax.exam.CoreOptions.composite;
+import static org.ops4j.pax.exam.CoreOptions.junitBundles;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.options;
+import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+import static org.ops4j.pax.exam.CoreOptions.vmOption;
+import static org.ops4j.pax.exam.CoreOptions.when;
import java.util.ArrayList;
import java.util.Arrays;
@@ -49,25 +50,26 @@ import org.apache.aries.unittest.mocks.S
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
+
+@RunWith(PaxExam.class)
+public class ConfigurationPostResolverTest extends AbstractIntegrationTest {
-@RunWith(JUnit4TestRunner.class)
-public class ConfigurationPostResolverTest extends AbstractIntegrationTest
-{
/**
* This test validates that the transformer is correctly detecting the config admin package. Checks
* are performed to validate that an existing import package is still honored etc.
- *
+ *
* @throws Exception
*/
@Test
public void validatePostResolveTransform() throws Exception {
-
+
RichBundleContext ctx = new RichBundleContext(bundleContext);
PostResolveTransformer transformer = ctx.getService(PostResolveTransformer.class);
Assert.assertNotNull("Unable to locate transformer", transformer);
-
+
/**
* Try processing deployed content that doesn't have any import for the
* org.osgi.service.cm package, the resultant imports should be unaffected.
@@ -78,7 +80,7 @@ public class ConfigurationPostResolverTe
DeployedBundles transformedDeployedBundles = transformer.postResolveProcess(mockApplicationMetadata, originalDeployedBundles);
Assert.assertNotNull("An instance should have been returned", transformedDeployedBundles);
Assert.assertEquals(originalDeployedBundles.getImportPackage(), transformedDeployedBundles.getImportPackage());
-
+
/**
* Now try processing a deployed bundles instances that has an import for the org.osgi.service.cm package in multiple
* modelled resources with an empty import package set in the mock deployed bundles instance.
@@ -89,7 +91,7 @@ public class ConfigurationPostResolverTe
Assert.assertNotNull("An instance should have been returned", transformedDeployedBundles);
Assert.assertNotSame("Missing config package", originalDeployedBundles.getImportPackage(), transformedDeployedBundles.getImportPackage());
Assert.assertEquals("Missing config package", "org.osgi.service.cm;version=\"1.2.0\"", transformedDeployedBundles.getImportPackage());
-
+
/**
* Now try processing a deployed bundles instances that has an import for the org.osgi.service.cm package in multiple
* modelled resources with a populated import package set in the mock deployed bundles instance.
@@ -102,15 +104,15 @@ public class ConfigurationPostResolverTe
Assert.assertNotSame("Missing config package", originalDeployedBundles.getImportPackage(), transformedDeployedBundles.getImportPackage());
Assert.assertEquals("Missing config package", "org.foo.bar;version=\1.0.0\",org.bar.foo;version=\"1.0.0\",org.osgi.service.cm;version=\"1.2.0\"", transformedDeployedBundles.getImportPackage());
}
-
+
private static Collection<ModelledResource> getNonConfigModelledResources() {
Collection<ModelledResource> modelledResources = new ArrayList<ModelledResource>();
MockModelledResource ms1 = new MockModelledResource();
ms1.setImportedPackages(Arrays.asList(new MockImportedPackage("org.foo.bar", "1.0.0"), new MockImportedPackage("org.bar.foo", "1.0.0")));
-
+
return modelledResources;
}
-
+
private static Collection<ModelledResource> getConfigModelledResources() {
Collection<ModelledResource> resources = getNonConfigModelledResources();
MockModelledResource mmr1 = new MockModelledResource();
@@ -118,36 +120,50 @@ public class ConfigurationPostResolverTe
resources.add(mmr1);
MockModelledResource mmr2 = new MockModelledResource();
mmr2.setImportedPackages(Arrays.asList(new MockImportedPackage("org.osgi.service.cm", "1.2.0")));
- resources.add(mmr2);
+ resources.add(mmr2);
return resources;
}
+
+ public Option baseOptions() {
+ String localRepo = System.getProperty("maven.repo.local");
+ if (localRepo == null) {
+ localRepo = System.getProperty("org.ops4j.pax.url.mvn.localRepository");
+ }
+ return composite(
+ junitBundles(),
+ systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),
+ when(localRepo != null).useOptions(vmOption("-Dorg.ops4j.pax.url.mvn.localRepository=" + localRepo)),
+ mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(),
+ mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject()
+ );
+ }
+
/**
* Create the configuration for the PAX container
- *
+ *
* @return the various required options
* @throws Exception
*/
- @org.ops4j.pax.exam.junit.Configuration
- public static Option[] configuration() throws Exception {
- return testOptions(
- repository("http://repository.ops4j.org/maven2"),
- paxLogging("DEBUG"),
- mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint"),
- mavenBundle("org.ow2.asm", "asm-all"),
- mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
- mavenBundle("org.apache.aries", "org.apache.aries.util"),
- mavenBundle("org.osgi", "org.osgi.compendium"),
- mavenBundle("org.apache.aries.application", "org.apache.aries.application.api"),
- mavenBundle("org.apache.aries.application", "org.apache.aries.application.resolve.transform.cm"),
- //vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006"),
- equinox().version("3.5.0"));
+ @Configuration
+ public Option[] configuration() throws Exception {
+ return options(
+ baseOptions(),
+ mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(),
+ mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(),
+ mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint").versionAsInProject(),
+ mavenBundle("org.ow2.asm", "asm-all").versionAsInProject(),
+ mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").versionAsInProject(),
+ mavenBundle("org.apache.aries", "org.apache.aries.util").versionAsInProject(),
+ mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(),
+ mavenBundle("org.apache.aries.application", "org.apache.aries.application.api").versionAsInProject(),
+ mavenBundle("org.apache.aries.application", "org.apache.aries.application.resolve.transform.cm").versionAsInProject()
+ );
}
-
- private static class MockDeployedBundles implements DeployedBundles
- {
+
+ private static class MockDeployedBundles implements DeployedBundles {
private Collection<ModelledResource> deployedContent;
private String importPackage;
-
+
public void addBundle(ModelledResource arg0) {
}
@@ -158,7 +174,7 @@ public class ConfigurationPostResolverTe
public Collection<ModelledResource> getDeployedContent() {
return deployedContent;
}
-
+
public void setDeployedContent(Collection<ModelledResource> deployedContent) {
this.deployedContent = deployedContent;
}
@@ -178,7 +194,7 @@ public class ConfigurationPostResolverTe
public void setImportPackage(String importPackage) {
this.importPackage = importPackage;
}
-
+
/**
* Used to reflect external packages required
*/
@@ -197,13 +213,13 @@ public class ConfigurationPostResolverTe
public String getUseBundle() {
return null;
}
-
+
}
-
+
private static class MockModelledResource implements ModelledResource {
private Collection<? extends ImportedPackage> importedPackages;
-
+
public String toDeploymentString() {
return null;
}
@@ -211,7 +227,7 @@ public class ConfigurationPostResolverTe
public ExportedBundle getExportedBundle() {
return null;
}
-
+
public Collection<? extends ExportedPackage> getExportedPackages() {
return null;
}
@@ -227,7 +243,7 @@ public class ConfigurationPostResolverTe
public Collection<? extends ImportedPackage> getImportedPackages() {
return importedPackages;
}
-
+
public void setImportedPackages(Collection<? extends ImportedPackage> importedPackages) {
this.importedPackages = importedPackages;
}
@@ -259,19 +275,19 @@ public class ConfigurationPostResolverTe
public boolean isFragment() {
return false;
}
-
+
}
-
+
private static class MockImportedPackage implements ImportedPackage {
private String packageName;
private String versionRange;
-
+
public MockImportedPackage(String packageName, String versionRange) {
this.packageName = packageName;
this.versionRange = versionRange;
}
-
+
public String getAttributeFilter() {
return null;
}
@@ -307,6 +323,6 @@ public class ConfigurationPostResolverTe
public String getVersionRange() {
return versionRange;
}
-
+
}
}
Modified: aries/branches/subsystemsR6/application/application-resolve-transform-cm/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/application/application-resolve-transform-cm/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/application/application-resolve-transform-cm/pom.xml (original)
+++ aries/branches/subsystemsR6/application/application-resolve-transform-cm/pom.xml Mon Jun 30 16:54:57 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>2.0.0-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>
@@ -43,7 +51,9 @@
<aries.osgi.private.pkg>
org.apache.aries.application.resolve.transform.cm
</aries.osgi.private.pkg>
+ <lastReleaseVersion>1.0.0</lastReleaseVersion>
</properties>
+
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
@@ -61,12 +71,12 @@
<version>1.0.0</version>
</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>
@@ -74,9 +84,6 @@
<goals>
<goal>version-check</goal>
</goals>
- <configuration>
- <oldArtifact>org.apache.aries.application:org.apache.aries.application.resolve.transform.cm:1.0.0</oldArtifact>
- </configuration>
</execution>
</executions>
</plugin>
Modified: aries/branches/subsystemsR6/application/application-runtime-framework-management/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/application/application-runtime-framework-management/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/application/application-runtime-framework-management/pom.xml (original)
+++ aries/branches/subsystemsR6/application/application-runtime-framework-management/pom.xml Mon Jun 30 16:54:57 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>2.0.0-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>
@@ -52,6 +54,7 @@
<aries.osgi.private.pkg>
org.apache.aries.application.runtime.framework.management
</aries.osgi.private.pkg>
+ <lastReleaseVersion>1.0.0</lastReleaseVersion>
</properties>
<dependencies>
@@ -102,12 +105,12 @@
<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>
@@ -115,9 +118,6 @@
<goals>
<goal>version-check</goal>
</goals>
- <configuration>
- <oldArtifact>org.apache.aries.application:org.apache.aries.application.runtime.framework.management:1.0.0</oldArtifact>
- </configuration>
</execution>
</executions>
</plugin>
Modified: aries/branches/subsystemsR6/application/application-runtime-framework/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/application/application-runtime-framework/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/application/application-runtime-framework/pom.xml (original)
+++ aries/branches/subsystemsR6/application/application-runtime-framework/pom.xml Mon Jun 30 16:54:57 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>2.0.0-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>
@@ -55,6 +56,7 @@
org.apache.aries.application.runtime.framework;
org.apache.aries.application.runtime.framework.config
</aries.osgi.private.pkg>
+ <lastReleaseVersion>1.0.0</lastReleaseVersion>
</properties>
<dependencies>
@@ -107,12 +109,12 @@
<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>
@@ -120,9 +122,6 @@
<goals>
<goal>version-check</goal>
</goals>
- <configuration>
- <oldArtifact>org.apache.aries.application:org.apache.aries.application.runtime.framework:1.0.0</oldArtifact>
- </configuration>
</execution>
</executions>
</plugin>
Modified: aries/branches/subsystemsR6/application/application-runtime-isolated/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/application/application-runtime-isolated/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/application/application-runtime-isolated/pom.xml (original)
+++ aries/branches/subsystemsR6/application/application-runtime-isolated/pom.xml Mon Jun 30 16:54:57 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>2.0.0-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>
@@ -53,6 +55,7 @@
<aries.osgi.private.pkg>
org.apache.aries.application.runtime.isolated.impl
</aries.osgi.private.pkg>
+ <lastReleaseVersion>1.0.0</lastReleaseVersion>
</properties>
<dependencies>
@@ -105,12 +108,12 @@
<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>
@@ -118,9 +121,6 @@
<goals>
<goal>version-check</goal>
</goals>
- <configuration>
- <oldArtifact>org.apache.aries.application:org.apache.aries.application.runtime.isolated:1.0.0</oldArtifact>
- </configuration>
</execution>
</executions>
</plugin>
Modified: aries/branches/subsystemsR6/application/application-runtime-repository/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/application/application-runtime-repository/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/application/application-runtime-repository/pom.xml (original)
+++ aries/branches/subsystemsR6/application/application-runtime-repository/pom.xml Mon Jun 30 16:54:57 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>2.0.0-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>
@@ -51,6 +53,7 @@
<aries.osgi.private.pkg>
org.apache.aries.application.runtime.repository
</aries.osgi.private.pkg>
+ <lastReleaseVersion>1.0.0</lastReleaseVersion>
</properties>
<dependencies>
@@ -96,12 +99,12 @@
<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>
@@ -109,9 +112,6 @@
<goals>
<goal>version-check</goal>
</goals>
- <configuration>
- <oldArtifact>org.apache.aries.application:org.apache.aries.application.runtime.repository:1.0.0</oldArtifact>
- </configuration>
</execution>
</executions>
</plugin>
Modified: aries/branches/subsystemsR6/application/application-runtime/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/application/application-runtime/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/application/application-runtime/pom.xml (original)
+++ aries/branches/subsystemsR6/application/application-runtime/pom.xml Mon Jun 30 16:54:57 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>2.0.0-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,20 @@
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>
+ <lastReleaseVersion>1.0.0</lastReleaseVersion>
</properties>
<dependencies>
@@ -89,12 +91,12 @@
<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>
@@ -102,12 +104,10 @@
<goals>
<goal>version-check</goal>
</goals>
- <configuration>
- <oldArtifact>org.apache.aries.application:org.apache.aries.application.runtime:1.0.0</oldArtifact>
- </configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
+
</project>
Modified: aries/branches/subsystemsR6/application/application-tooling-repository-generator/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/application/application-tooling-repository-generator/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/application/application-tooling-repository-generator/pom.xml (original)
+++ aries/branches/subsystemsR6/application/application-tooling-repository-generator/pom.xml Mon Jun 30 16:54:57 2014
@@ -1,61 +1,72 @@
<?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>2.0.0-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>
<aries.osgi.private.pkg>
org.apache.aries.application.repository.generator
</aries.osgi.private.pkg>
+ <lastReleaseVersion>1.0.0</lastReleaseVersion>
</properties>
+
<dependencies>
<dependency>
<groupId>org.eclipse</groupId>
- <artifactId>osgi</artifactId>
+ <artifactId>org.eclipse.osgi</artifactId>
+ <version>3.8.0.v20120529-1548</version>
</dependency>
<dependency>
<groupId>org.eclipse.equinox</groupId>
<artifactId>cm</artifactId>
+ <version>3.2.0-v20070116</version>
</dependency>
<dependency>
<groupId>org.eclipse.osgi</groupId>
<artifactId>services</artifactId>
+ <version>3.1.200-v20070605</version>
</dependency>
<dependency>
@@ -83,7 +94,7 @@
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy</artifactId>
- <version>1.0.0</version>
+ <version>1.0.2-SNAPSHOT</version>
</dependency>
<dependency>
@@ -124,8 +135,8 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-all</artifactId>
+ <version>5.0.3</version>
<optional>true</optional>
- <version>4.0</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -169,7 +180,6 @@
</dependencies>
- <description>Command line tool for generating repository xml</description>
<build>
<plugins>
<plugin>
@@ -223,7 +233,6 @@
<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>
@@ -231,9 +240,6 @@
<goals>
<goal>version-check</goal>
</goals>
- <configuration>
- <oldArtifact>org.apache.aries.application:org.apache.aries.application.tooling.repository.generator:1.0.0</oldArtifact>
- </configuration>
</execution>
</executions>
</plugin>
Modified: aries/branches/subsystemsR6/application/application-utils/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/application/application-utils/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/application/application-utils/pom.xml (original)
+++ aries/branches/subsystemsR6/application/application-utils/pom.xml Mon Jun 30 16:54:57 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>2.0.0-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>
@@ -61,6 +63,7 @@
org.apache.aries.application.utils.internal;
org.apache.aries.application.utils.filesystem.impl
</aries.osgi.private.pkg>
+ <lastReleaseVersion>1.0.0</lastReleaseVersion>
</properties>
<dependencies>
@@ -84,7 +87,6 @@
<version>1.0.0</version>
</dependency>
-
<!--External dependencies. Versions may be specified in default parent -->
<dependency>
<groupId>junit</groupId>
@@ -107,12 +109,12 @@
<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>
@@ -120,12 +122,10 @@
<goals>
<goal>version-check</goal>
</goals>
- <configuration>
- <oldArtifact>org.apache.aries.application:org.apache.aries.application.utils:1.0.0</oldArtifact>
- </configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
+
</project>
Modified: aries/branches/subsystemsR6/application/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/application/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/application/pom.xml (original)
+++ aries/branches/subsystemsR6/application/pom.xml Mon Jun 30 16:54:57 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>2.0.0-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>
Modified: aries/branches/subsystemsR6/blueprint/blueprint-annotation-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-annotation-api/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-annotation-api/pom.xml (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-annotation-api/pom.xml Mon Jun 30 16:54:57 2014
@@ -1,18 +1,21 @@
+<?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">
@@ -20,9 +23,9 @@
<parent>
<groupId>org.apache.aries</groupId>
- <artifactId>java5-parent</artifactId>
- <version>1.0.0</version>
- <relativePath />
+ <artifactId>parent</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.blueprint</groupId>
@@ -49,6 +52,8 @@
org.osgi.framework
</aries.osgi.import.pkg>
<aries.osgi.private.pkg />
+ <lastReleaseVersion>1.0.0</lastReleaseVersion>
+
</properties>
<dependencies>
@@ -58,12 +63,12 @@
<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>
@@ -71,9 +76,6 @@
<goals>
<goal>version-check</goal>
</goals>
- <configuration>
- <oldArtifact>org.apache.aries.blueprint:org.apache.aries.blueprint.annotation.api:1.0.0</oldArtifact>
- </configuration>
</execution>
</executions>
</plugin>
Modified: aries/branches/subsystemsR6/blueprint/blueprint-annotation-impl/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-annotation-impl/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-annotation-impl/pom.xml (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-annotation-impl/pom.xml Mon Jun 30 16:54:57 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>2.0.0-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.blueprint</groupId>
@@ -57,9 +60,10 @@
<aries.osgi.export.service>
org.apache.aries.blueprint.annotation.AnnotationScannerService
</aries.osgi.export.service>
-
<blueprint.annotation.api.version>1.0.0</blueprint.annotation.api.version>
<util.version>1.0.0</util.version>
+ <lastReleaseVersion>1.0.0</lastReleaseVersion>
+
</properties>
<profiles>
@@ -96,6 +100,7 @@
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>osgi</artifactId>
+ <version>3.5.0.v20090520</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -109,15 +114,15 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>asm</groupId>
- <artifactId>asm-all</artifactId>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-debug-all</artifactId>
<optional>true</optional>
- <version>3.2</version>
+ <version>5.0.3</version>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-finder</artifactId>
- <version>3.7</version>
+ <version>3.16</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -130,14 +135,13 @@
<artifactId>junit</artifactId>
<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>
@@ -145,9 +149,6 @@
<goals>
<goal>version-check</goal>
</goals>
- <configuration>
- <oldArtifact>org.apache.aries.blueprint:org.apache.aries.blueprint.annotation.impl:1.0.0</oldArtifact>
- </configuration>
</execution>
</executions>
</plugin>
Modified: aries/branches/subsystemsR6/blueprint/blueprint-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-api/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-api/pom.xml (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-api/pom.xml Mon Jun 30 16:54:57 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/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>2.0.0-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.blueprint</groupId>
@@ -50,6 +55,7 @@
org.osgi.framework
</aries.osgi.import.pkg>
<aries.osgi.private.pkg />
+ <lastReleaseVersion>1.0.0</lastReleaseVersion>
</properties>
<dependencies>
@@ -59,12 +65,12 @@
<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>
@@ -72,9 +78,6 @@
<goals>
<goal>version-check</goal>
</goals>
- <configuration>
- <oldArtifact>org.apache.aries.blueprint:org.apache.aries.blueprint.api:1.0.0</oldArtifact>
- </configuration>
</execution>
</executions>
</plugin>
Modified: aries/branches/subsystemsR6/blueprint/blueprint-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-bundle/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-bundle/pom.xml (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-bundle/pom.xml Mon Jun 30 16:54:57 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/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>2.0.0-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.blueprint</groupId>
@@ -97,6 +102,8 @@
<aries.osgi.failok>
true
</aries.osgi.failok>
+ <lastReleaseVersion>1.1.0</lastReleaseVersion>
+
</properties>
<dependencies>
@@ -133,20 +140,15 @@
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy.impl</artifactId>
- <version>1.0.0</version>
+ <version>1.0.3-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
- <artifactId>asm-all</artifactId>
+ <artifactId>asm-debug-all</artifactId>
+ <version>5.0.3</version>
<scope>test</scope>
<optional>true</optional>
- <version>4.0</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>osgi</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -164,7 +166,6 @@
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
</dependency>
-
</dependencies>
<build>
@@ -220,7 +221,6 @@
<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>
@@ -228,9 +228,6 @@
<goals>
<goal>version-check</goal>
</goals>
- <configuration>
- <oldArtifact>org.apache.aries.blueprint:org.apache.aries.blueprint:1.1.0</oldArtifact>
- </configuration>
</execution>
</executions>
</plugin>
Modified: aries/branches/subsystemsR6/blueprint/blueprint-cm/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-cm/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-cm/pom.xml (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-cm/pom.xml Mon Jun 30 16:54:57 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>2.0.0-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.blueprint</groupId>
@@ -55,6 +58,7 @@
<blueprint.api.version>1.0.0</blueprint.api.version>
<blueprint.core.version>1.2.0</blueprint.core.version>
<blueprint.parser.version>1.1.0</blueprint.parser.version>
+ <lastReleaseVersion>1.0.3</lastReleaseVersion>
</properties>
<profiles>
@@ -62,7 +66,7 @@
<id>dev</id>
<properties>
<blueprint.api.version>1.0.1-SNAPSHOT</blueprint.api.version>
- <blueprint.core.version>1.3.0-SNAPSHOT</blueprint.core.version>
+ <blueprint.core.version>1.4.1-SNAPSHOT</blueprint.core.version>
<blueprint.parser.version>1.1.1-SNAPSHOT</blueprint.parser.version>
</properties>
</profile>
@@ -122,19 +126,19 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.5.11</version>
+ <version>1.7.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <version>1.5.11</version>
+ <version>1.7.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy.impl</artifactId>
- <version>1.0.0</version>
+ <version>1.0.3-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -144,12 +148,12 @@
<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>
@@ -157,9 +161,6 @@
<goals>
<goal>version-check</goal>
</goals>
- <configuration>
- <oldArtifact>org.apache.aries.blueprint:org.apache.aries.blueprint.cm:1.0.2</oldArtifact>
- </configuration>
</execution>
</executions>
</plugin>
Modified: aries/branches/subsystemsR6/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmManagedProperties.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmManagedProperties.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmManagedProperties.java (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmManagedProperties.java Mon Jun 30 16:54:57 2014
@@ -152,7 +152,14 @@ public class CmManagedProperties impleme
LOGGER.debug("Configuration updated for bean={} / pid={}", beanName, persistentId);
synchronized (lock) {
properties = props;
- for (Object bean : beans) {
+ }
+ }
+
+ public void updated(Object bean, final Dictionary props) {
+ LOGGER.debug("Configuration updated for bean={} / pid={}", beanName, persistentId);
+ synchronized (lock) {
+ properties = props;
+ if (bean != null) {
inject(bean, false);
}
}
Modified: aries/branches/subsystemsR6/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmManagedServiceFactory.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmManagedServiceFactory.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmManagedServiceFactory.java (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmManagedServiceFactory.java Mon Jun 30 16:54:57 2014
@@ -79,7 +79,7 @@ public class CmManagedServiceFactory ext
props.put(Constants.BUNDLE_SYMBOLICNAME, bundle.getSymbolicName());
props.put(Constants.BUNDLE_VERSION, bundle.getHeaders().get(Constants.BUNDLE_VERSION));
- registration = blueprintContainer.getBundleContext().registerService(ManagedServiceFactory.class.getName(), this, props);
+ registration = blueprintContainer.getBundleContext().registerService(ManagedServiceFactory.class.getName(), this, (Dictionary) props);
}
public void destroy() {
@@ -134,7 +134,7 @@ public class CmManagedServiceFactory ext
while (!properties.isEmpty()) {
properties.remove(properties.keys().nextElement());
}
- } else {
+ } else {
if (!cm.getUpdate()) {
if (update) {
while (!properties.isEmpty()) {
@@ -157,10 +157,10 @@ public class CmManagedServiceFactory ext
properties.put(Constants.SERVICE_PID, pid);
}
- private void updateComponentProperties(Dictionary props) {
+ private void updateComponentProperties(Object bean, Dictionary props) {
CmManagedProperties cm = findBeanProcessor();
if (cm != null) {
- cm.updated(props);
+ cm.updated(bean, props);
}
}
@@ -200,14 +200,14 @@ public class CmManagedServiceFactory ext
}
protected Object doCreate(Dictionary properties) throws Exception {
- updateComponentProperties(copy(properties));
+ updateComponentProperties(null, copy(properties));
Object component = blueprintContainer.getComponentInstance(managedComponentName);
getRegistrationProperties(properties, false);
return component;
}
protected Object doUpdate(Object service, Dictionary properties) throws Exception {
- updateComponentProperties(copy(properties));
+ updateComponentProperties(service, copy(properties));
getRegistrationProperties(properties, true);
return service;
}
Modified: aries/branches/subsystemsR6/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmNamespaceHandler.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmNamespaceHandler.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmNamespaceHandler.java (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/CmNamespaceHandler.java Mon Jun 30 16:54:57 2014
@@ -81,6 +81,7 @@ public class CmNamespaceHandler implemen
public static final String BLUEPRINT_CM_NAMESPACE_1_0 = "http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0";
public static final String BLUEPRINT_CM_NAMESPACE_1_1 = "http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0";
public static final String BLUEPRINT_CM_NAMESPACE_1_2 = "http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.2.0";
+ public static final String BLUEPRINT_CM_NAMESPACE_1_3 = "http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.3.0";
public static final String BLUEPRINT_EXT_NAMESPACE_V1_0 = "http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0";
public static final String BLUEPRINT_EXT_NAMESPACE_V1_1 = "http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.1.0";
public static final String BLUEPRINT_EXT_NAMESPACE_V1_2 = "http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.2.0";
@@ -148,7 +149,9 @@ public class CmNamespaceHandler implemen
}
public URL getSchemaLocation(String namespace) {
- if (BLUEPRINT_CM_NAMESPACE_1_2.equals(namespace)) {
+ if (BLUEPRINT_CM_NAMESPACE_1_3.equals(namespace)) {
+ return getClass().getResource("blueprint-cm-1.3.0.xsd");
+ } else if (BLUEPRINT_CM_NAMESPACE_1_2.equals(namespace)) {
return getClass().getResource("blueprint-cm-1.2.0.xsd");
} else if (BLUEPRINT_CM_NAMESPACE_1_1.equals(namespace)) {
return getClass().getResource("blueprint-cm-1.1.0.xsd");
@@ -591,7 +594,8 @@ public class CmNamespaceHandler implemen
public static boolean isCmNamespace(String uri) {
return BLUEPRINT_CM_NAMESPACE_1_0.equals(uri)
|| BLUEPRINT_CM_NAMESPACE_1_1.equals(uri)
- || BLUEPRINT_CM_NAMESPACE_1_2.equals(uri);
+ || BLUEPRINT_CM_NAMESPACE_1_2.equals(uri)
+ || BLUEPRINT_CM_NAMESPACE_1_3.equals(uri);
}
public static boolean isExtNamespace(String uri) {
Modified: aries/branches/subsystemsR6/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/ManagedObjectManager.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/ManagedObjectManager.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/ManagedObjectManager.java (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/ManagedObjectManager.java Mon Jun 30 16:54:57 2014
@@ -46,7 +46,7 @@ public class ManagedObjectManager {
ConfigurationWatcher reg = map.get(key);
if (reg == null) {
reg = new ConfigurationWatcher();
- ServiceRegistration registration = cm.getBundle().getBundleContext().registerService(ManagedService.class.getName(), reg, props);
+ ServiceRegistration registration = cm.getBundle().getBundleContext().registerService(ManagedService.class.getName(), reg, (Dictionary) props);
reg.setRegistration(registration);
map.put(key, reg);
}
Modified: aries/branches/subsystemsR6/blueprint/blueprint-cm/src/main/resources/OSGI-INF/blueprint/blueprint-cm.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-cm/src/main/resources/OSGI-INF/blueprint/blueprint-cm.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-cm/src/main/resources/OSGI-INF/blueprint/blueprint-cm.xml (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-cm/src/main/resources/OSGI-INF/blueprint/blueprint-cm.xml Mon Jun 30 16:54:57 2014
@@ -36,5 +36,10 @@
<entry key="osgi.service.blueprint.namespace" value="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.2.0"/>
</service-properties>
</service>
+ <service ref="CmNamespaceHandler" interface="org.apache.aries.blueprint.NamespaceHandler">
+ <service-properties>
+ <entry key="osgi.service.blueprint.namespace" value="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.3.0"/>
+ </service-properties>
+ </service>
</blueprint>
Modified: aries/branches/subsystemsR6/blueprint/blueprint-cm/src/test/java/org/apache/aries/blueprint/compendium/cm/Helper.java
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-cm/src/test/java/org/apache/aries/blueprint/compendium/cm/Helper.java?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-cm/src/test/java/org/apache/aries/blueprint/compendium/cm/Helper.java (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-cm/src/test/java/org/apache/aries/blueprint/compendium/cm/Helper.java Mon Jun 30 16:54:57 2014
@@ -97,11 +97,14 @@ public final class Helper {
// get the bundles
List<BundleDescriptor> bundles = getBundleDescriptors(bundleFilter);
+ // Add the test bundles at the beginning of the list so that they get started first.
+ // The reason is that the bundle tracker used by blueprint does not work well
+ // with pojosr because it does not support bundle hooks, so events are lost.
if (testBundles != null) {
for (TinyBundle bundle : testBundles) {
File tmp = File.createTempFile("test-", ".jar", new File("target/bundles/"));
tmp.delete();
- bundles.add(getBundleDescriptor(tmp.getPath(), bundle));
+ bundles.add(0, getBundleDescriptor(tmp.getPath(), bundle));
}
}
Modified: aries/branches/subsystemsR6/blueprint/blueprint-compatibility/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-compatibility/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-compatibility/pom.xml (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-compatibility/pom.xml Mon Jun 30 16:54:57 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/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>2.0.0-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.blueprint</groupId>
@@ -46,6 +51,7 @@
org.apache.aries.blueprint.reflect;deprecated="true",
org.apache.aries.blueprint.compendium.cm;deprecated="true",
</aries.osgi.export>
+ <lastReleaseVersion>1.0.0</lastReleaseVersion>
</properties>
<dependencies>
@@ -56,6 +62,7 @@
<scope>provided</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -135,7 +142,6 @@
<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>
@@ -143,9 +149,6 @@
<goals>
<goal>version-check</goal>
</goals>
- <configuration>
- <oldArtifact>org.apache.aries.blueprint:org.apache.aries.blueprint.compatibility:1.0.0</oldArtifact>
- </configuration>
</execution>
</executions>
</plugin>
Modified: aries/branches/subsystemsR6/blueprint/blueprint-core-compatibility/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/subsystemsR6/blueprint/blueprint-core-compatibility/pom.xml?rev=1606837&r1=1606836&r2=1606837&view=diff
==============================================================================
--- aries/branches/subsystemsR6/blueprint/blueprint-core-compatibility/pom.xml (original)
+++ aries/branches/subsystemsR6/blueprint/blueprint-core-compatibility/pom.xml Mon Jun 30 16:54:57 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/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>2.0.0-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.blueprint</groupId>
@@ -45,6 +50,7 @@
org.apache.aries.blueprint.di;deprecated="true",
org.apache.aries.blueprint.reflect;deprecated="true",
</aries.osgi.export>
+ <lastReleaseVersion>1.0.0</lastReleaseVersion>
</properties>
<dependencies>
@@ -55,6 +61,7 @@
<scope>provided</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -133,7 +140,6 @@
<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>
@@ -141,9 +147,6 @@
<goals>
<goal>version-check</goal>
</goals>
- <configuration>
- <oldArtifact>org.apache.aries.blueprint:org.apache.aries.blueprint.core.compatibility:1.0.0</oldArtifact>
- </configuration>
</execution>
</executions>
</plugin>