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:11:56 UTC
[sling-org-apache-sling-karaf-integration-tests] branch master
updated (2c53e18 -> 468fdf4)
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-integration-tests.git.
from 2c53e18 SLING-7253 Upgrade Karaf to 4.2
new 2bf517f SLING-7353 Update to Sling Parent 33
new 468fdf4 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 | 27 ++++++++++++----------
.../apache/sling/karaf/testing/package-info.java | 22 ++++++++++++++++++
3 files changed, 54 insertions(+), 12 deletions(-)
create mode 100644 bnd.bnd
create mode 100644 src/main/java/org/apache/sling/karaf/testing/package-info.java
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].
[sling-org-apache-sling-karaf-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-integration-tests.git
commit 2bf517f53282c4f10a16f9e36a2174b02f07e3e1
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Jan 18 15:15:39 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 0145d72..5d8faaa 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>
</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-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-integration-tests.git
commit 468fdf41b08d1f1ac64d25b9daf13a9e0f913131
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Jan 18 15:18:41 2018 +0100
SLING-7401 Use bnd Maven plugins
---
bnd.bnd | 17 +++++++++++++++++
pom.xml | 18 ++++++++++++++----
.../apache/sling/karaf/testing/package-info.java | 22 ++++++++++++++++++++++
3 files changed, 53 insertions(+), 4 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 5d8faaa..ae7b9cd 100644
--- 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>
@@ -61,6 +60,11 @@
<!-- 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>
@@ -243,10 +247,16 @@
<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
index 0000000..90d339f
--- /dev/null
+++ b/src/main/java/org/apache/sling/karaf/testing/package-info.java
@@ -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;
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.