This is an automated email from the ASF dual-hosted git repository.
bdelacretaz pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-repoinit-parser.git
The following commit(s) were added to refs/heads/master by this push:
new 9818774 SLING-1013 - fix provider/consumer types
9818774 is described below
commit 98187745c0d519d3e07d611e8307f52af5f31788
Author: Bertrand Delacretaz <[email protected]>
AuthorDate: Fri Feb 12 15:22:22 2021 +0100
SLING-1013 - fix provider/consumer types
---
pom.xml | 8 ++++++++
.../sling/repoinit/parser/{helpers => impl}/WithPathOptions.java | 2 +-
.../org/apache/sling/repoinit/parser/operations/AclGroupBase.java | 5 ++++-
.../java/org/apache/sling/repoinit/parser/operations/AclLine.java | 3 +++
.../apache/sling/repoinit/parser/operations/AddGroupMembers.java | 3 +++
.../org/apache/sling/repoinit/parser/operations/CreateGroup.java | 4 +++-
.../org/apache/sling/repoinit/parser/operations/CreatePath.java | 3 +++
.../sling/repoinit/parser/operations/CreateServiceUser.java | 4 +++-
.../org/apache/sling/repoinit/parser/operations/CreateUser.java | 4 +++-
.../org/apache/sling/repoinit/parser/operations/DeleteGroup.java | 3 +++
.../sling/repoinit/parser/operations/DeleteServiceUser.java | 3 +++
.../org/apache/sling/repoinit/parser/operations/DeleteUser.java | 3 +++
.../sling/repoinit/parser/operations/DisableServiceUser.java | 3 +++
.../sling/repoinit/parser/operations/LinePrefixCleaner.java | 3 +++
.../org/apache/sling/repoinit/parser/operations/Operation.java | 3 +++
.../apache/sling/repoinit/parser/operations/OperationVisitor.java | 4 ++--
.../repoinit/parser/operations/OperationWithPathOptions.java | 4 +++-
.../sling/repoinit/parser/operations/PathSegmentDefinition.java | 3 +++
.../org/apache/sling/repoinit/parser/operations/PropertyLine.java | 2 ++
.../sling/repoinit/parser/operations/RegisterNamespace.java | 3 +++
.../sling/repoinit/parser/operations/RegisterNodetypes.java | 3 +++
.../sling/repoinit/parser/operations/RegisterPrivilege.java | 3 +++
.../sling/repoinit/parser/operations/RemoveGroupMembers.java | 3 +++
.../sling/repoinit/parser/operations/RestrictionClause.java | 3 +++
.../sling/repoinit/parser/operations/ServiceUserOperation.java | 4 +++-
.../org/apache/sling/repoinit/parser/operations/SetAclPaths.java | 3 +++
.../sling/repoinit/parser/operations/SetAclPrincipalBased.java | 3 +++
.../apache/sling/repoinit/parser/operations/SetAclPrincipals.java | 3 +++
.../apache/sling/repoinit/parser/operations/SetProperties.java | 3 +++
.../org/apache/sling/repoinit/parser/operations/package-info.java | 4 +++-
src/main/javacc/RepoInitGrammar.jjt | 2 +-
31 files changed, 93 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index 782b963..627646a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,6 +79,14 @@
</excludePackageNames>
</configuration>
</plugin>
+ <plugin>
+ <!-- TODO remove this after release 1.6.6 (SLING-10139) -->
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-baseline-maven-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
diff --git
a/src/main/java/org/apache/sling/repoinit/parser/helpers/WithPathOptions.java
b/src/main/java/org/apache/sling/repoinit/parser/impl/WithPathOptions.java
similarity index 95%
rename from
src/main/java/org/apache/sling/repoinit/parser/helpers/WithPathOptions.java
rename to
src/main/java/org/apache/sling/repoinit/parser/impl/WithPathOptions.java
index 22bc33e..f9688e1 100644
---
a/src/main/java/org/apache/sling/repoinit/parser/helpers/WithPathOptions.java
+++ b/src/main/java/org/apache/sling/repoinit/parser/impl/WithPathOptions.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.sling.repoinit.parser.helpers;
+package org.apache.sling.repoinit.parser.impl;
public class WithPathOptions {
public final String path;
diff --git
a/src/main/java/org/apache/sling/repoinit/parser/operations/AclGroupBase.java
b/src/main/java/org/apache/sling/repoinit/parser/operations/AclGroupBase.java
index 1cc7f97..9bc5861 100644
---
a/src/main/java/org/apache/sling/repoinit/parser/operations/AclGroupBase.java
+++
b/src/main/java/org/apache/sling/repoinit/parser/operations/AclGroupBase.java
@@ -22,8 +22,11 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
+import org.osgi.annotation.versioning.ProviderType;
+
/** Base class for operations that group AclLines */
- abstract class AclGroupBase extends Operation {
+@ProviderType
+abstract class AclGroupBase extends Operation {
/**
* Supported ACL options
*/
diff --git
a/src/main/java/org/apache/sling/repoinit/parser/operations/AclLine.java
b/src/main/java/org/apache/sling/repoinit/parser/operations/AclLine.java
index 73d434e..5c6f81d 100644
--- a/src/main/java/org/apache/sling/repoinit/parser/operations/AclLine.java
+++ b/src/main/java/org/apache/sling/repoinit/parser/operations/AclLine.java
@@ -22,7 +22,10 @@ import java.util.List;
import java.util.Map;
import java.util.TreeMap;
+import org.osgi.annotation.versioning.ProviderType;
+
/** A single "set ACL" line */
+@ProviderType
public class AclLine {
private final Action action;
diff --git
a/src/main/java/org/apache/sling/repoinit/parser/operations/AddGroupMembers.java
b/src/main/java/org/apache/sling/repoinit/parser/operations/AddGroupMembers.java
index 58fe8f3..89aa5ac 100644
---
a/src/main/java/org/apache/sling/repoinit/parser/operations/AddGroupMembers.java
+++
b/src/main/java/org/apache/sling/repoinit/parser/operations/AddGroupMembers.java
@@ -19,6 +19,9 @@ package org.apache.sling.repoinit.parser.operations;
import java.util.List;
+import org.osgi.annotation.versioning.ProviderType;
+
+@ProviderType
public class AddGroupMembers extends Operation {
private final String groupname;
private final List<String> members;
diff --git
a/src/main/java/org/apache/sling/repoinit/parser/operations/CreateGroup.java
b/src/main/java/org/apache/sling/repoinit/parser/operations/CreateGroup.java
index 1bcfb9d..34a594b 100644
--- a/src/main/java/org/apache/sling/repoinit/parser/operations/CreateGroup.java
+++ b/src/main/java/org/apache/sling/repoinit/parser/operations/CreateGroup.java
@@ -17,8 +17,10 @@
package org.apache.sling.repoinit.parser.operations;
-import org.apache.sling.repoinit.parser.helpers.WithPathOptions;
+import org.apache.sling.repoinit.parser.impl.WithPathOptions;
+import org.osgi.annotation.versioning.ProviderType;
+@ProviderType
public class CreateGroup extends OperationWithPathOptions {
private final String groupname;
diff --git
a/src/main/java/org/apache/sling/repoinit/parser/operations/CreatePath.java
b/src/main/java/org/apache/sling/repoinit/parser/operations/CreatePath.java
index 8775a05..4b66144 100644
--- a/src/main/java/org/apache/sling/repoinit/parser/operations/CreatePath.java
+++ b/src/main/java/org/apache/sling/repoinit/parser/operations/CreatePath.java
@@ -21,6 +21,9 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.osgi.annotation.versioning.ProviderType;
+
+@ProviderType
public class CreatePath extends Operation {
private List<PathSegmentDefinition> pathDef;
private final String defaultPrimaryType;
diff --git
a/src/main/java/org/apache/sling/repoinit/parser/operations/CreateServiceUser.java
b/src/main/java/org/apache/sling/repoinit/parser/operations/CreateServiceUser.java
index e31ec6e..e6b7611 100644
---
a/src/main/java/org/apache/sling/repoinit/parser/operations/CreateServiceUser.java
+++
b/src/main/java/org/apache/sling/repoinit/parser/operations/CreateServiceUser.java
@@ -17,8 +17,10 @@
package org.apache.sling.repoinit.parser.operations;
-import org.apache.sling.repoinit.parser.helpers.WithPathOptions;
+import org.apache.sling.repoinit.parser.impl.WithPathOptions;
+import org.osgi.annotation.versioning.ProviderType;
+@ProviderType
public class CreateServiceUser extends ServiceUserOperation {
public CreateServiceUser(String username) {
diff --git
a/src/main/java/org/apache/sling/repoinit/parser/operations/CreateUser.java
b/src/main/java/org/apache/sling/repoinit/parser/operations/CreateUser.java
index 6060d30..7d18b1b 100644
--- a/src/main/java/org/apache/sling/repoinit/parser/operations/CreateUser.java
+++ b/src/main/java/org/apache/sling/repoinit/parser/operations/CreateUser.java
@@ -17,8 +17,10 @@
package org.apache.sling.repoinit.parser.operations;
-import org.apache.sling.repoinit.parser.helpers.WithPathOptions;
+import org.apache.sling.repoinit.parser.impl.WithPathOptions;
+import org.osgi.annotation.versioning.ProviderType;
+@ProviderType
public class CreateUser extends OperationWithPathOptions {
private final String username;
private final String passwordEncoding;
diff --git
a/src/main/java/org/apache/sling/repoinit/parser/operations/DeleteGroup.java
b/src/main/java/org/apache/sling/repoinit/parser/operations/DeleteGroup.java
index db0115e..0d10651 100644
--- a/src/main/java/org/apache/sling/repoinit/parser/operations/DeleteGroup.java
+++ b/src/main/java/org/apache/sling/repoinit/parser/operations/DeleteGroup.java
@@ -17,6 +17,9 @@
package org.apache.sling.repoinit.parser.operations;
+import org.osgi.annotation.versioning.ProviderType;
+
+@ProviderType
public class DeleteGroup extends Operation {
private final String groupname;
diff --git
a/src/main/java/org/apache/sling/repoinit/parser/operations/DeleteServiceUser.java
b/src/main/java/org/apache/sling/repoinit/parser/operations/DeleteServiceUser.java
index e13f938..91d0061 100644
---
a/src/main/java/org/apache/sling/repoinit/parser/operations/DeleteServiceUser.java
+++
b/src/main/java/org/apache/sling/repoinit/parser/operations/DeleteServiceUser.java
@@ -17,6 +17,9 @@
package org.apache.sling.repoinit.parser.operations;
+import org.osgi.annotation.versioning.ProviderType;
+
+@ProviderType
public class DeleteServiceUser extends ServiceUserOperation {
public DeleteServiceUser(String username) {
super(username, null);
diff --git
a/src/main/java/org/apache/sling/repoinit/parser/operations/DeleteUser.java
b/src/main/java/org/apache/sling/repoinit/parser/operations/DeleteUser.java
index 5037bac..f0934d0 100644
--- a/src/main/java/org/apache/sling/repoinit/parser/operations/DeleteUser.java
+++ b/src/main/java/org/apache/sling/repoinit/parser/operations/DeleteUser.java
@@ -17,6 +17,9 @@
package org.apache.sling.repoinit.parser.operations;
+import org.osgi.annotation.versioning.ProviderType;
+
+@ProviderType
public class DeleteUser extends Operation {
private final String username;
diff --git
a/src/main/java/org/apache/sling/repoinit/parser/operations/DisableServiceUser.java
b/src/main/java/org/apache/sling/repoinit/parser/operations/DisableServiceUser.java
index ad3bd2b..d35ea2d 100644
---
a/src/main/java/org/apache/sling/repoinit/parser/operations/DisableServiceUser.java
+++
b/src/main/java/org/apache/sling/repoinit/parser/operations/DisableServiceUser.java
@@ -17,6 +17,9 @@
package org.apache.sling.repoinit.parser.operations;
+import org.osgi.annotation.versioning.ProviderType;
+
+@ProviderType
public class DisableServiceUser extends ServiceUserOperation {
private final String reason;
diff --git
a/src/main/java/org/apache/sling/repoinit/parser/operations/LinePrefixCleaner.java
b/src/main/java/org/apache/sling/repoinit/parser/operations/LinePrefixCleaner.java
index 456e65f..9fb93f4 100644
---
a/src/main/java/org/apache/sling/repoinit/parser/operations/LinePrefixCleaner.java
+++
b/src/main/java/org/apache/sling/repoinit/parser/operations/LinePrefixCleaner.java
@@ -21,6 +21,8 @@ import java.io.BufferedReader;
import java.io.IOException;
import java.io.StringReader;
+import org.osgi.annotation.versioning.ProviderType;
+
/** Removes an prefix at the beginning of
* each line in a String.
* Used for embedding CND files in repoinit
@@ -29,6 +31,7 @@ import java.io.StringReader;
* statements like [sling:someNodetype] which
* are similar to provisioning model sections.
*/
+@ProviderType
public class LinePrefixCleaner {
public String removePrefix(String prefix, String textBlock) {
final StringBuilder result = new StringBuilder();
diff --git
a/src/main/java/org/apache/sling/repoinit/parser/operations/Operation.java
b/src/main/java/org/apache/sling/repoinit/parser/operations/Operation.java
index b2afd9b..bf6581e 100644
--- a/src/main/java/org/apache/sling/repoinit/parser/operations/Operation.java
+++ b/src/main/java/org/apache/sling/repoinit/parser/operations/Operation.java
@@ -17,6 +17,9 @@
package org.apache.sling.repoinit.parser.operations;
+import org.osgi.annotation.versioning.ProviderType;
+
+@ProviderType
public abstract class Operation {
public abstract void accept(OperationVisitor v);
public static final String DQUOTE = "\"";
diff --git
a/src/main/java/org/apache/sling/repoinit/parser/operations/OperationVisitor.java
b/src/main/java/org/apache/sling/repoinit/parser/operations/OperationVisitor.java
index d793797..7eb2006 100644
---
a/src/main/java/org/apache/sling/repoinit/parser/operations/OperationVisitor.java
+++
b/src/main/java/org/apache/sling/repoinit/parser/operations/OperationVisitor.java
@@ -17,9 +17,9 @@
package org.apache.sling.repoinit.parser.operations;
-import org.osgi.annotation.versioning.ProviderType;
+import org.osgi.annotation.versioning.ConsumerType;
-@ProviderType
+@ConsumerType
public interface OperationVisitor {
void visitCreateGroup(CreateGroup g);
void visitDeleteGroup(DeleteGroup g);
diff --git
a/src/main/java/org/apache/sling/repoinit/parser/operations/OperationWithPathOptions.java
b/src/main/java/org/apache/sling/repoinit/parser/operations/OperationWithPathOptions.java
index 80a1f0a..79c00b8 100644
---
a/src/main/java/org/apache/sling/repoinit/parser/operations/OperationWithPathOptions.java
+++
b/src/main/java/org/apache/sling/repoinit/parser/operations/OperationWithPathOptions.java
@@ -17,8 +17,10 @@
package org.apache.sling.repoinit.parser.operations;
-import org.apache.sling.repoinit.parser.helpers.WithPathOptions;
+import org.apache.sling.repoinit.parser.impl.WithPathOptions;
+import org.osgi.annotation.versioning.ProviderType;
+@ProviderType
abstract class OperationWithPathOptions extends Operation {
private final WithPathOptions wpopt;
diff --git
a/src/main/java/org/apache/sling/repoinit/parser/operations/PathSegmentDefinition.java
b/src/main/java/org/apache/sling/repoinit/parser/operations/PathSegmentDefinition.java
index c4206a5..96ce656 100644
---
a/src/main/java/org/apache/sling/repoinit/parser/operations/PathSegmentDefinition.java
+++
b/src/main/java/org/apache/sling/repoinit/parser/operations/PathSegmentDefinition.java
@@ -19,9 +19,12 @@ package org.apache.sling.repoinit.parser.operations;
import java.util.List;
+import org.osgi.annotation.versioning.ProviderType;
+
/** Defines a segment of a path to be created,
* with its name and an optional primary type and optional mixins
*/
+@ProviderType
public class PathSegmentDefinition {
private final String segment;
private final String primaryType;
diff --git
a/src/main/java/org/apache/sling/repoinit/parser/operations/PropertyLine.java
b/src/main/java/org/apache/sling/repoinit/parser/operations/PropertyLine.java
index 6bc5156..913e4c6 100644
---
a/src/main/java/org/apache/sling/repoinit/parser/operations/PropertyLine.java
+++
b/src/main/java/org/apache/sling/repoinit/parser/operations/PropertyLine.java
@@ -26,8 +26,10 @@ import javax.sound.sampled.Port;
import org.apache.jackrabbit.util.ISO8601;
import org.apache.sling.repoinit.parser.impl.ParseException;
+import org.osgi.annotation.versioning.ProviderType;
/** A single "set property" line */
+@ProviderType
public class PropertyLine {
private final String name;
diff --git
a/src/main/java/org/apache/sling/repoinit/parser/operations/RegisterNamespace.java
b/src/main/java/org/apache/sling/repoinit/parser/operations/RegisterNamespace.java
index bbdcbd5..5d8f0dc 100644
---
a/src/main/java/org/apache/sling/repoinit/parser/operations/RegisterNamespace.java
+++
b/src/main/java/org/apache/sling/repoinit/parser/operations/RegisterNamespace.java
@@ -17,6 +17,9 @@
package org.apache.sling.repoinit.parser.operations;
+import org.osgi.annotation.versioning.ProviderType;
+
+@ProviderType
public class RegisterNamespace extends Operation {
private final String prefix;
private final String uri;
diff --git
a/src/main/java/org/apache/sling/repoinit/parser/operations/RegisterNodetypes.java
b/src/main/java/org/apache/sling/repoinit/parser/operations/RegisterNodetypes.java
index 54356b5..fa43c5e 100644
---
a/src/main/java/org/apache/sling/repoinit/parser/operations/RegisterNodetypes.java
+++
b/src/main/java/org/apache/sling/repoinit/parser/operations/RegisterNodetypes.java
@@ -17,7 +17,10 @@
package org.apache.sling.repoinit.parser.operations;
+import org.osgi.annotation.versioning.ProviderType;
+
/** An embedded block of text */
+@ProviderType
public class RegisterNodetypes extends Operation {
private final String cndStatements;
diff --git
a/src/main/java/org/apache/sling/repoinit/parser/operations/RegisterPrivilege.java
b/src/main/java/org/apache/sling/repoinit/parser/operations/RegisterPrivilege.java
index 422b8fe..3b62f87 100644
---
a/src/main/java/org/apache/sling/repoinit/parser/operations/RegisterPrivilege.java
+++
b/src/main/java/org/apache/sling/repoinit/parser/operations/RegisterPrivilege.java
@@ -21,6 +21,9 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+import org.osgi.annotation.versioning.ProviderType;
+
+@ProviderType
public class RegisterPrivilege extends Operation {
private final String privilegeName;
diff --git
a/src/main/java/org/apache/sling/repoinit/parser/operations/RemoveGroupMembers.java
b/src/main/java/org/apache/sling/repoinit/parser/operations/RemoveGroupMembers.java
index 0d7d4dc..ecd28c2 100644
---
a/src/main/java/org/apache/sling/repoinit/parser/operations/RemoveGroupMembers.java
+++
b/src/main/java/org/apache/sling/repoinit/parser/operations/RemoveGroupMembers.java
@@ -19,6 +19,9 @@ package org.apache.sling.repoinit.parser.operations;
import java.util.List;
+import org.osgi.annotation.versioning.ProviderType;
+
+@ProviderType
public class RemoveGroupMembers extends Operation {
private final String groupname;
private final List<String> members;
diff --git
a/src/main/java/org/apache/sling/repoinit/parser/operations/RestrictionClause.java
b/src/main/java/org/apache/sling/repoinit/parser/operations/RestrictionClause.java
index 795c7d1..f910367 100644
---
a/src/main/java/org/apache/sling/repoinit/parser/operations/RestrictionClause.java
+++
b/src/main/java/org/apache/sling/repoinit/parser/operations/RestrictionClause.java
@@ -18,9 +18,12 @@ package org.apache.sling.repoinit.parser.operations;
import java.util.List;
+import org.osgi.annotation.versioning.ProviderType;
+
/**
* Single restriction(name,values*)
*/
+@ProviderType
public final class RestrictionClause {
private final String name;
diff --git
a/src/main/java/org/apache/sling/repoinit/parser/operations/ServiceUserOperation.java
b/src/main/java/org/apache/sling/repoinit/parser/operations/ServiceUserOperation.java
index 6275447..989905b 100644
---
a/src/main/java/org/apache/sling/repoinit/parser/operations/ServiceUserOperation.java
+++
b/src/main/java/org/apache/sling/repoinit/parser/operations/ServiceUserOperation.java
@@ -17,8 +17,10 @@
package org.apache.sling.repoinit.parser.operations;
-import org.apache.sling.repoinit.parser.helpers.WithPathOptions;
+import org.apache.sling.repoinit.parser.impl.WithPathOptions;
+import org.osgi.annotation.versioning.ProviderType;
+@ProviderType
public abstract class ServiceUserOperation extends OperationWithPathOptions {
protected final String username;
diff --git
a/src/main/java/org/apache/sling/repoinit/parser/operations/SetAclPaths.java
b/src/main/java/org/apache/sling/repoinit/parser/operations/SetAclPaths.java
index 9cb236f..4b60953 100644
--- a/src/main/java/org/apache/sling/repoinit/parser/operations/SetAclPaths.java
+++ b/src/main/java/org/apache/sling/repoinit/parser/operations/SetAclPaths.java
@@ -21,9 +21,12 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.osgi.annotation.versioning.ProviderType;
+
/** Set ACL statement that groups a set of AclLines
* that all refer to the same set of paths.
*/
+@ProviderType
public class SetAclPaths extends AclGroupBase {
private final List<String> paths;
diff --git
a/src/main/java/org/apache/sling/repoinit/parser/operations/SetAclPrincipalBased.java
b/src/main/java/org/apache/sling/repoinit/parser/operations/SetAclPrincipalBased.java
index 3d43e61..8c8b3b5 100644
---
a/src/main/java/org/apache/sling/repoinit/parser/operations/SetAclPrincipalBased.java
+++
b/src/main/java/org/apache/sling/repoinit/parser/operations/SetAclPrincipalBased.java
@@ -21,9 +21,12 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.osgi.annotation.versioning.ProviderType;
+
/** Set ACL statement that groups a set of AclLines
* that all refer to the same set of principals.
*/
+@ProviderType
public class SetAclPrincipalBased extends AclGroupBase {
private final List<String> principals;
diff --git
a/src/main/java/org/apache/sling/repoinit/parser/operations/SetAclPrincipals.java
b/src/main/java/org/apache/sling/repoinit/parser/operations/SetAclPrincipals.java
index 0281bc9..d740cc4 100644
---
a/src/main/java/org/apache/sling/repoinit/parser/operations/SetAclPrincipals.java
+++
b/src/main/java/org/apache/sling/repoinit/parser/operations/SetAclPrincipals.java
@@ -21,9 +21,12 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.osgi.annotation.versioning.ProviderType;
+
/** Set ACL statement that groups a set of AclLines
* that all refer to the same set of principals.
*/
+@ProviderType
public class SetAclPrincipals extends AclGroupBase {
private final List<String> principals;
diff --git
a/src/main/java/org/apache/sling/repoinit/parser/operations/SetProperties.java
b/src/main/java/org/apache/sling/repoinit/parser/operations/SetProperties.java
index c82e46d..f72ca11 100644
---
a/src/main/java/org/apache/sling/repoinit/parser/operations/SetProperties.java
+++
b/src/main/java/org/apache/sling/repoinit/parser/operations/SetProperties.java
@@ -20,6 +20,9 @@ package org.apache.sling.repoinit.parser.operations;
import java.util.List;
+import org.osgi.annotation.versioning.ProviderType;
+
+@ProviderType
public class SetProperties extends Operation {
private final List<String> paths;
private final List<PropertyLine> lines;
diff --git
a/src/main/java/org/apache/sling/repoinit/parser/operations/package-info.java
b/src/main/java/org/apache/sling/repoinit/parser/operations/package-info.java
index 1db1f72..1076026 100644
---
a/src/main/java/org/apache/sling/repoinit/parser/operations/package-info.java
+++
b/src/main/java/org/apache/sling/repoinit/parser/operations/package-info.java
@@ -15,6 +15,8 @@
* limitations under the License.
******************************************************************************/
[email protected]("5.0.0")
+ // DO NOT use version 5.x here, once a major change is
+ // needed skip directly to 6.x (SLING-10139)
[email protected]("4.6.2")
package org.apache.sling.repoinit.parser.operations;
diff --git a/src/main/javacc/RepoInitGrammar.jjt
b/src/main/javacc/RepoInitGrammar.jjt
index 4718111..9bb7004 100644
--- a/src/main/javacc/RepoInitGrammar.jjt
+++ b/src/main/javacc/RepoInitGrammar.jjt
@@ -22,7 +22,7 @@ import java.util.List;
import java.util.ArrayList;
import org.apache.sling.repoinit.parser.operations.*;
-import org.apache.sling.repoinit.parser.helpers.WithPathOptions;
+import org.apache.sling.repoinit.parser.impl.WithPathOptions;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
