releng: revert package major increase and osgi ann cleanup
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1799654 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index a265359..799d6a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>28</version>
+ <version>30</version>
<relativePath />
</parent>
<artifactId>org.apache.sling.hapi</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>HApi - Sling Hypermedia API tools</name>
@@ -68,6 +68,18 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>disable-java8-doclint</id>
+ <activation>
+ <jdk>[1.8,)</jdk>
+ </activation>
+ <properties>
+ <additionalparam>-Xdoclint:none</additionalparam>
+ </properties>
+ </profile>
+ </profiles>
+
<dependencies>
<dependency>
<groupId>org.apache.sling</groupId>
diff --git a/src/main/java/org/apache/sling/hapi/HApiException.java b/src/main/java/org/apache/sling/hapi/HApiException.java
index 67cc5ec..eebff1e 100644
--- a/src/main/java/org/apache/sling/hapi/HApiException.java
+++ b/src/main/java/org/apache/sling/hapi/HApiException.java
@@ -18,9 +18,12 @@
******************************************************************************/
package org.apache.sling.hapi;
+import org.osgi.annotation.versioning.ProviderType;
+
/**
* A Hypermedia API exception
*/
+@ProviderType
public class HApiException extends RuntimeException {
private static final long serialVersionUID = 2626376214501558054L;
diff --git a/src/main/java/org/apache/sling/hapi/HApiProperty.java b/src/main/java/org/apache/sling/hapi/HApiProperty.java
index 7cbe6a2..61aad1d 100644
--- a/src/main/java/org/apache/sling/hapi/HApiProperty.java
+++ b/src/main/java/org/apache/sling/hapi/HApiProperty.java
@@ -18,9 +18,12 @@
******************************************************************************/
package org.apache.sling.hapi;
+import org.osgi.annotation.versioning.ProviderType;
+
/**
* A Hypermedia API property for a {@link HApiType}
*/
+@ProviderType
public interface HApiProperty {
/**
diff --git a/src/main/java/org/apache/sling/hapi/HApiType.java b/src/main/java/org/apache/sling/hapi/HApiType.java
index a8f647a..0851f92 100644
--- a/src/main/java/org/apache/sling/hapi/HApiType.java
+++ b/src/main/java/org/apache/sling/hapi/HApiType.java
@@ -19,12 +19,15 @@
package org.apache.sling.hapi;
+import org.osgi.annotation.versioning.ProviderType;
+
import java.util.List;
import java.util.Map;
/**
* A Hypermedia API type.
*/
+@ProviderType
public interface HApiType {
/**
diff --git a/src/main/java/org/apache/sling/hapi/HApiTypesCollection.java b/src/main/java/org/apache/sling/hapi/HApiTypesCollection.java
index c995d97..94113cf 100644
--- a/src/main/java/org/apache/sling/hapi/HApiTypesCollection.java
+++ b/src/main/java/org/apache/sling/hapi/HApiTypesCollection.java
@@ -19,8 +19,11 @@
package org.apache.sling.hapi;
+import org.osgi.annotation.versioning.ProviderType;
+
import java.util.Collection;
+@ProviderType
public interface HApiTypesCollection extends Collection<HApiType> {
/**
* The name of this type collection
diff --git a/src/main/java/org/apache/sling/hapi/HApiUtil.java b/src/main/java/org/apache/sling/hapi/HApiUtil.java
index 184cd10..83bcf63 100644
--- a/src/main/java/org/apache/sling/hapi/HApiUtil.java
+++ b/src/main/java/org/apache/sling/hapi/HApiUtil.java
@@ -24,7 +24,9 @@
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
+import org.osgi.annotation.versioning.ProviderType;
+@ProviderType
public interface HApiUtil {
String DEFAULT_RESOURCE_TYPE = "sling/hapi/components/type";
diff --git a/src/main/java/org/apache/sling/hapi/MicrodataAttributeHelper.java b/src/main/java/org/apache/sling/hapi/MicrodataAttributeHelper.java
index e3f21d3..27846b4 100644
--- a/src/main/java/org/apache/sling/hapi/MicrodataAttributeHelper.java
+++ b/src/main/java/org/apache/sling/hapi/MicrodataAttributeHelper.java
@@ -18,8 +18,11 @@
******************************************************************************/
package org.apache.sling.hapi;
+import org.osgi.annotation.versioning.ProviderType;
+
import java.util.Map;
+@ProviderType
public interface MicrodataAttributeHelper {
/**
diff --git a/src/main/java/org/apache/sling/hapi/package-info.java b/src/main/java/org/apache/sling/hapi/package-info.java
index 24616a4..03669ad 100644
--- a/src/main/java/org/apache/sling/hapi/package-info.java
+++ b/src/main/java/org/apache/sling/hapi/package-info.java
@@ -17,7 +17,5 @@
* under the License.
******************************************************************************/
-@Version("2.0.0")
-package org.apache.sling.hapi;
-
-import aQute.bnd.annotation.Version;
+@org.osgi.annotation.versioning.Version("1.1.0")
+package org.apache.sling.hapi;
\ No newline at end of file
diff --git a/src/main/java/org/apache/sling/hapi/sightly/HApiUse.java b/src/main/java/org/apache/sling/hapi/sightly/HApiUse.java
index c000143..9a9651c 100644
--- a/src/main/java/org/apache/sling/hapi/sightly/HApiUse.java
+++ b/src/main/java/org/apache/sling/hapi/sightly/HApiUse.java
@@ -30,6 +30,7 @@
import org.apache.sling.hapi.HApiUtil;
import org.apache.sling.hapi.MicrodataAttributeHelper;
import org.apache.sling.scripting.sightly.pojo.Use;
+import org.osgi.annotation.versioning.ProviderType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -39,6 +40,7 @@
* {@link HApiUtil#getTypeNode(org.apache.sling.api.resource.ResourceResolver, String)}</p>
* <p>The convenience get methods are meant to be used in the 'data-sly-attribute' in the sightly script.</p>
*/
+@ProviderType
public class HApiUse implements Use {
private static final Logger LOG = LoggerFactory.getLogger(HApiUse.class);
diff --git a/src/main/java/org/apache/sling/hapi/sightly/TypeView.java b/src/main/java/org/apache/sling/hapi/sightly/TypeView.java
index cb3650b..00aa210 100644
--- a/src/main/java/org/apache/sling/hapi/sightly/TypeView.java
+++ b/src/main/java/org/apache/sling/hapi/sightly/TypeView.java
@@ -27,12 +27,14 @@
import org.apache.sling.hapi.HApiType;
import org.apache.sling.hapi.HApiUtil;
import org.apache.sling.scripting.sightly.pojo.Use;
+import org.osgi.annotation.versioning.ProviderType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.script.Bindings;
import java.util.*;
+@ProviderType
public class TypeView implements Use {
private static final Logger LOG = LoggerFactory.getLogger(TypeView.class);
diff --git a/src/main/java/org/apache/sling/hapi/sightly/TypesCollectionView.java b/src/main/java/org/apache/sling/hapi/sightly/TypesCollectionView.java
index 3916cfc..3db88e9 100644
--- a/src/main/java/org/apache/sling/hapi/sightly/TypesCollectionView.java
+++ b/src/main/java/org/apache/sling/hapi/sightly/TypesCollectionView.java
@@ -27,12 +27,14 @@
import org.apache.sling.hapi.HApiTypesCollection;
import org.apache.sling.hapi.HApiUtil;
import org.apache.sling.scripting.sightly.pojo.Use;
+import org.osgi.annotation.versioning.ProviderType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.script.Bindings;
import java.util.Collection;
+@ProviderType
public class TypesCollectionView implements Use {
private static final Logger LOG = LoggerFactory.getLogger(TypesCollectionView.class);
diff --git a/src/main/java/org/apache/sling/hapi/sightly/package-info.java b/src/main/java/org/apache/sling/hapi/sightly/package-info.java
index 0e07165..51c9bee 100644
--- a/src/main/java/org/apache/sling/hapi/sightly/package-info.java
+++ b/src/main/java/org/apache/sling/hapi/sightly/package-info.java
@@ -17,7 +17,5 @@
* under the License.
******************************************************************************/
-@Version("1.1.0")
+@org.osgi.annotation.versioning.Version("1.1.0")
package org.apache.sling.hapi.sightly;
-
-import aQute.bnd.annotation.Version;
