This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-compiler-java.git
commit 495fb6d09cc9296c0e7336ea3b9e73c3fc9eb609 Author: Radu Cotescu <[email protected]> AuthorDate: Fri Sep 2 16:03:35 2016 +0000 SLING-6033 - Update Sightly bundles to parent pom 28 * switched from BND to OSGi annotations git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1758984 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 4 +--- src/main/java/org/apache/sling/scripting/sightly/Record.java | 2 +- .../apache/sling/scripting/sightly/extension/RuntimeExtension.java | 2 +- .../org/apache/sling/scripting/sightly/extension/package-info.java | 4 ++-- .../org/apache/sling/scripting/sightly/java/compiler/ClassInfo.java | 2 +- .../sling/scripting/sightly/java/compiler/CompilationOutput.java | 2 +- .../apache/sling/scripting/sightly/java/compiler/package-info.java | 2 +- src/main/java/org/apache/sling/scripting/sightly/package-info.java | 4 ++-- src/main/java/org/apache/sling/scripting/sightly/pojo/Use.java | 2 +- .../java/org/apache/sling/scripting/sightly/pojo/package-info.java | 4 ++-- .../java/org/apache/sling/scripting/sightly/render/RenderContext.java | 2 +- .../org/apache/sling/scripting/sightly/render/RuntimeObjectModel.java | 2 +- .../java/org/apache/sling/scripting/sightly/render/package-info.java | 2 +- src/main/java/org/apache/sling/scripting/sightly/use/UseProvider.java | 2 +- .../java/org/apache/sling/scripting/sightly/use/package-info.java | 4 ++-- 15 files changed, 19 insertions(+), 21 deletions(-) diff --git a/pom.xml b/pom.xml index 3d58d8c..e2a0ba2 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.sling</groupId> <artifactId>sling</artifactId> - <version>26</version> + <version>28</version> <relativePath /> </parent> @@ -163,7 +163,6 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.11</version> <scope>test</scope> </dependency> <dependency> @@ -181,7 +180,6 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> - <version>1.5.2</version> <scope>test</scope> </dependency> </dependencies> diff --git a/src/main/java/org/apache/sling/scripting/sightly/Record.java b/src/main/java/org/apache/sling/scripting/sightly/Record.java index ead00db..5c8be4a 100644 --- a/src/main/java/org/apache/sling/scripting/sightly/Record.java +++ b/src/main/java/org/apache/sling/scripting/sightly/Record.java @@ -21,7 +21,7 @@ package org.apache.sling.scripting.sightly; import java.util.Set; -import aQute.bnd.annotation.ConsumerType; +import org.osgi.annotation.versioning.ConsumerType; /** * A {@code Record} is a key-value immutable object understood by the HTL runtime, used for abstracting complex objects like Sightly diff --git a/src/main/java/org/apache/sling/scripting/sightly/extension/RuntimeExtension.java b/src/main/java/org/apache/sling/scripting/sightly/extension/RuntimeExtension.java index 186495b..e7b8afd 100644 --- a/src/main/java/org/apache/sling/scripting/sightly/extension/RuntimeExtension.java +++ b/src/main/java/org/apache/sling/scripting/sightly/extension/RuntimeExtension.java @@ -20,7 +20,7 @@ package org.apache.sling.scripting.sightly.extension; import org.apache.sling.scripting.sightly.render.RenderContext; -import aQute.bnd.annotation.ConsumerType; +import org.osgi.annotation.versioning.ConsumerType; /** * A {@code RuntimeExtension} represents a HTL runtime construct that provides some processing capabilities for the various diff --git a/src/main/java/org/apache/sling/scripting/sightly/extension/package-info.java b/src/main/java/org/apache/sling/scripting/sightly/extension/package-info.java index c1a6d5f..0bec18c 100644 --- a/src/main/java/org/apache/sling/scripting/sightly/extension/package-info.java +++ b/src/main/java/org/apache/sling/scripting/sightly/extension/package-info.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -@Version("1.0.0") +@Version("1.0.1") package org.apache.sling.scripting.sightly.extension; -import aQute.bnd.annotation.Version; +import org.osgi.annotation.versioning.Version; diff --git a/src/main/java/org/apache/sling/scripting/sightly/java/compiler/ClassInfo.java b/src/main/java/org/apache/sling/scripting/sightly/java/compiler/ClassInfo.java index 8a16d4e..3bd16b7 100644 --- a/src/main/java/org/apache/sling/scripting/sightly/java/compiler/ClassInfo.java +++ b/src/main/java/org/apache/sling/scripting/sightly/java/compiler/ClassInfo.java @@ -17,7 +17,7 @@ package org.apache.sling.scripting.sightly.java.compiler; -import aQute.bnd.annotation.ProviderType; +import org.osgi.annotation.versioning.ProviderType; /** * This interface provides information about classes that will be generated by the {@link JavaClassBackendCompiler}. diff --git a/src/main/java/org/apache/sling/scripting/sightly/java/compiler/CompilationOutput.java b/src/main/java/org/apache/sling/scripting/sightly/java/compiler/CompilationOutput.java index b5b0b12..f177eb2 100644 --- a/src/main/java/org/apache/sling/scripting/sightly/java/compiler/CompilationOutput.java +++ b/src/main/java/org/apache/sling/scripting/sightly/java/compiler/CompilationOutput.java @@ -18,7 +18,7 @@ package org.apache.sling.scripting.sightly.java.compiler; import java.util.Map; -import aQute.bnd.annotation.ProviderType; +import org.osgi.annotation.versioning.ProviderType; /** * The {@code CompilationOutput} encapsulates the result of a compile operation as processed by the {@link JavaClassBackendCompiler}. diff --git a/src/main/java/org/apache/sling/scripting/sightly/java/compiler/package-info.java b/src/main/java/org/apache/sling/scripting/sightly/java/compiler/package-info.java index dc548d9..8179757 100644 --- a/src/main/java/org/apache/sling/scripting/sightly/java/compiler/package-info.java +++ b/src/main/java/org/apache/sling/scripting/sightly/java/compiler/package-info.java @@ -17,4 +17,4 @@ @Version("1.0.0") package org.apache.sling.scripting.sightly.java.compiler; -import aQute.bnd.annotation.Version; +import org.osgi.annotation.versioning.Version; diff --git a/src/main/java/org/apache/sling/scripting/sightly/package-info.java b/src/main/java/org/apache/sling/scripting/sightly/package-info.java index dacd4c5..96dca47 100644 --- a/src/main/java/org/apache/sling/scripting/sightly/package-info.java +++ b/src/main/java/org/apache/sling/scripting/sightly/package-info.java @@ -15,7 +15,7 @@ * limitations under the License. ******************************************************************************/ -@Version("1.0.0") +@Version("1.0.1") package org.apache.sling.scripting.sightly; -import aQute.bnd.annotation.Version; +import org.osgi.annotation.versioning.Version; diff --git a/src/main/java/org/apache/sling/scripting/sightly/pojo/Use.java b/src/main/java/org/apache/sling/scripting/sightly/pojo/Use.java index d4ec318..6765569 100644 --- a/src/main/java/org/apache/sling/scripting/sightly/pojo/Use.java +++ b/src/main/java/org/apache/sling/scripting/sightly/pojo/Use.java @@ -20,7 +20,7 @@ package org.apache.sling.scripting.sightly.pojo; import javax.script.Bindings; -import aQute.bnd.annotation.ConsumerType; +import org.osgi.annotation.versioning.ConsumerType; /** * The <code>Use</code> interface can be implemented by Java objects which are instantiated as part of processing {@code data-sly-use} diff --git a/src/main/java/org/apache/sling/scripting/sightly/pojo/package-info.java b/src/main/java/org/apache/sling/scripting/sightly/pojo/package-info.java index f795d12..746ab8f 100644 --- a/src/main/java/org/apache/sling/scripting/sightly/pojo/package-info.java +++ b/src/main/java/org/apache/sling/scripting/sightly/pojo/package-info.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -@Version("1.0.0") +@Version("1.0.1") package org.apache.sling.scripting.sightly.pojo; -import aQute.bnd.annotation.Version; +import org.osgi.annotation.versioning.Version; diff --git a/src/main/java/org/apache/sling/scripting/sightly/render/RenderContext.java b/src/main/java/org/apache/sling/scripting/sightly/render/RenderContext.java index d0a4390..c48895c 100644 --- a/src/main/java/org/apache/sling/scripting/sightly/render/RenderContext.java +++ b/src/main/java/org/apache/sling/scripting/sightly/render/RenderContext.java @@ -20,7 +20,7 @@ import javax.script.Bindings; import org.apache.sling.scripting.sightly.extension.RuntimeExtension; -import aQute.bnd.annotation.ProviderType; +import org.osgi.annotation.versioning.ProviderType; /** * The {@code RenderContext} defines the context for executing HTL scripts. diff --git a/src/main/java/org/apache/sling/scripting/sightly/render/RuntimeObjectModel.java b/src/main/java/org/apache/sling/scripting/sightly/render/RuntimeObjectModel.java index 2945402..7d3076f 100644 --- a/src/main/java/org/apache/sling/scripting/sightly/render/RuntimeObjectModel.java +++ b/src/main/java/org/apache/sling/scripting/sightly/render/RuntimeObjectModel.java @@ -19,7 +19,7 @@ package org.apache.sling.scripting.sightly.render; import java.util.Collection; import java.util.Map; -import aQute.bnd.annotation.ProviderType; +import org.osgi.annotation.versioning.ProviderType; /** * The {@code RuntimeObjectModel} provides various utility object inspection & conversion methods that can be applied to runtime diff --git a/src/main/java/org/apache/sling/scripting/sightly/render/package-info.java b/src/main/java/org/apache/sling/scripting/sightly/render/package-info.java index 85ac73d..1e71397 100644 --- a/src/main/java/org/apache/sling/scripting/sightly/render/package-info.java +++ b/src/main/java/org/apache/sling/scripting/sightly/render/package-info.java @@ -17,4 +17,4 @@ @Version("2.0.0") package org.apache.sling.scripting.sightly.render; -import aQute.bnd.annotation.Version; +import org.osgi.annotation.versioning.Version; diff --git a/src/main/java/org/apache/sling/scripting/sightly/use/UseProvider.java b/src/main/java/org/apache/sling/scripting/sightly/use/UseProvider.java index 9c7b2b6..14a78ba 100644 --- a/src/main/java/org/apache/sling/scripting/sightly/use/UseProvider.java +++ b/src/main/java/org/apache/sling/scripting/sightly/use/UseProvider.java @@ -23,7 +23,7 @@ import javax.script.Bindings; import org.apache.sling.scripting.sightly.render.RenderContext; -import aQute.bnd.annotation.ConsumerType; +import org.osgi.annotation.versioning.ConsumerType; /** * <p> diff --git a/src/main/java/org/apache/sling/scripting/sightly/use/package-info.java b/src/main/java/org/apache/sling/scripting/sightly/use/package-info.java index 2564bea..0dfe431 100644 --- a/src/main/java/org/apache/sling/scripting/sightly/use/package-info.java +++ b/src/main/java/org/apache/sling/scripting/sightly/use/package-info.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -@Version("1.0.0") +@Version("1.0.1") package org.apache.sling.scripting.sightly.use; -import aQute.bnd.annotation.Version; +import org.osgi.annotation.versioning.Version; -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
