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:17:34 UTC
[sling-org-apache-sling-feature-io] branch master updated:
SLING-8476 : Packages are exported with 0.x
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-io.git
The following commit(s) were added to refs/heads/master by this push:
new 09522b7 SLING-8476 : Packages are exported with 0.x
09522b7 is described below
commit 09522b736f788f2e7bbc9c6f9a36935be034d221
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Jun 7 14:17:25 2019 +0200
SLING-8476 : Packages are exported with 0.x
---
pom.xml | 2 --
src/main/java/org/apache/sling/feature/io/file/package-info.java | 2 +-
.../java/org/apache/sling/feature/io/file/spi/ArtifactProvider.java | 3 +++
.../org/apache/sling/feature/io/file/spi/ArtifactProviderContext.java | 3 +++
src/main/java/org/apache/sling/feature/io/file/spi/package-info.java | 2 +-
src/main/java/org/apache/sling/feature/io/json/package-info.java | 2 +-
src/main/java/org/apache/sling/feature/io/package-info.java | 2 +-
7 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 05b9890..c1c4d7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,8 +56,6 @@
org.apache.felix.utils.version
</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/io/file/package-info.java b/src/main/java/org/apache/sling/feature/io/file/package-info.java
index e8ae306..83cd885 100644
--- a/src/main/java/org/apache/sling/feature/io/file/package-info.java
+++ b/src/main/java/org/apache/sling/feature/io/file/package-info.java
@@ -17,7 +17,7 @@
* under the License.
*/
-@org.osgi.annotation.versioning.Version("0.1.0")
+@org.osgi.annotation.versioning.Version("1.0.0")
package org.apache.sling.feature.io.file;
diff --git a/src/main/java/org/apache/sling/feature/io/file/spi/ArtifactProvider.java b/src/main/java/org/apache/sling/feature/io/file/spi/ArtifactProvider.java
index 75ccd85..c238946 100644
--- a/src/main/java/org/apache/sling/feature/io/file/spi/ArtifactProvider.java
+++ b/src/main/java/org/apache/sling/feature/io/file/spi/ArtifactProvider.java
@@ -19,10 +19,13 @@ package org.apache.sling.feature.io.file.spi;
import java.io.File;
import java.io.IOException;
+import org.osgi.annotation.versioning.ConsumerType;
+
/**
* The artifact provider is an extension point for providing artifacts
* from different sources, like for example s3.
*/
+@ConsumerType
public interface ArtifactProvider {
/**
diff --git a/src/main/java/org/apache/sling/feature/io/file/spi/ArtifactProviderContext.java b/src/main/java/org/apache/sling/feature/io/file/spi/ArtifactProviderContext.java
index f3d67bb..02a9722 100644
--- a/src/main/java/org/apache/sling/feature/io/file/spi/ArtifactProviderContext.java
+++ b/src/main/java/org/apache/sling/feature/io/file/spi/ArtifactProviderContext.java
@@ -18,9 +18,12 @@ package org.apache.sling.feature.io.file.spi;
import java.io.File;
+import org.osgi.annotation.versioning.ProviderType;
+
/**
* This is the context for the artifact providers
*/
+@ProviderType
public interface ArtifactProviderContext {
/**
diff --git a/src/main/java/org/apache/sling/feature/io/file/spi/package-info.java b/src/main/java/org/apache/sling/feature/io/file/spi/package-info.java
index 1faab70..eef08c6 100644
--- a/src/main/java/org/apache/sling/feature/io/file/spi/package-info.java
+++ b/src/main/java/org/apache/sling/feature/io/file/spi/package-info.java
@@ -17,7 +17,7 @@
* under the License.
*/
-@org.osgi.annotation.versioning.Version("0.1.0")
+@org.osgi.annotation.versioning.Version("1.0.0")
package org.apache.sling.feature.io.file.spi;
diff --git a/src/main/java/org/apache/sling/feature/io/json/package-info.java b/src/main/java/org/apache/sling/feature/io/json/package-info.java
index c15d8cd..6b84931 100644
--- a/src/main/java/org/apache/sling/feature/io/json/package-info.java
+++ b/src/main/java/org/apache/sling/feature/io/json/package-info.java
@@ -17,7 +17,7 @@
* under the License.
*/
-@org.osgi.annotation.versioning.Version("0.1.0")
+@org.osgi.annotation.versioning.Version("1.0.0")
package org.apache.sling.feature.io.json;
diff --git a/src/main/java/org/apache/sling/feature/io/package-info.java b/src/main/java/org/apache/sling/feature/io/package-info.java
index 7121c2c..25e2f46 100644
--- a/src/main/java/org/apache/sling/feature/io/package-info.java
+++ b/src/main/java/org/apache/sling/feature/io/package-info.java
@@ -17,7 +17,7 @@
* under the License.
*/
-@org.osgi.annotation.versioning.Version("0.1.0")
+@org.osgi.annotation.versioning.Version("1.0.0")
package org.apache.sling.feature.io;