You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ti...@apache.org on 2011/10/07 17:11:31 UTC
svn commit: r1180068 - in /aries/trunk: proxy/proxy-api/ proxy/proxy-bundle/
proxy/proxy-impl/ proxy/proxy-itests/
proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/
proxy/proxy-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/in...
Author: timothyjward
Date: Fri Oct 7 15:11:30 2011
New Revision: 1180068
URL: http://svn.apache.org/viewvc?rev=1180068&view=rev
Log:
ARIES-754: Update util and proxy package versions ready for release
Added:
aries/trunk/proxy/proxy-itests/src/test/resources/META-INF/platform-equinox/definition-3.7.0.V20110613.xml
Removed:
aries/trunk/proxy/proxy-itests/src/test/resources/META-INF/platform-equinox/definition-3.7.0.V20110304.xml
Modified:
aries/trunk/proxy/proxy-api/pom.xml
aries/trunk/proxy/proxy-bundle/pom.xml
aries/trunk/proxy/proxy-impl/pom.xml
aries/trunk/proxy/proxy-itests/pom.xml
aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/WeavingProxyTest.java
aries/trunk/proxy/proxy-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/SsActivator.java
aries/trunk/proxy/proxy-itests/src/test/resources/ss-runner.properties
aries/trunk/util/src/main/java/org/apache/aries/util/manifest/packageinfo
aries/trunk/util/src/main/java/org/apache/aries/util/service/registry/packageinfo
Modified: aries/trunk/proxy/proxy-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-api/pom.xml?rev=1180068&r1=1180067&r2=1180068&view=diff
==============================================================================
--- aries/trunk/proxy/proxy-api/pom.xml (original)
+++ aries/trunk/proxy/proxy-api/pom.xml Fri Oct 7 15:11:30 2011
@@ -45,9 +45,15 @@
<!-- Export package versions are maintained in packageinfo files -->
<aries.osgi.export.pkg>
- org.apache.aries.proxy;
+ org.apache.aries.proxy
</aries.osgi.export.pkg>
+ <!--
+ We use the range macro to get a 0.x to 0.x+1 version range while Aries is still
+ stabilizing API. This should be removed once the dependency is available at a
+ version greater than or equal to 1.0.0
+ -->
<aries.osgi.import.pkg>
+ org.apache.aries.*;version="$<range;[==,=+)>",
*
</aries.osgi.import.pkg>
<aries.osgi.private.pkg>
Modified: aries/trunk/proxy/proxy-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-bundle/pom.xml?rev=1180068&r1=1180067&r2=1180068&view=diff
==============================================================================
--- aries/trunk/proxy/proxy-bundle/pom.xml (original)
+++ aries/trunk/proxy/proxy-bundle/pom.xml Fri Oct 7 15:11:30 2011
@@ -51,11 +51,11 @@
org.apache.aries.proxy.weaving;
</aries.osgi.export.pkg>
<aries.osgi.import.pkg>
- org.objectweb.asm*;version=3.2;resolution:=optional,
- org.eclipse.*;resolution:=optional,
+ org.apache.aries.*;version="$<range;[==,=+)>",
+ org.objectweb.asm*;resolution:=optional,
org.osgi.framework;version="[1.5,2)",
- org.osgi.framework.hooks.weaving;version="[1.0,1.1)";resolution:=optional,
- org.osgi.framework.wiring;version="[1.0,2)";resolution:=optional,
+ org.osgi.framework.hooks.weaving;resolution:=optional,
+ org.osgi.framework.wiring;resolution:=optional,
*
</aries.osgi.import.pkg>
<aries.osgi.private.pkg>
@@ -77,6 +77,12 @@
<version>0.4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.3.0</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: aries/trunk/proxy/proxy-impl/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-impl/pom.xml?rev=1180068&r1=1180067&r2=1180068&view=diff
==============================================================================
--- aries/trunk/proxy/proxy-impl/pom.xml (original)
+++ aries/trunk/proxy/proxy-impl/pom.xml Fri Oct 7 15:11:30 2011
@@ -48,11 +48,19 @@
<aries.osgi.activator>
org.apache.aries.proxy.impl.ProxyManagerActivator
</aries.osgi.activator>
+ <!--
+ We override the import versions for org.osgi.framework because we can operate on
+ a 4.2 framework (we only need 4.3 for weaving which is optional).
+ We use the range macro to get a 0.x to 0.x+1 version range while Aries is still
+ stabilizing API. This should be removed once the dependency is available at a
+ version greater than or equal to 1.0.0
+ -->
<aries.osgi.import.pkg>
- org.objectweb.asm*;version=3.2;resolution:=optional,
+ org.apache.aries.*;version="$<range;[==,=+)>",
+ org.objectweb.asm*;resolution:=optional,
org.osgi.framework;version="[1.5,2)",
- org.osgi.framework.hooks.weaving;version="[1.0,1.1)";resolution:=optional,
- org.osgi.framework.wiring;version="[1.0,2)";resolution:=optional,
+ org.osgi.framework.hooks.weaving;resolution:=optional,
+ org.osgi.framework.wiring;resolution:=optional,
*
</aries.osgi.import.pkg>
<aries.osgi.private.pkg>
@@ -93,7 +101,7 @@
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
- <version>0.3.1-SNAPSHOT</version>
+ <version>0.4-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: aries/trunk/proxy/proxy-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-itests/pom.xml?rev=1180068&r1=1180067&r2=1180068&view=diff
==============================================================================
--- aries/trunk/proxy/proxy-itests/pom.xml (original)
+++ aries/trunk/proxy/proxy-itests/pom.xml Fri Oct 7 15:11:30 2011
@@ -57,6 +57,12 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
+ <version>3.7.0.v20110613</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy</artifactId>
<scope>test</scope>
Modified: aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/WeavingProxyTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/WeavingProxyTest.java?rev=1180068&r1=1180067&r2=1180068&view=diff
==============================================================================
--- aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/WeavingProxyTest.java (original)
+++ aries/trunk/proxy/proxy-itests/src/test/java/org/apache/aries/proxy/itests/WeavingProxyTest.java Fri Oct 7 15:11:30 2011
@@ -102,7 +102,7 @@ public class WeavingProxyTest extends Ab
// org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
PaxRunnerOptions.rawPaxRunnerOption("config", "classpath:ss-runner.properties"),
- equinox().version("3.7.0.v20110304")
+ equinox().version("3.7.0.v20110613")
);
}
}
\ No newline at end of file
Modified: aries/trunk/proxy/proxy-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/SsActivator.java
URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/SsActivator.java?rev=1180068&r1=1180067&r2=1180068&view=diff
==============================================================================
--- aries/trunk/proxy/proxy-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/SsActivator.java (original)
+++ aries/trunk/proxy/proxy-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/SsActivator.java Fri Oct 7 15:11:30 2011
@@ -42,7 +42,7 @@ public class SsActivator extends Abstrac
new EquinoxPlatformBuilder( bundleContext, "3.5.0" ),
new EquinoxPlatformBuilder( bundleContext, "3.5.1" ),
new EquinoxPlatformBuilder( bundleContext, "3.6.0" ),
- new EquinoxPlatformBuilder( bundleContext, "3.7.0.V20110304" ),
+ new EquinoxPlatformBuilder( bundleContext, "3.7.0.V20110613" ),
new EquinoxPlatformBuilderSnapshot( bundleContext )
};
}
Added: aries/trunk/proxy/proxy-itests/src/test/resources/META-INF/platform-equinox/definition-3.7.0.V20110613.xml
URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-itests/src/test/resources/META-INF/platform-equinox/definition-3.7.0.V20110613.xml?rev=1180068&view=auto
==============================================================================
--- aries/trunk/proxy/proxy-itests/src/test/resources/META-INF/platform-equinox/definition-3.7.0.V20110613.xml (added)
+++ aries/trunk/proxy/proxy-itests/src/test/resources/META-INF/platform-equinox/definition-3.7.0.V20110613.xml Fri Oct 7 15:11:30 2011
@@ -0,0 +1,8 @@
+<platform>
+
+ <name>Equinox 3.7.0</name>
+ <system>mvn:org.eclipse.tycho/org.eclipse.osgi/3.7.0.v20110613</system>
+
+ <profile name="minimal" default="true"/>
+
+</platform>
Modified: aries/trunk/proxy/proxy-itests/src/test/resources/ss-runner.properties
URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-itests/src/test/resources/ss-runner.properties?rev=1180068&r1=1180067&r2=1180068&view=diff
==============================================================================
--- aries/trunk/proxy/proxy-itests/src/test/resources/ss-runner.properties (original)
+++ aries/trunk/proxy/proxy-itests/src/test/resources/ss-runner.properties Fri Oct 7 15:11:30 2011
@@ -64,7 +64,7 @@ platform.equinox.3.5.1=org.ops4j.pax.run
platform.equinox.3.6.0=org.ops4j.pax.runner.platform.equinox.internal.SsActivator
platform.equinox.SNAPSHOT=org.ops4j.pax.runner.platform.equinox.internal.SsActivator
platform.equinox.V43PROTOTYPE-3.6.0.201003231329=org.ops4j.pax.runner.platform.equinox.internal.SsActivator
-platform.equinox.3.7.0.V20110304=org.ops4j.pax.runner.platform.equinox.internal.SsActivator
+platform.equinox.3.7.0.V20110613=org.ops4j.pax.runner.platform.equinox.internal.SsActivator
# Felix
platform.felix.1.0.0=org.ops4j.pax.runner.platform.felix.internal.Activator
platform.felix.1.0.1=org.ops4j.pax.runner.platform.felix.internal.Activator
Modified: aries/trunk/util/src/main/java/org/apache/aries/util/manifest/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/manifest/packageinfo?rev=1180068&r1=1180067&r2=1180068&view=diff
==============================================================================
--- aries/trunk/util/src/main/java/org/apache/aries/util/manifest/packageinfo (original)
+++ aries/trunk/util/src/main/java/org/apache/aries/util/manifest/packageinfo Fri Oct 7 15:11:30 2011
@@ -16,4 +16,4 @@
# specific language governing permissions and limitations
# under the License.
#
-version 0.2
+version 0.1
Modified: aries/trunk/util/src/main/java/org/apache/aries/util/service/registry/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/service/registry/packageinfo?rev=1180068&r1=1180067&r2=1180068&view=diff
==============================================================================
--- aries/trunk/util/src/main/java/org/apache/aries/util/service/registry/packageinfo (original)
+++ aries/trunk/util/src/main/java/org/apache/aries/util/service/registry/packageinfo Fri Oct 7 15:11:30 2011
@@ -16,4 +16,4 @@
# specific language governing permissions and limitations
# under the License.
#
-version 0.3.1
+version 0.1.0