Author: cumminsh
Date: Sat Jul 28 11:46:23 2012
New Revision: 1366650
URL: http://svn.apache.org/viewvc?rev=1366650&view=rev
Log:
[ARIES-862] Ensuring uber-bundles have correct package versions for transitive
dependencies by making them not transitive :)
Added:
aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/packageinfo
Modified:
aries/trunk/blueprint/blueprint-bundle/pom.xml
aries/trunk/jmx/jmx-blueprint-bundle/pom.xml
aries/trunk/proxy/proxy-bundle/pom.xml
Modified: aries/trunk/blueprint/blueprint-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-bundle/pom.xml?rev=1366650&r1=1366649&r2=1366650&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-bundle/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-bundle/pom.xml Sat Jul 28 11:46:23 2012
@@ -54,9 +54,6 @@
!org.osgi.service.blueprint,
org.osgi.service.blueprint.container,
org.osgi.service.blueprint.reflect,
- org.eclipse.osgi.internal.loader;resolution:=optional,
- org.eclipse.osgi.framework.internal.core;resolution:=optional,
- org.eclipse.osgi.framework.adaptor;resolution:=optional,
org.osgi.service.event*;resolution:=optional,
org.osgi.service.framework;resolution:=optional,
org.osgi.service.cm;version="[1.2,2)",
@@ -133,7 +130,7 @@
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy.api</artifactId>
<version>1.0.0</version>
- <scope>test</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
Modified: aries/trunk/jmx/jmx-blueprint-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-blueprint-bundle/pom.xml?rev=1366650&r1=1366649&r2=1366650&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-blueprint-bundle/pom.xml (original)
+++ aries/trunk/jmx/jmx-blueprint-bundle/pom.xml Sat Jul 28 11:46:23 2012
@@ -49,12 +49,6 @@
</aries.osgi.export.pkg>
<aries.osgi.import>
!org.apache.aries.jmx*,
- javax.management,
- javax.management.openmbean,
- org.osgi.framework;version="1.5.0",
- org.osgi.service.blueprint.container;version="1.0",
- org.osgi.service.blueprint.reflect;version="1.0",
- org.osgi.util.tracker;version="1.4",
*
</aries.osgi.import>
<aries.osgi.private.pkg>
@@ -74,7 +68,7 @@
<dependency>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.blueprint.core</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -86,6 +80,12 @@
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
+<!-- Include slf4j as a dependency so that the bundle plugin can pick up the
package version. -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
Added:
aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/packageinfo
URL:
http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/packageinfo?rev=1366650&view=auto
==============================================================================
---
aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/packageinfo
(added)
+++
aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/codec/packageinfo
Sat Jul 28 11:46:23 2012
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+version 1.0.0
Modified: aries/trunk/proxy/proxy-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-bundle/pom.xml?rev=1366650&r1=1366649&r2=1366650&view=diff
==============================================================================
--- aries/trunk/proxy/proxy-bundle/pom.xml (original)
+++ aries/trunk/proxy/proxy-bundle/pom.xml Sat Jul 28 11:46:23 2012
@@ -89,6 +89,11 @@
<optional>true</optional>
<version>4.0</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
