You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by je...@apache.org on 2019/01/10 16:06:24 UTC

[sling-org-apache-sling-commons-html] branch BND-TEST created (now ad49ccb)

This is an automated email from the ASF dual-hosted git repository.

jeb pushed a change to branch BND-TEST
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-html.git.


      at ad49ccb  updating to bnd 4.1.0 per kwin suggestion

This branch includes the following new commits:

     new c1efa19  modifications to support bnd
     new ad49ccb  updating to bnd 4.1.0 per kwin suggestion

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[sling-org-apache-sling-commons-html] 02/02: updating to bnd 4.1.0 per kwin suggestion

Posted by je...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jeb pushed a commit to branch BND-TEST
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-html.git

commit ad49ccb5cc97424bc328772243742d17578a957a
Author: JE Bailey <ja...@sas.com>
AuthorDate: Thu Jan 10 11:05:34 2019 -0500

    updating to bnd 4.1.0 per kwin suggestion
---
 pom.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 16dfc05..8b8932a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>33</version>
+        <version>34</version>
         <relativePath />
     </parent>
 
@@ -54,10 +54,12 @@
             <plugin>
                 <groupId>biz.aQute.bnd</groupId>
                 <artifactId>bnd-maven-plugin</artifactId>
+                <version>4.1.0</version>
             </plugin>
             <plugin>
                 <groupId>biz.aQute.bnd</groupId>
                 <artifactId>bnd-baseline-maven-plugin</artifactId>
+                <version>4.1.0</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>


[sling-org-apache-sling-commons-html] 01/02: modifications to support bnd

Posted by je...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jeb pushed a commit to branch BND-TEST
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-html.git

commit c1efa19514dc9c1636debafc92cb820b584d7506
Author: JE Bailey <ja...@sas.com>
AuthorDate: Thu Jan 10 10:43:41 2019 -0500

    modifications to support bnd
---
 bnd.bnd | 18 ++++++++++++++++++
 pom.xml | 26 ++++++--------------------
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..ff0b752
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,18 @@
+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
+
+-exportcontents: ${packages;VERSIONED}
+
+-includeresource:\
+  @tagsoup-*.jar!/org/ccil/cowan/tagsoup/*
+
+-removeheaders:\
+  Include-Resource,\
+  Private-Package
diff --git a/pom.xml b/pom.xml
index 0a27aef..16dfc05 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,27 +46,18 @@
         <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-html.git</connection>
         <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-html.git</developerConnection>
         <url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-commons-html.git</url>
-        <tag>HEAD</tag>
-    </scm>
+      <tag>HEAD</tag>
+  </scm>
 
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.sling</groupId>
-                <artifactId>maven-sling-plugin</artifactId>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-maven-plugin</artifactId>
             </plugin>
             <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <!-- Embed tagsoup -->
-                        <Embed-Dependency>
-                            *;scope=compile;inline=true
-                        </Embed-Dependency>
-                    </instructions>
-                </configuration>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-baseline-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -92,9 +83,6 @@
             <plugin>
                 <groupId>org.apache.servicemix.tooling</groupId>
                 <artifactId>depends-maven-plugin</artifactId>
-                <configuration>
-                    <outputFile>${project.build.directory}/test-classes/META-INF/maven/dependencies.properties</outputFile>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
@@ -228,6 +216,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <packaging>bundle</packaging>
 </project>