You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by gn...@apache.org on 2014/06/17 13:26:04 UTC
svn commit: r1603132 - in /aries/trunk: parent/
spi-fly/spi-fly-dynamic-bundle/ spi-fly/spi-fly-static-bundle/
subsystem/subsystem-api/src/main/java/org/osgi/service/repository/
subsystem/subsystem-api/src/main/java/org/osgi/service/subsystem/ subsyste...
Author: gnodet
Date: Tue Jun 17 11:26:03 2014
New Revision: 1603132
URL: http://svn.apache.org/r1603132
Log:
[ARIES-1192] Upgrade to maven-bundle-plugin 2.4.1-SNAPSHOT
Modified:
aries/trunk/parent/pom.xml
aries/trunk/spi-fly/spi-fly-dynamic-bundle/pom.xml
aries/trunk/spi-fly/spi-fly-static-bundle/pom.xml
aries/trunk/subsystem/subsystem-api/src/main/java/org/osgi/service/repository/packageinfo
aries/trunk/subsystem/subsystem-api/src/main/java/org/osgi/service/subsystem/packageinfo
aries/trunk/subsystem/subsystem-bundle/pom.xml
Modified: aries/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/parent/pom.xml?rev=1603132&r1=1603131&r2=1603132&view=diff
==============================================================================
--- aries/trunk/parent/pom.xml (original)
+++ aries/trunk/parent/pom.xml Tue Jun 17 11:26:03 2014
@@ -553,7 +553,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.4</version>
+ <version>2.4.1-SNAPSHOT</version>
<extensions>true</extensions>
<inherited>true</inherited>
<configuration>
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=1603132&r1=1603131&r2=1603132&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-dynamic-bundle/pom.xml (original)
+++ aries/trunk/spi-fly/spi-fly-dynamic-bundle/pom.xml Tue Jun 17 11:26:03 2014
@@ -123,7 +123,7 @@
</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
+ osgi.extender;osgi.extender=osgi.serviceloader.registrar;version:Version=1.0,osgi.extender;osgi.extender=osgi.serviceloader.processor;version:Version=1.0
</Provide-Capability>
</instructions>
</configuration>
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=1603132&r1=1603131&r2=1603132&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-static-bundle/pom.xml (original)
+++ aries/trunk/spi-fly/spi-fly-static-bundle/pom.xml Tue Jun 17 11:26:03 2014
@@ -85,7 +85,7 @@
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>osgi.extender;osgi.extender=osgi.serviceloader.registrar;version:Version=1.0
</Provide-Capability>
</instructions>
</configuration>
Modified: aries/trunk/subsystem/subsystem-api/src/main/java/org/osgi/service/repository/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-api/src/main/java/org/osgi/service/repository/packageinfo?rev=1603132&r1=1603131&r2=1603132&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-api/src/main/java/org/osgi/service/repository/packageinfo (original)
+++ aries/trunk/subsystem/subsystem-api/src/main/java/org/osgi/service/repository/packageinfo Tue Jun 17 11:26:03 2014
@@ -1,14 +1,19 @@
-/*
- * Licensed 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.
+#
version 1.0
Modified: aries/trunk/subsystem/subsystem-api/src/main/java/org/osgi/service/subsystem/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-api/src/main/java/org/osgi/service/subsystem/packageinfo?rev=1603132&r1=1603131&r2=1603132&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-api/src/main/java/org/osgi/service/subsystem/packageinfo (original)
+++ aries/trunk/subsystem/subsystem-api/src/main/java/org/osgi/service/subsystem/packageinfo Tue Jun 17 11:26:03 2014
@@ -1,14 +1,19 @@
-/*
- * Licensed 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.
+#
version 1.0
Modified: aries/trunk/subsystem/subsystem-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-bundle/pom.xml?rev=1603132&r1=1603131&r2=1603132&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-bundle/pom.xml (original)
+++ aries/trunk/subsystem/subsystem-bundle/pom.xml Tue Jun 17 11:26:03 2014
@@ -66,7 +66,7 @@
<dependency>
<groupId>org.apache.aries.subsystem</groupId>
<artifactId>org.apache.aries.subsystem.api</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.subsystem</groupId>