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
diff --git a/pom.xml b/pom.xml
index f18fa59..c43b694 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>26</version>
+ <version>28</version>
<relativePath />
</parent>
@@ -51,7 +51,6 @@
<properties>
<antlr.version>4.1</antlr.version>
- <sling.java.version>7</sling.java.version>
</properties>
<!-- ======================================================================= -->
@@ -204,7 +203,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -222,7 +220,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/compiler/CompilationResult.java b/src/main/java/org/apache/sling/scripting/sightly/compiler/CompilationResult.java
index dc49fee..59517fd 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/compiler/CompilationResult.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/compiler/CompilationResult.java
@@ -22,8 +22,7 @@
import org.apache.sling.scripting.sightly.compiler.commands.Command;
import org.apache.sling.scripting.sightly.compiler.commands.CommandStream;
-
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* This class encapsulates the result of a compile operation performed by the {@link SightlyCompiler}.
diff --git a/src/main/java/org/apache/sling/scripting/sightly/compiler/CompilationUnit.java b/src/main/java/org/apache/sling/scripting/sightly/compiler/CompilationUnit.java
index acef786..08f6afb 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/compiler/CompilationUnit.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/compiler/CompilationUnit.java
@@ -20,7 +20,7 @@
import java.io.Reader;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* This class describes a compilation unit that the {@link SightlyCompiler} will process during the call of the {@code compile} methods.
diff --git a/src/main/java/org/apache/sling/scripting/sightly/compiler/CompilerMessage.java b/src/main/java/org/apache/sling/scripting/sightly/compiler/CompilerMessage.java
index 31e890c..683984a 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/compiler/CompilerMessage.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/compiler/CompilerMessage.java
@@ -18,7 +18,7 @@
******************************************************************************/
package org.apache.sling.scripting.sightly.compiler;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* This class describes the messages (warnings or errors) the {@link SightlyCompiler} will produce when compiling a script.
diff --git a/src/main/java/org/apache/sling/scripting/sightly/compiler/backend/BackendCompiler.java b/src/main/java/org/apache/sling/scripting/sightly/compiler/backend/BackendCompiler.java
index 228665b..d03f2a8 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/compiler/backend/BackendCompiler.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/compiler/backend/BackendCompiler.java
@@ -24,7 +24,7 @@
import org.apache.sling.scripting.sightly.compiler.commands.CommandStream;
import org.apache.sling.scripting.sightly.compiler.commands.CommandVisitor;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* <p>
diff --git a/src/main/java/org/apache/sling/scripting/sightly/compiler/backend/package-info.java b/src/main/java/org/apache/sling/scripting/sightly/compiler/backend/package-info.java
index e444231..86b6ba0 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/compiler/backend/package-info.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/compiler/backend/package-info.java
@@ -24,4 +24,4 @@
@Version("1.0.0")
package org.apache.sling.scripting.sightly.compiler.backend;
-import aQute.bnd.annotation.Version;
+import org.osgi.annotation.versioning.Version;
diff --git a/src/main/java/org/apache/sling/scripting/sightly/compiler/commands/Command.java b/src/main/java/org/apache/sling/scripting/sightly/compiler/commands/Command.java
index d142bb8..04ac0f9 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/compiler/commands/Command.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/compiler/commands/Command.java
@@ -18,7 +18,7 @@
******************************************************************************/
package org.apache.sling.scripting.sightly.compiler.commands;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* A {@code Command} represents the type of instruction a certain HTL expression or block element should execute. Commands are immutable
diff --git a/src/main/java/org/apache/sling/scripting/sightly/compiler/commands/CommandHandler.java b/src/main/java/org/apache/sling/scripting/sightly/compiler/commands/CommandHandler.java
index 4f7114e..c76cbf3 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/compiler/commands/CommandHandler.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/compiler/commands/CommandHandler.java
@@ -18,7 +18,7 @@
******************************************************************************/
package org.apache.sling.scripting.sightly.compiler.commands;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* The {@code CommandHandler} is the mechanism through which a {@link CommandStream} can be processed synchronously, as the stream is
diff --git a/src/main/java/org/apache/sling/scripting/sightly/compiler/commands/CommandStream.java b/src/main/java/org/apache/sling/scripting/sightly/compiler/commands/CommandStream.java
index 819fcd6..c6b151a 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/compiler/commands/CommandStream.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/compiler/commands/CommandStream.java
@@ -20,7 +20,7 @@
import java.util.List;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* <p>
diff --git a/src/main/java/org/apache/sling/scripting/sightly/compiler/commands/CommandVisitor.java b/src/main/java/org/apache/sling/scripting/sightly/compiler/commands/CommandVisitor.java
index b172157..11450a3 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/compiler/commands/CommandVisitor.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/compiler/commands/CommandVisitor.java
@@ -18,7 +18,7 @@
******************************************************************************/
package org.apache.sling.scripting.sightly.compiler.commands;
-import aQute.bnd.annotation.ConsumerType;
+import org.osgi.annotation.versioning.ConsumerType;
/**
* The {@code CommandVisitor} is the mechanism through which a {@link Command} can be processed.
diff --git a/src/main/java/org/apache/sling/scripting/sightly/compiler/commands/package-info.java b/src/main/java/org/apache/sling/scripting/sightly/compiler/commands/package-info.java
index 69f8edf..dd2f081 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/compiler/commands/package-info.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/compiler/commands/package-info.java
@@ -24,4 +24,4 @@
@Version("1.0.0")
package org.apache.sling.scripting.sightly.compiler.commands;
-import aQute.bnd.annotation.Version;
+import org.osgi.annotation.versioning.Version;
diff --git a/src/main/java/org/apache/sling/scripting/sightly/compiler/expression/ExpressionNode.java b/src/main/java/org/apache/sling/scripting/sightly/compiler/expression/ExpressionNode.java
index edad0f6..a643664 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/compiler/expression/ExpressionNode.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/compiler/expression/ExpressionNode.java
@@ -18,7 +18,7 @@
******************************************************************************/
package org.apache.sling.scripting.sightly.compiler.expression;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* Defines a node in a HTL expression tree.
diff --git a/src/main/java/org/apache/sling/scripting/sightly/compiler/expression/NodeVisitor.java b/src/main/java/org/apache/sling/scripting/sightly/compiler/expression/NodeVisitor.java
index cd49a63..ad61134 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/compiler/expression/NodeVisitor.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/compiler/expression/NodeVisitor.java
@@ -31,7 +31,7 @@
import org.apache.sling.scripting.sightly.compiler.expression.nodes.TernaryOperator;
import org.apache.sling.scripting.sightly.compiler.expression.nodes.UnaryOperation;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* A {@code NodeVisitor} represents the mechanism through which {@link ExpressionNode} entities are processed.
diff --git a/src/main/java/org/apache/sling/scripting/sightly/compiler/expression/nodes/Atom.java b/src/main/java/org/apache/sling/scripting/sightly/compiler/expression/nodes/Atom.java
index 5698ec3..bb8457f 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/compiler/expression/nodes/Atom.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/compiler/expression/nodes/Atom.java
@@ -20,7 +20,7 @@
import org.apache.sling.scripting.sightly.compiler.expression.ExpressionNode;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
/**
* An {@code Atom} defines an {@link ExpressionNode} that can be translated to simple text, like identifiers or primitive constants
diff --git a/src/main/java/org/apache/sling/scripting/sightly/compiler/expression/nodes/package-info.java b/src/main/java/org/apache/sling/scripting/sightly/compiler/expression/nodes/package-info.java
index 6b47866..69398b9 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/compiler/expression/nodes/package-info.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/compiler/expression/nodes/package-info.java
@@ -22,4 +22,4 @@
@Version("1.0.0")
package org.apache.sling.scripting.sightly.compiler.expression.nodes;
-import aQute.bnd.annotation.Version;
+import org.osgi.annotation.versioning.Version;
diff --git a/src/main/java/org/apache/sling/scripting/sightly/compiler/expression/package-info.java b/src/main/java/org/apache/sling/scripting/sightly/compiler/expression/package-info.java
index ba43ace..2d09977 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/compiler/expression/package-info.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/compiler/expression/package-info.java
@@ -23,4 +23,4 @@
@Version("1.0.0")
package org.apache.sling.scripting.sightly.compiler.expression;
-import aQute.bnd.annotation.Version;
+import org.osgi.annotation.versioning.Version;
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 036fbd8..9c71040 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
@@ -24,4 +24,4 @@
@Version("1.0.0")
package org.apache.sling.scripting.sightly.compiler;
-import aQute.bnd.annotation.Version;
+import org.osgi.annotation.versioning.Version;
diff --git a/src/main/java/org/apache/sling/scripting/sightly/compiler/util/package-info.java b/src/main/java/org/apache/sling/scripting/sightly/compiler/util/package-info.java
index 51e92e9..3c6a718 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/compiler/util/package-info.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/compiler/util/package-info.java
@@ -18,4 +18,4 @@
@Version("1.0.0")
package org.apache.sling.scripting.sightly.compiler.util;
-import aQute.bnd.annotation.Version;
+import org.osgi.annotation.versioning.Version;
