You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/10/18 23:22:56 UTC

[sling-org-apache-sling-mom] 07/10: Add svn:ignore, use OSGi version annotation, update to latest parent pom

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-mom.git

commit 023640392765b0a944e0d032f508fec3efa8f74f
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Feb 27 12:07:48 2017 +0000

    Add svn:ignore, use OSGi version annotation, update to latest parent pom
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1784537 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml                                              | 12 +-----------
 src/main/java/org/apache/sling/mom/package-info.java |  4 +---
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index fea8300..fb91806 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>26</version>
+        <version>29</version>
         <relativePath />
     </parent>
 
@@ -80,16 +80,6 @@
     </reporting>
     <dependencies>
         <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.scr.annotations</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>osgi.annotation</artifactId>
-            <version>6.0.1</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>jsr305</artifactId>
             <version>2.0.1</version>
diff --git a/src/main/java/org/apache/sling/mom/package-info.java b/src/main/java/org/apache/sling/mom/package-info.java
index 60006a6..fc3a4ea 100644
--- a/src/main/java/org/apache/sling/mom/package-info.java
+++ b/src/main/java/org/apache/sling/mom/package-info.java
@@ -20,7 +20,5 @@
 /**
  */
 
-@Version("1.0.0")
+@org.osgi.annotation.versioning.Version("1.0.0")
 package org.apache.sling.mom;
-
-import aQute.bnd.annotation.Version;
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.