sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dul...@apache.org
Subject svn commit: r1799654 - in /sling/trunk/contrib/extensions/hapi/core: ./ src/main/java/org/apache/sling/hapi/ src/main/java/org/apache/sling/hapi/sightly/
Date Fri, 23 Jun 2017 10:39:36 GMT
Author: dulvac
Date: Fri Jun 23 10:39:36 2017
New Revision: 1799654

URL: http://svn.apache.org/viewvc?rev=1799654&view=rev
Log:
releng: revert package major increase and osgi ann cleanup

Modified:
    sling/trunk/contrib/extensions/hapi/core/pom.xml
    sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/HApiException.java
    sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/HApiProperty.java
    sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/HApiType.java
    sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/HApiTypesCollection.java
    sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/HApiUtil.java
    sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/MicrodataAttributeHelper.java
    sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/package-info.java
    sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/sightly/HApiUse.java
    sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/sightly/TypeView.java
    sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/sightly/TypesCollectionView.java
    sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/sightly/package-info.java

Modified: sling/trunk/contrib/extensions/hapi/core/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/hapi/core/pom.xml?rev=1799654&r1=1799653&r2=1799654&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/hapi/core/pom.xml (original)
+++ sling/trunk/contrib/extensions/hapi/core/pom.xml Fri Jun 23 10:39:36 2017
@@ -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>

Modified: sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/HApiException.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/HApiException.java?rev=1799654&r1=1799653&r2=1799654&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/HApiException.java
(original)
+++ sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/HApiException.java
Fri Jun 23 10:39:36 2017
@@ -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;

Modified: sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/HApiProperty.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/HApiProperty.java?rev=1799654&r1=1799653&r2=1799654&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/HApiProperty.java
(original)
+++ sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/HApiProperty.java
Fri Jun 23 10:39:36 2017
@@ -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 {
 
     /**

Modified: sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/HApiType.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/HApiType.java?rev=1799654&r1=1799653&r2=1799654&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/HApiType.java
(original)
+++ sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/HApiType.java
Fri Jun 23 10:39:36 2017
@@ -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 {
 
     /**

Modified: sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/HApiTypesCollection.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/HApiTypesCollection.java?rev=1799654&r1=1799653&r2=1799654&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/HApiTypesCollection.java
(original)
+++ sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/HApiTypesCollection.java
Fri Jun 23 10:39:36 2017
@@ -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

Modified: sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/HApiUtil.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/HApiUtil.java?rev=1799654&r1=1799653&r2=1799654&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/HApiUtil.java
(original)
+++ sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/HApiUtil.java
Fri Jun 23 10:39:36 2017
@@ -24,7 +24,9 @@ import javax.jcr.RepositoryException;
 
 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";

Modified: sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/MicrodataAttributeHelper.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/MicrodataAttributeHelper.java?rev=1799654&r1=1799653&r2=1799654&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/MicrodataAttributeHelper.java
(original)
+++ sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/MicrodataAttributeHelper.java
Fri Jun 23 10:39:36 2017
@@ -18,8 +18,11 @@
  ******************************************************************************/
 package org.apache.sling.hapi;
 
+import org.osgi.annotation.versioning.ProviderType;
+
 import java.util.Map;
 
+@ProviderType
 public interface MicrodataAttributeHelper {
 
     /**

Modified: sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/package-info.java?rev=1799654&r1=1799653&r2=1799654&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/package-info.java
(original)
+++ sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/package-info.java
Fri Jun 23 10:39:36 2017
@@ -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

Modified: sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/sightly/HApiUse.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/sightly/HApiUse.java?rev=1799654&r1=1799653&r2=1799654&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/sightly/HApiUse.java
(original)
+++ sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/sightly/HApiUse.java
Fri Jun 23 10:39:36 2017
@@ -30,6 +30,7 @@ import org.apache.sling.api.scripting.Sl
 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 @@ import org.slf4j.LoggerFactory;
  * {@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);
 

Modified: sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/sightly/TypeView.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/sightly/TypeView.java?rev=1799654&r1=1799653&r2=1799654&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/sightly/TypeView.java
(original)
+++ sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/sightly/TypeView.java
Fri Jun 23 10:39:36 2017
@@ -27,12 +27,14 @@ import org.apache.sling.hapi.HApiPropert
 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);
 

Modified: sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/sightly/TypesCollectionView.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/sightly/TypesCollectionView.java?rev=1799654&r1=1799653&r2=1799654&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/sightly/TypesCollectionView.java
(original)
+++ sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/sightly/TypesCollectionView.java
Fri Jun 23 10:39:36 2017
@@ -27,12 +27,14 @@ import org.apache.sling.hapi.HApiType;
 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);
 

Modified: sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/sightly/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/sightly/package-info.java?rev=1799654&r1=1799653&r2=1799654&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/sightly/package-info.java
(original)
+++ sling/trunk/contrib/extensions/hapi/core/src/main/java/org/apache/sling/hapi/sightly/package-info.java
Fri Jun 23 10:39:36 2017
@@ -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;



Mime
View raw message