SLING-8827 - api: Upgrade to parent pom 35
* increased micro versions, since baseline takes into account the JDK
version with which the previous release was built; migrating to parent
35 changes the value of the sling.java.version property from 7 to 8
diff --git a/pom.xml b/pom.xml
index 4082dd4..637d6fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,14 +22,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>32</version>
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>35</version>
<relativePath />
</parent>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.20.1-SNAPSHOT</version>
- <packaging>bundle</packaging>
+ <version>2.21.0-SNAPSHOT</version>
<name>Apache Sling API</name>
<description>
@@ -61,6 +60,12 @@
<artifactId>javax.servlet-api</artifactId>
</dependency>
+ <!-- OSGi -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation.versioning</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -69,7 +74,7 @@
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>16.0.2</version>
- <scope>provided</scope>
+ <scope>compile</scope>
</dependency>
<!-- Testing -->
<dependency>
@@ -116,20 +121,6 @@
<build>
<plugins>
- <!-- Create the bundle of the Sling API -->
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-DocURL>
- http://sling.apache.org/site/sling-api.html
- </Bundle-DocURL>
- <!-- Include utility classes from Jackrabbit JCR Commons -->
- </instructions>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
diff --git a/src/main/java/org/apache/sling/api/adapter/package-info.java b/src/main/java/org/apache/sling/api/adapter/package-info.java
index d737b8c..37f9449 100644
--- a/src/main/java/org/apache/sling/api/adapter/package-info.java
+++ b/src/main/java/org/apache/sling/api/adapter/package-info.java
@@ -17,7 +17,7 @@
* under the License.
*/
-@Version("2.2.3")
+@Version("2.2.4")
package org.apache.sling.api.adapter;
import org.osgi.annotation.versioning.Version;
diff --git a/src/main/java/org/apache/sling/api/auth/package-info.java b/src/main/java/org/apache/sling/api/auth/package-info.java
index 6a3d9da..31227e5 100644
--- a/src/main/java/org/apache/sling/api/auth/package-info.java
+++ b/src/main/java/org/apache/sling/api/auth/package-info.java
@@ -17,7 +17,7 @@
* under the License.
*/
-@Version("1.0.3")
+@Version("1.0.4")
package org.apache.sling.api.auth;
import org.osgi.annotation.versioning.Version;
diff --git a/src/main/java/org/apache/sling/api/package-info.java b/src/main/java/org/apache/sling/api/package-info.java
index ad81af1..84521c4 100644
--- a/src/main/java/org/apache/sling/api/package-info.java
+++ b/src/main/java/org/apache/sling/api/package-info.java
@@ -17,7 +17,7 @@
* under the License.
*/
-@Version("2.3.3")
+@Version("2.3.4")
package org.apache.sling.api;
import org.osgi.annotation.versioning.Version;
diff --git a/src/main/java/org/apache/sling/api/request/package-info.java b/src/main/java/org/apache/sling/api/request/package-info.java
index 640fdd7..ec45d56 100644
--- a/src/main/java/org/apache/sling/api/request/package-info.java
+++ b/src/main/java/org/apache/sling/api/request/package-info.java
@@ -17,7 +17,7 @@
* under the License.
*/
-@Version("2.4.3")
+@Version("2.4.4")
package org.apache.sling.api.request;
import org.osgi.annotation.versioning.Version;
diff --git a/src/main/java/org/apache/sling/api/resource/external/package-info.java b/src/main/java/org/apache/sling/api/resource/external/package-info.java
index 7853694..d22faa3 100644
--- a/src/main/java/org/apache/sling/api/resource/external/package-info.java
+++ b/src/main/java/org/apache/sling/api/resource/external/package-info.java
@@ -17,7 +17,7 @@
* under the License.
*/
-@Version("1.0.0")
+@Version("1.0.1")
package org.apache.sling.api.resource.external;
import org.osgi.annotation.versioning.Version;
diff --git a/src/main/java/org/apache/sling/api/resource/mapping/package-info.java b/src/main/java/org/apache/sling/api/resource/mapping/package-info.java
index b3f937d..e871225 100644
--- a/src/main/java/org/apache/sling/api/resource/mapping/package-info.java
+++ b/src/main/java/org/apache/sling/api/resource/mapping/package-info.java
@@ -17,7 +17,7 @@
* under the License.
*/
-@Version("1.0.0")
+@Version("1.0.1")
package org.apache.sling.api.resource.mapping;
import org.osgi.annotation.versioning.Version;
diff --git a/src/main/java/org/apache/sling/api/resource/observation/package-info.java b/src/main/java/org/apache/sling/api/resource/observation/package-info.java
index 4eb0cdb..31f2d93 100644
--- a/src/main/java/org/apache/sling/api/resource/observation/package-info.java
+++ b/src/main/java/org/apache/sling/api/resource/observation/package-info.java
@@ -17,7 +17,7 @@
* under the License.
*/
-@Version("1.2.1")
+@Version("1.2.2")
package org.apache.sling.api.resource.observation;
import org.osgi.annotation.versioning.Version;
diff --git a/src/main/java/org/apache/sling/api/resource/package-info.java b/src/main/java/org/apache/sling/api/resource/package-info.java
index a607e45..8c5083b 100644
--- a/src/main/java/org/apache/sling/api/resource/package-info.java
+++ b/src/main/java/org/apache/sling/api/resource/package-info.java
@@ -17,7 +17,7 @@
* under the License.
*/
-@Version("2.12.0")
+@Version("2.12.1")
package org.apache.sling.api.resource;
import org.osgi.annotation.versioning.Version;
diff --git a/src/main/java/org/apache/sling/api/resource/path/package-info.java b/src/main/java/org/apache/sling/api/resource/path/package-info.java
index 1c24194..233a022 100644
--- a/src/main/java/org/apache/sling/api/resource/path/package-info.java
+++ b/src/main/java/org/apache/sling/api/resource/path/package-info.java
@@ -17,7 +17,7 @@
* under the License.
*/
-@Version("1.2.1")
+@Version("1.2.2")
package org.apache.sling.api.resource.path;
import org.osgi.annotation.versioning.Version;
diff --git a/src/main/java/org/apache/sling/api/resource/runtime/dto/package-info.java b/src/main/java/org/apache/sling/api/resource/runtime/dto/package-info.java
index a9a5a56..4ee5c67 100644
--- a/src/main/java/org/apache/sling/api/resource/runtime/dto/package-info.java
+++ b/src/main/java/org/apache/sling/api/resource/runtime/dto/package-info.java
@@ -17,7 +17,7 @@
* under the License.
*/
-@Version("1.0.0")
+@Version("1.0.1")
package org.apache.sling.api.resource.runtime.dto;
import org.osgi.annotation.versioning.Version;
diff --git a/src/main/java/org/apache/sling/api/resource/runtime/package-info.java b/src/main/java/org/apache/sling/api/resource/runtime/package-info.java
index 1062241..ed28552 100644
--- a/src/main/java/org/apache/sling/api/resource/runtime/package-info.java
+++ b/src/main/java/org/apache/sling/api/resource/runtime/package-info.java
@@ -17,7 +17,7 @@
* under the License.
*/
-@Version("1.0.1")
+@Version("1.0.2")
package org.apache.sling.api.resource.runtime;
import org.osgi.annotation.versioning.Version;
diff --git a/src/main/java/org/apache/sling/api/scripting/package-info.java b/src/main/java/org/apache/sling/api/scripting/package-info.java
index f8aba07..8cd75db 100644
--- a/src/main/java/org/apache/sling/api/scripting/package-info.java
+++ b/src/main/java/org/apache/sling/api/scripting/package-info.java
@@ -17,7 +17,7 @@
* under the License.
*/
-@Version("2.3.2")
+@Version("2.3.3")
package org.apache.sling.api.scripting;
import org.osgi.annotation.versioning.Version;
diff --git a/src/main/java/org/apache/sling/api/security/package-info.java b/src/main/java/org/apache/sling/api/security/package-info.java
index c9ada14..c82551d 100644
--- a/src/main/java/org/apache/sling/api/security/package-info.java
+++ b/src/main/java/org/apache/sling/api/security/package-info.java
@@ -17,7 +17,7 @@
* under the License.
*/
-@Version("1.0.3")
+@Version("1.0.4")
package org.apache.sling.api.security;
import org.osgi.annotation.versioning.Version;
diff --git a/src/main/java/org/apache/sling/api/servlets/package-info.java b/src/main/java/org/apache/sling/api/servlets/package-info.java
index bb2595a..df624e8 100644
--- a/src/main/java/org/apache/sling/api/servlets/package-info.java
+++ b/src/main/java/org/apache/sling/api/servlets/package-info.java
@@ -17,7 +17,7 @@
* under the License.
*/
-@Version("2.3.0")
+@Version("2.3.1")
package org.apache.sling.api.servlets;
import org.osgi.annotation.versioning.Version;
diff --git a/src/main/java/org/apache/sling/api/wrappers/package-info.java b/src/main/java/org/apache/sling/api/wrappers/package-info.java
index 40cd261..aa18721 100644
--- a/src/main/java/org/apache/sling/api/wrappers/package-info.java
+++ b/src/main/java/org/apache/sling/api/wrappers/package-info.java
@@ -17,7 +17,7 @@
* under the License.
*/
-@Version("2.6.3")
+@Version("2.6.4")
package org.apache.sling.api.wrappers;
import org.osgi.annotation.versioning.Version;
diff --git a/src/main/java/org/apache/sling/spi/resource/provider/package-info.java b/src/main/java/org/apache/sling/spi/resource/provider/package-info.java
index 866f004..0ca533f 100644
--- a/src/main/java/org/apache/sling/spi/resource/provider/package-info.java
+++ b/src/main/java/org/apache/sling/spi/resource/provider/package-info.java
@@ -17,7 +17,7 @@
* under the License.
*/
-@Version("1.2.1")
+@Version("1.2.2")
package org.apache.sling.spi.resource.provider;
import org.osgi.annotation.versioning.Version;
