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-commons-html.git
commit fdf8411ae2e4e5f29efcba81d7ee15b580696dcd Author: Oliver Lietz <[email protected]> AuthorDate: Wed Mar 28 21:17:46 2018 +0200 SLING-7556 Use bnd Maven plugins --- bnd.bnd | 22 ++++++++++++++++++ pom.xml | 27 +++++++++------------- .../apache/sling/commons/html/package-info.java | 22 ++++++++++++++++++ 3 files changed, 55 insertions(+), 16 deletions(-) diff --git a/bnd.bnd b/bnd.bnd new file mode 100644 index 0000000..bf6c02a --- /dev/null +++ b/bnd.bnd @@ -0,0 +1,22 @@ +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: * + +-exportcontents: ${packages;VERSIONED} + +-includeresource:\ + @tagsoup-*.jar!/org/ccil/cowan/tagsoup/* + +-removeheaders:\ + Embed-Dependency,\ + Embed-Transitive,\ + Include-Resource,\ + Private-Package diff --git a/pom.xml b/pom.xml index 5547b69..9a49e19 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,6 @@ <artifactId>org.apache.sling.commons.html</artifactId> <version>1.0.1-SNAPSHOT</version> - <packaging>bundle</packaging> <name>Apache Sling Commons HTML Utilities</name> <description> @@ -45,21 +44,12 @@ <build> <plugins> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Export-Package> - org.apache.sling.commons.html;version=1.0.0 - </Export-Package> - <Private-Package> - org.apache.sling.commons.html.impl, - org.ccil.cowan.tagsoup, - org.ccil.cowan.tagsoup.jaxp - </Private-Package> - </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> </plugins> </build> @@ -81,6 +71,11 @@ <!-- OSGi --> <dependency> <groupId>org.osgi</groupId> + <artifactId>org.osgi.annotation.versioning</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> <artifactId>org.osgi.service.component.annotations</artifactId> <scope>provided</scope> </dependency> diff --git a/src/main/java/org/apache/sling/commons/html/package-info.java b/src/main/java/org/apache/sling/commons/html/package-info.java new file mode 100644 index 0000000..fcbd24c --- /dev/null +++ b/src/main/java/org/apache/sling/commons/html/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.commons.html; + +import org.osgi.annotation.versioning.Version; -- To stop receiving notification emails like this one, please contact [email protected].
