felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pde...@apache.org
Subject svn commit: r1710494 - in /felix/trunk/tools/org.apache.felix.scr.bnd: changelog.txt pom.xml
Date Sun, 25 Oct 2015 22:31:43 GMT
Author: pderop
Date: Sun Oct 25 22:31:43 2015
New Revision: 1710494

URL: http://svn.apache.org/viewvc?rev=1710494&view=rev
Log:
[FELIX-5074] Applied the patch proposed by Konrad (thanks). Everything which is already present
in bndlib is not included anymore in the plugin.
This closes #38

Modified:
    felix/trunk/tools/org.apache.felix.scr.bnd/changelog.txt
    felix/trunk/tools/org.apache.felix.scr.bnd/pom.xml

Modified: felix/trunk/tools/org.apache.felix.scr.bnd/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/tools/org.apache.felix.scr.bnd/changelog.txt?rev=1710494&r1=1710493&r2=1710494&view=diff
==============================================================================
--- felix/trunk/tools/org.apache.felix.scr.bnd/changelog.txt (original)
+++ felix/trunk/tools/org.apache.felix.scr.bnd/changelog.txt Sun Oct 25 22:31:43 2015
@@ -1,3 +1,10 @@
+Changes from 1.5.0 to 1.4.0
+---------------------------
+** Improvement
+** Bug
+    * [FELIX-5074] - Using org.apache.felix.scr.bnd together with maven-bundle-plugin leads
to using the wrong bnd version
+
+
 Changes from 1.4.0 to 1.3.0
 ---------------------------
 ** Improvement

Modified: felix/trunk/tools/org.apache.felix.scr.bnd/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/tools/org.apache.felix.scr.bnd/pom.xml?rev=1710494&r1=1710493&r2=1710494&view=diff
==============================================================================
--- felix/trunk/tools/org.apache.felix.scr.bnd/pom.xml (original)
+++ felix/trunk/tools/org.apache.felix.scr.bnd/pom.xml Sun Oct 25 22:31:43 2015
@@ -1,39 +1,40 @@
-<!-- 
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
- 
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements. See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership. The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License. You may obtain a copy of the License at
+
     http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License. 
+
+    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">
+<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.felix</groupId>
-		<artifactId>felix-parent</artifactId>
-		<version>3</version>
-		<relativePath>../../pom/pom.xml</relativePath>
-	</parent>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>felix-parent</artifactId>
+        <version>3</version>
+        <relativePath>../../pom/pom.xml</relativePath>
+    </parent>
 
-	<groupId>org.apache.felix</groupId>
-	<artifactId>org.apache.felix.scr.bnd</artifactId>
+    <groupId>org.apache.felix</groupId>
+    <artifactId>org.apache.felix.scr.bnd</artifactId>
 
-	<version>1.4.1-SNAPSHOT</version>
-	<packaging>jar</packaging>
+    <version>1.4.1-SNAPSHOT</version>
+    <packaging>jar</packaging>
 
-	<name>Bnd SCR Plugin</name>
-	<description>
+    <name>Bnd SCR Plugin</name>
+    <description>
 		Implements a Bnd scrplugin to generate Declarative Services
 		and Metatype Service descriptors from Java 5 annotations 
 		and/or JavaDoc tags.
@@ -49,95 +50,68 @@
         <felix.java.version>6</felix.java.version>
     </properties>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.felix</groupId>
-			<artifactId>org.apache.felix.scr.generator</artifactId>
-			<version>1.13.1-SNAPSHOT</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.felix</groupId>
-			<artifactId>org.apache.felix.scr.annotations</artifactId>
-			<version>1.9.13-SNAPSHOT</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.ow2.asm</groupId>
-			<artifactId>asm-all</artifactId>
-			<version>5.0.2</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.osgi</groupId>
-			<artifactId>org.osgi.core</artifactId>
-			<version>4.3.0</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.osgi</groupId>
-			<artifactId>org.osgi.compendium</artifactId>
-			<version>4.3.0</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>biz.aQute.bnd</groupId>
-			<artifactId>bndlib</artifactId>
-			<version>2.1.0</version>
-			<scope>compile</scope>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<plugins>
-			<!-- Use a shade plugin in order to append META-INF/service SPI resources into target
artifact -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-shade-plugin</artifactId>
-				<version>2.1</version>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>shade</goal>
-						</goals>
-						<configuration>
-							<transformers>
-								<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"
/>
-							</transformers>
-							<!-- Don't include anything from bndlib -->
-							<artifactSet>
-								<excludes>
-									<exclude>biz.aQute.bnd:bndlib</exclude>
-								</excludes>
-							</artifactSet>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
-			<!-- unpack cmpdm,asm,scr generator and annotations in target artifact -->
-			<plugin>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<goals>
-							<goal>unpack-dependencies</goal>
-						</goals>
-						<configuration>
-							<includeArtifactIds>
-								org.osgi.compendium,asm-all,org.apache.felix.scr.generator,org.apache.felix.scr.annotations
-							</includeArtifactIds>
-							<outputDirectory>
-								${project.build.outputDirectory}
-							</outputDirectory>
-							<excludes>
-								**/MANIFEST.MF
-							</excludes>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.scr.generator</artifactId>
+            <version>1.13.1-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.scr.annotations</artifactId>
+            <version>1.9.13-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <!-- bndlib is provided at runtime (it neither needs to be considered by the maven-shade-plugin
nor as transitive dependency by Maven) -->
+        <dependency>
+            <groupId>biz.aQute.bnd</groupId>
+            <artifactId>bndlib</artifactId>
+            <version>2.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <!-- Use a shade plugin in order to append META-INF/service SPI resources
into target artifact -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>2.4.1</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                            </transformers>
+                            <!-- exclude provided dependencies -->
+                            <artifactSet>
+                                <excludes>
+                                    <!-- Don't include anything from bndlib (as this is
always part of the classpath) -->
+                                    <exclude>biz.aQute.bnd:bndlib</exclude>
+                                </excludes>
+                            </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>org.osgi</artifact>
+                                    <!-- exclude everything which is already included
in bndlib -->
+                                    <excludes>
+                                        <exclude>org/osgi/resource</exclude>
+                                        <exclude>org/osgi/service/component/annotations</exclude>
+                                        <exclude>org/osgi/service/metatype/annotations</exclude>
+                                        <exclude>org/osgi/service/repository</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>



Mime
View raw message