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/22 20:21:04 UTC
[sling-org-apache-sling-pipes] branch issue/SLING-7426 created (now
8371fdb)
This is an automated email from the ASF dual-hosted git repository.
olli pushed a change to branch issue/SLING-7426
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-pipes.git.
at 8371fdb SLING-7426 Use bnd Maven plugins
This branch includes the following new commits:
new 8371fdb SLING-7426 Use bnd Maven plugins
The 1 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.
--
To stop receiving notification emails like this one, please contact
olli@apache.org.
[sling-org-apache-sling-pipes] 01/01: SLING-7426 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 issue/SLING-7426
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-pipes.git
commit 8371fdb6ee74a36532dbb60141d93a96fe897395
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Jan 22 21:20:58 2018 +0100
SLING-7426 Use bnd Maven plugins
---
bnd.bnd | 29 ++++++++++++++++++
pom.xml | 35 ++++++----------------
.../apache/sling/pipes/models/package-info.java | 20 +++++++++++++
3 files changed, 58 insertions(+), 26 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..dd598f8
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,29 @@
+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
+
+Import-Package:\
+ org.apache.sling.distribution;resolution:=optional,\
+ *
+
+Sling-Model-Packages:\
+ org.apache.sling.pipes.models
+
+-baseline: *
+
+-exportcontents: ${packages;VERSIONED}
+
+-includeresource:\
+ @org.apache.sling.jcr.contentparser-*.jar!/org/apache/sling/jcr/contentparser/impl/JsonTicksConverter.*
+
+-removeheaders:\
+ Embed-Dependency,\
+ Embed-Transitive,\
+ Include-Resource,\
+ Private-Package
diff --git a/pom.xml b/pom.xml
index 30384cf..8d39881 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,13 +24,12 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>33-SNAPSHOT</version>
+ <version>33</version>
<relativePath />
</parent>
<artifactId>org.apache.sling.pipes</artifactId>
- <packaging>bundle</packaging>
- <version>1.1.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<name>Apache Sling Pipes</name>
<description>bulk content changes tool</description>
@@ -49,38 +48,22 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Import-Package>
- org.apache.sling.distribution;resolution:=optional,
- *
- </Import-Package>
- <Embed-Dependency>
- org.apache.sling.jcr.contentparser;inline="org/apache/sling/jcr/contentparser/impl/JsonTicksConverter.class"
- </Embed-Dependency>
- <Export-Package>!org.apache.sling.pipes.internal.*, org.apache.sling.pipes.*</Export-Package>
- <Sling-Model-Packages>
- org.apache.sling.pipes.models
- </Sling-Model-Packages>
- </instructions>
- </configuration>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ </plugin>
+ <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>
- <!-- see SLING-7351, switch to bnd-maven-plugin and remove configuration -->
- <configuration>
- <outputFile>${project.build.directory}/test-classes/META-INF/maven/dependencies.properties</outputFile>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
- <excludes>
+ <excludes combine.children="append">
<!-- test csv files can't have licenses embedded -->
<exclude>src/test/resources/**/*.csv</exclude>
</excludes>
diff --git a/src/main/java/org/apache/sling/pipes/models/package-info.java b/src/main/java/org/apache/sling/pipes/models/package-info.java
new file mode 100644
index 0000000..eeb911d
--- /dev/null
+++ b/src/main/java/org/apache/sling/pipes/models/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * 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.pipes.models;
+
+import org.osgi.annotation.versioning.Version;
--
To stop receiving notification emails like this one, please contact
olli@apache.org.