You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2019/06/07 12:13:45 UTC
[sling-org-apache-sling-feature] branch master updated: SLING-8475
: Feature packages are exported as 0.2.0
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature.git
The following commit(s) were added to refs/heads/master by this push:
new 36b5ebc SLING-8475 : Feature packages are exported as 0.2.0
36b5ebc is described below
commit 36b5ebc2d6fdf302963f79b4a3c5ab2465f8a710
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Jun 7 14:13:36 2019 +0200
SLING-8475 : Feature packages are exported as 0.2.0
---
pom.xml | 3 ---
src/main/java/org/apache/sling/feature/builder/ArtifactProvider.java | 2 ++
src/main/java/org/apache/sling/feature/builder/HandlerContext.java | 3 +++
src/main/java/org/apache/sling/feature/builder/package-info.java | 2 +-
src/main/java/org/apache/sling/feature/package-info.java | 2 +-
5 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6269761..51d4a5d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,9 +53,6 @@
org.apache.felix.utils.*,
</Conditional-Package>
</instructions>
-
- <!-- Skip baselining for 0.x version -->
- <skip>true</skip>
</configuration>
</plugin>
<plugin>
diff --git a/src/main/java/org/apache/sling/feature/builder/ArtifactProvider.java b/src/main/java/org/apache/sling/feature/builder/ArtifactProvider.java
index c7b0b65..82c62c4 100644
--- a/src/main/java/org/apache/sling/feature/builder/ArtifactProvider.java
+++ b/src/main/java/org/apache/sling/feature/builder/ArtifactProvider.java
@@ -19,10 +19,12 @@ package org.apache.sling.feature.builder;
import java.io.File;
import org.apache.sling.feature.ArtifactId;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* The artifact provider provides a file for an artifact.
*/
+@ConsumerType
public interface ArtifactProvider {
/**
diff --git a/src/main/java/org/apache/sling/feature/builder/HandlerContext.java b/src/main/java/org/apache/sling/feature/builder/HandlerContext.java
index 0fd9f2c..5a1b4aa 100644
--- a/src/main/java/org/apache/sling/feature/builder/HandlerContext.java
+++ b/src/main/java/org/apache/sling/feature/builder/HandlerContext.java
@@ -19,9 +19,12 @@ package org.apache.sling.feature.builder;
import java.util.Map;
+import org.osgi.annotation.versioning.ProviderType;
+
/**
* Context for an extension handler.
*/
+@ProviderType
public interface HandlerContext {
/**
* Provide the artifact provider.
diff --git a/src/main/java/org/apache/sling/feature/builder/package-info.java b/src/main/java/org/apache/sling/feature/builder/package-info.java
index 394a14d..4ecbe60 100644
--- a/src/main/java/org/apache/sling/feature/builder/package-info.java
+++ b/src/main/java/org/apache/sling/feature/builder/package-info.java
@@ -17,7 +17,7 @@
* under the License.
*/
-@org.osgi.annotation.versioning.Version("0.2.0")
+@org.osgi.annotation.versioning.Version("1.0.0")
package org.apache.sling.feature.builder;
diff --git a/src/main/java/org/apache/sling/feature/package-info.java b/src/main/java/org/apache/sling/feature/package-info.java
index 8201ca5..0ec26d7 100644
--- a/src/main/java/org/apache/sling/feature/package-info.java
+++ b/src/main/java/org/apache/sling/feature/package-info.java
@@ -17,7 +17,7 @@
* under the License.
*/
-@org.osgi.annotation.versioning.Version("0.2.0")
+@org.osgi.annotation.versioning.Version("1.0.0")
package org.apache.sling.feature;