SLING-7401 Use bnd Maven plugins
authorOliver Lietz <olli@apache.org>
Thu, 18 Jan 2018 14:18:41 +0000 (15:18 +0100)
committerOliver Lietz <olli@apache.org>
Thu, 18 Jan 2018 14:18:41 +0000 (15:18 +0100)
bnd.bnd [new file with mode: 0644]
pom.xml
src/main/java/org/apache/sling/karaf/testing/package-info.java [new file with mode: 0644]

diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644 (file)
index 0000000..c20ac21
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,17 @@
+Bundle-Category: sling
+
+Bundle-Description: ${project.description}
+
+Bundle-DocURL: https://sling.apache.org
+
+Bundle-License: Apache License, Version 2.0
+
+Bundle-Vendor: The Apache Software Foundation
+
+-baseline: *
+
+-removeheaders:\
+  Embed-Dependency,\
+  Embed-Transitive,\
+  Include-Resource,\
+  Private-Package
diff --git a/pom.xml b/pom.xml
index 5d8faaa..ae7b9cd 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,6 @@
 
   <artifactId>org.apache.sling.karaf-integration-tests</artifactId>
   <version>0.1.1-SNAPSHOT</version>
-  <packaging>bundle</packaging>
 
   <name>Apache Sling - Karaf Integration Tests</name>
   <description>Integration Tests for Apache Sling Karaf</description>
     <!-- OSGi -->
     <dependency>
       <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.annotation.versioning</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
       <artifactId>osgi.core</artifactId>
       <scope>provided</scope>
     </dependency>
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
+        <groupId>biz.aQute.bnd</groupId>
+        <artifactId>bnd-maven-plugin</artifactId>
+      </plugin>
+      <!-- enable baseline after initial release -->
+      <!--
+      <plugin>
+        <groupId>biz.aQute.bnd</groupId>
+        <artifactId>bnd-baseline-maven-plugin</artifactId>
       </plugin>
+      -->
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>depends-maven-plugin</artifactId>
diff --git a/src/main/java/org/apache/sling/karaf/testing/package-info.java b/src/main/java/org/apache/sling/karaf/testing/package-info.java
new file mode 100644 (file)
index 0000000..90d339f
--- /dev/null
@@ -0,0 +1,22 @@
+/*
+ * 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")
+package org.apache.sling.karaf.testing;
+
+import org.osgi.annotation.versioning.Version;