You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2018/01/20 21:12:15 UTC
[sling-org-apache-sling-karaf-launchpad-oak-tar-integration-tests]
branch master updated (9b77912 -> 76c8d97)
This is an automated email from the ASF dual-hosted git repository.
olli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-launchpad-oak-tar-integration-tests.git.
from 9b77912 SLING-7253 Upgrade Karaf to 4.2
new 3f8a82b SLING-7353 Update to Sling Parent 33
new 76c8d97 SLING-7401 Use bnd Maven plugins
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.
Summary of changes:
bnd.bnd | 17 +++++++++++++++++
pom.xml | 31 ++++++++++---------------------
2 files changed, 27 insertions(+), 21 deletions(-)
create mode 100644 bnd.bnd
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].
[sling-org-apache-sling-karaf-launchpad-oak-tar-integration-tests]
02/02: SLING-7401 Use bnd Maven plugins
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-launchpad-oak-tar-integration-tests.git
commit 76c8d974c4da4516f2abbb7139aae584ca0248b4
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Jan 18 15:18:58 2018 +0100
SLING-7401 Use bnd Maven plugins
---
bnd.bnd | 17 +++++++++++++++++
pom.xml | 22 +++++++++-------------
2 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
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 56768b8..25f2589 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,6 @@
<artifactId>org.apache.sling.karaf-launchpad-oak-tar-integration-tests</artifactId>
<version>0.0.1-SNAPSHOT</version>
- <packaging>bundle</packaging>
<name>Apache Sling - Karaf Launchpad Integration Tests (Oak Tar)</name>
<description>Launchpad Integration Tests for Apache Sling with Oak Tar on Karaf</description>
@@ -201,23 +200,20 @@
<artifactId>exam-maven-plugin</artifactId>
<version>${org.ops4j.pax.exam.version}</version>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>3.0.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.servicemix.tooling</groupId>
- <artifactId>depends-maven-plugin</artifactId>
- </plugin>
</plugins>
</pluginManagement>
<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>
+ -->
</plugins>
</build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-karaf-launchpad-oak-tar-integration-tests]
01/02: SLING-7353 Update to Sling Parent 33
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-launchpad-oak-tar-integration-tests.git
commit 3f8a82b2c18f280dc49bf16803bdd2f47710f8a4
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Jan 18 15:17:24 2018 +0100
SLING-7353 Update to Sling Parent 33
---
pom.xml | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1f84ef1..56768b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>32</version>
+ <version>33</version>
<relativePath/>
</parent>
@@ -250,13 +250,6 @@
<plugin>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>depends-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>generate-depends-file</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.