This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-repoinit-parser.git
commit aae3c8929c3b49ec6d4ef0b562799637685a541c Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Tue Nov 8 16:06:00 2016 +0000 Update to parent pom 29 git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1768718 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 7 ++----- src/main/java/org/apache/sling/repoinit/parser/RepoInitParser.java | 2 ++ .../apache/sling/repoinit/parser/impl/RepoInitParserService.java | 6 ++---- .../org/apache/sling/repoinit/parser/operations/package-info.java | 3 +-- src/main/java/org/apache/sling/repoinit/parser/package-info.java | 3 +-- 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index 585efac..a536b71 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.sling</groupId> <artifactId>sling</artifactId> - <version>26</version> + <version>29</version> <relativePath /> </parent> @@ -43,10 +43,6 @@ <plugins> <plugin> <groupId>org.apache.felix</groupId> - <artifactId>maven-scr-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> <extensions>true</extensions> </plugin> @@ -87,6 +83,7 @@ <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> <version>2.4</version> + <scope>test</scope> </dependency> </dependencies> </project> diff --git a/src/main/java/org/apache/sling/repoinit/parser/RepoInitParser.java b/src/main/java/org/apache/sling/repoinit/parser/RepoInitParser.java index a975931..f6db001 100644 --- a/src/main/java/org/apache/sling/repoinit/parser/RepoInitParser.java +++ b/src/main/java/org/apache/sling/repoinit/parser/RepoInitParser.java @@ -22,10 +22,12 @@ import java.io.Reader; import java.util.List; import org.apache.sling.repoinit.parser.operations.Operation; +import org.osgi.annotation.versioning.ProviderType; /** * repoinit parser service interface */ +@ProviderType public interface RepoInitParser { /** diff --git a/src/main/java/org/apache/sling/repoinit/parser/impl/RepoInitParserService.java b/src/main/java/org/apache/sling/repoinit/parser/impl/RepoInitParserService.java index d599f55..cc76420 100644 --- a/src/main/java/org/apache/sling/repoinit/parser/impl/RepoInitParserService.java +++ b/src/main/java/org/apache/sling/repoinit/parser/impl/RepoInitParserService.java @@ -22,15 +22,13 @@ import java.io.IOException; import java.io.Reader; import java.util.List; -import org.apache.felix.scr.annotations.Component; -import org.apache.felix.scr.annotations.Service; import org.apache.sling.repoinit.parser.RepoInitParser; import org.apache.sling.repoinit.parser.RepoInitParsingException; import org.apache.sling.repoinit.parser.operations.Operation; +import org.osgi.service.component.annotations.Component; /** ACL definitions parser service */ -@Component -@Service(value=RepoInitParser.class) +@Component(service=RepoInitParser.class) public class RepoInitParserService implements RepoInitParser { @Override diff --git a/src/main/java/org/apache/sling/repoinit/parser/operations/package-info.java b/src/main/java/org/apache/sling/repoinit/parser/operations/package-info.java index 832de55..f7d3600 100644 --- a/src/main/java/org/apache/sling/repoinit/parser/operations/package-info.java +++ b/src/main/java/org/apache/sling/repoinit/parser/operations/package-info.java @@ -15,7 +15,6 @@ * limitations under the License. ******************************************************************************/ -@Version("3.0.0") +@org.osgi.annotation.versioning.Version("3.0.0") package org.apache.sling.repoinit.parser.operations; -import aQute.bnd.annotation.Version; diff --git a/src/main/java/org/apache/sling/repoinit/parser/package-info.java b/src/main/java/org/apache/sling/repoinit/parser/package-info.java index 3c9ed48..06ef5f6 100644 --- a/src/main/java/org/apache/sling/repoinit/parser/package-info.java +++ b/src/main/java/org/apache/sling/repoinit/parser/package-info.java @@ -15,7 +15,6 @@ * limitations under the License. ******************************************************************************/ -@Version("1.0.0") +@org.osgi.annotation.versioning.Version("1.0.2") package org.apache.sling.repoinit.parser; -import aQute.bnd.annotation.Version; -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.