This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.scripting.sightly.compiler-1.0.10 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-compiler.git
commit 8848cb05f56a0003601356b812cb748cb171f2a6 Author: Radu Cotescu <[email protected]> AuthorDate: Mon Oct 10 15:39:09 2016 +0000 SLING-6125 - Switch HTL to OSGi R6 annotations * removed maven-scr-plugin and configured maven-bundle-plugin to generate SCR metadata * replaced Felix SCR annotations with OSGi Component + Metatype annotations * removed unused dependencies git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/compiler@1764122 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 39 ++++++++-------------- .../sightly/compiler/SightlyCompiler.java | 8 ++--- .../scripting/sightly/compiler/package-info.java | 2 +- 3 files changed, 18 insertions(+), 31 deletions(-) diff --git a/pom.xml b/pom.xml index 5cd7da3..0957201 100644 --- a/pom.xml +++ b/pom.xml @@ -60,26 +60,24 @@ <plugins> <plugin> <groupId>org.apache.felix</groupId> - <artifactId>maven-scr-plugin</artifactId> - <dependencies> - <dependency> - <groupId>javax.jcr</groupId> - <artifactId>jcr</artifactId> - <version>2.0</version> - </dependency> - </dependencies> - </plugin> - <plugin> - <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> <extensions>true</extensions> + <executions> + <execution> + <id>scr-metadata</id> + <goals> + <goal>manifest</goal> + </goals> + </execution> + </executions> <configuration> + <exportScr>true</exportScr> <instructions> <Embed-Dependency>antlr4-runtime,org.abego.treelayout.core</Embed-Dependency> <Provide-Capability> - io.sightly; version:Version=1.0, - io.sightly; version:Version=1.1, - io.sightly; version:Version=1.2 + io.sightly.compiler; version:Version=1.0, + io.sightly.compiler; version:Version=1.1, + io.sightly.compiler; version:Version=1.2 </Provide-Capability> </instructions> </configuration> @@ -192,22 +190,11 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>1.9.5</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.powermock</groupId> - <artifactId>powermock-api-mockito</artifactId> + <artifactId>powermock-reflect</artifactId> <version>1.5.5</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <scope>test</scope> - </dependency> </dependencies> </project> diff --git a/src/main/java/org/apache/sling/scripting/sightly/compiler/SightlyCompiler.java b/src/main/java/org/apache/sling/scripting/sightly/compiler/SightlyCompiler.java index 508d93b..4bab4b2 100644 --- a/src/main/java/org/apache/sling/scripting/sightly/compiler/SightlyCompiler.java +++ b/src/main/java/org/apache/sling/scripting/sightly/compiler/SightlyCompiler.java @@ -25,8 +25,6 @@ import java.util.List; import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; -import org.apache.felix.scr.annotations.Component; -import org.apache.felix.scr.annotations.Service; import org.apache.sling.scripting.sightly.compiler.backend.BackendCompiler; import org.apache.sling.scripting.sightly.compiler.commands.CommandStream; import org.apache.sling.scripting.sightly.impl.compiler.CompilationResultImpl; @@ -61,6 +59,7 @@ import org.apache.sling.scripting.sightly.impl.plugin.TestPlugin; import org.apache.sling.scripting.sightly.impl.plugin.TextPlugin; import org.apache.sling.scripting.sightly.impl.plugin.UnwrapPlugin; import org.apache.sling.scripting.sightly.impl.plugin.UsePlugin; +import org.osgi.service.component.annotations.Component; /** * <p> @@ -69,8 +68,9 @@ import org.apache.sling.scripting.sightly.impl.plugin.UsePlugin; * transpiling the commands to a JVM supported language or by directly executing them. * </p> */ -@Component -@Service(SightlyCompiler.class) +@Component( + service = SightlyCompiler.class +) public final class SightlyCompiler { private StreamTransformer optimizer; diff --git a/src/main/java/org/apache/sling/scripting/sightly/compiler/package-info.java b/src/main/java/org/apache/sling/scripting/sightly/compiler/package-info.java index 83443cc..6ffe873 100644 --- a/src/main/java/org/apache/sling/scripting/sightly/compiler/package-info.java +++ b/src/main/java/org/apache/sling/scripting/sightly/compiler/package-info.java @@ -21,7 +21,7 @@ * The {@code org.apache.sling.scripting.sightly.compiler} package defines the API exposed by the * {@link org.apache.sling.scripting.sightly.compiler.SightlyCompiler}. */ -@Version("1.0.0") +@Version("1.0.1") package org.apache.sling.scripting.sightly.compiler; import org.osgi.annotation.versioning.Version; -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
