[sling-org-apache-sling-repoinit-parser] branch master updated: SLING-8723 - Upgrade to parent pom 35

[rombert]

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


The following commit(s) were added to refs/heads/master by this push:
     new 89a6416  SLING-8723 - Upgrade to parent pom 35
89a6416 is described below

commit 89a641618f7784cd28164ccfda3c693b87a7d3a1
Author: Robert Munteanu <romb...@apache.org>
AuthorDate: Fri Sep 20 11:23:22 2019 +0200

    SLING-8723 - Upgrade to parent pom 35
---
 pom.xml | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index e981ff4..56eef38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,13 +22,12 @@
 
   <parent>
     <groupId>org.apache.sling</groupId>
-    <artifactId>sling</artifactId>
-    <version>30</version>
+    <artifactId>sling-bundle-parent</artifactId>
+    <version>35</version>
     <relativePath />
   </parent>
 
   <artifactId>org.apache.sling.repoinit.parser</artifactId>
-  <packaging>bundle</packaging>
   <version>1.2.7-SNAPSHOT</version>
   <name>Apache Sling RepoInit Parser</name>
   <description>Parser for the Repository Initialization language used in 
Sling</description>
@@ -43,9 +42,12 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
+        <groupId>biz.aQute.bnd</groupId>
+        <artifactId>bnd-baseline-maven-plugin</artifactId>
+        <configuration>
+          <!--  Disabled since it requires bumping the minor component of the 
development version, which is against our versioning practices -->
+          <skip>true</skip>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.rat</groupId>
@@ -89,6 +91,14 @@
             <groupId>org.osgi</groupId>
             <artifactId>osgi.core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.annotation.versioning</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.component.annotations</artifactId>
+        </dependency>
       <!-- testing -->
         <dependency>
             <groupId>junit</groupId>