You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by kw...@apache.org on 2022/06/27 12:37:43 UTC

[jackrabbit-filevault] 01/01: releng: do no longer manage scope of dependencies

This is an automated email from the ASF dual-hosted git repository.

kwin pushed a commit to branch feature/remove-scope-from-depMgmt
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git

commit 2d5c53a60081608401fd02b1769ca86c16838ced
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Mon Jun 27 14:37:35 2022 +0200

    releng: do no longer manage scope of dependencies
    
    make validation bundle compatible with AEM 6.4
---
 parent/pom.xml                        | 46 +++++++++++++++--------------------
 target-osgi-environment/pom.xml       |  7 ++++++
 vault-cli/pom.xml                     | 25 ++++++++++---------
 vault-core/pom.xml                    |  3 +++
 vault-davex/pom.xml                   | 13 ++++++++--
 vault-diff/pom.xml                    |  1 +
 vault-hook-example/pom.xml            |  3 ++-
 vault-hook-externalclass-test/pom.xml |  3 ++-
 vault-rcp/bnd.bnd                     |  2 +-
 vault-rcp/pom.xml                     | 18 ++++++++------
 vault-sync/bnd.bnd                    |  4 ++-
 vault-sync/pom.xml                    |  9 ++++++-
 vault-validation/pom.xml              | 14 ++++++++++-
 vault-vlt/pom.xml                     | 14 ++++++++---
 14 files changed, 106 insertions(+), 56 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 1fe7d6f8..7d85f211 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -324,6 +324,26 @@ Bundle-Category: jackrabbit
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.sling</groupId>
+                        <artifactId>maven-enforcer-rules</artifactId>
+                        <version>1.0.1-SNAPSHOT</version>
+                    </dependency>
+                </dependencies>
+                <executions>
+                    <execution>
+                        <id>enforce-explicit-scope</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireExplicitDependencyScope implementation="org.apache.sling.maven.enforcer.RequireExplicitDependencyScope" />
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
 
@@ -354,7 +374,6 @@ Bundle-Category: jackrabbit
                 <artifactId>oak-jackrabbit-api</artifactId>
                 <version>${oak.version}</version>
             </dependency>
-
             <dependency>
                 <groupId>org.apache.jackrabbit</groupId>
                 <artifactId>jackrabbit-spi</artifactId>
@@ -396,46 +415,29 @@ Bundle-Category: jackrabbit
                 <groupId>javax.jcr</groupId>
                 <artifactId>jcr</artifactId>
                 <version>2.0</version>
-                <scope>provided</scope>
             </dependency>
 
             <!-- SLF4j / Log4j -->
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-log4j12</artifactId>
-                <version>${slf4j.version}</version>
-                <scope>provided</scope>
-            </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
                 <version>${slf4j.version}</version>
-                <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-simple</artifactId>
                 <version>${slf4j.version}</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>log4j</groupId>
-                <artifactId>log4j</artifactId>
-                <version>1.2.12</version>
-                <scope>provided</scope>
             </dependency>
             <!-- https://github.com/JetBrains/java-annotations -->
             <dependency>
                 <groupId>org.jetbrains</groupId>
                 <artifactId>annotations</artifactId>
                 <version>23.0.0</version>
-                <scope>compile</scope>
             </dependency>
             <dependency>
                 <groupId>biz.aQute.bnd</groupId>
                 <artifactId>biz.aQute.bnd.annotation</artifactId>
                 <version>${bnd.version}</version>
-                <scope>compile</scope>
             </dependency>
             <!-- other -->
 
@@ -445,14 +447,12 @@ Bundle-Category: jackrabbit
                 <groupId>org.osgi</groupId>
                 <artifactId>org.osgi.framework</artifactId>
                 <version>1.8.0</version>
-                <scope>provided</scope>
             </dependency>
             <!-- Configuration Admin 1.6, Compendium R7 (https://osgi.org/javadoc/osgi.cmpn/7.0.0/org/osgi/service/cm/package-frame.html) -->
             <dependency>
                 <groupId>org.osgi</groupId>
                 <artifactId>org.osgi.service.cm</artifactId>
                 <version>1.6.0</version>
-                <scope>provided</scope>
             </dependency>
             <!-- Service Component 1.4, Compendium R7 (https://osgi.org/javadoc/osgi.cmpn/7.0.0/org/osgi/service/component/package-frame.html) -->
             <!-- and component property types (https://osgi.org/javadoc/osgi.cmpn/7.0.0/org/osgi/service/component/propertytypes/package-frame.html) -->
@@ -460,14 +460,12 @@ Bundle-Category: jackrabbit
                 <groupId>org.osgi</groupId>
                 <artifactId>org.osgi.service.component</artifactId>
                 <version>1.4.0</version>
-                <scope>provided</scope>
             </dependency>
             <!-- Event Admin 1.3.1, Compendium R6 (https://osgi.org/javadoc/r6/cmpn/org/osgi/service/event/package-summary.html) -->
             <dependency>
                 <groupId>org.osgi</groupId>
                 <artifactId>org.osgi.service.event</artifactId>
                 <version>1.3.1</version>
-                <scope>provided</scope>
             </dependency>
 
             <!-- OSGi Annotations: @Version -->
@@ -475,21 +473,18 @@ Bundle-Category: jackrabbit
                 <groupId>org.osgi</groupId>
                 <artifactId>org.osgi.annotation.versioning</artifactId>
                 <version>1.1.0</version>
-                <scope>provided</scope>
             </dependency>
             <!-- Declarative Service Annotations -->
             <dependency>
                 <groupId>org.osgi</groupId>
                 <artifactId>org.osgi.service.component.annotations</artifactId>
                 <version>1.4.0</version>
-                <scope>provided</scope>
             </dependency>
             <!-- Metatype Annotations -->
             <dependency>
                 <groupId>org.osgi</groupId>
                 <artifactId>org.osgi.service.metatype.annotations</artifactId>
                 <version>1.3.0</version>
-                <scope>provided</scope>
             </dependency>
 
             <!-- these are minimum version referenced in OSGi bundles, for embedding a newer version should be used -->
@@ -532,7 +527,6 @@ Bundle-Category: jackrabbit
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
                 <version>4.13.2</version>
-                <scope>test</scope>
             </dependency>
         </dependencies>
     </dependencyManagement>
diff --git a/target-osgi-environment/pom.xml b/target-osgi-environment/pom.xml
index 58357ae4..be31c4fa 100644
--- a/target-osgi-environment/pom.xml
+++ b/target-osgi-environment/pom.xml
@@ -86,6 +86,13 @@
 
     <!-- the following dependencies are provided by AEM 6.4, all must have scope "provided" to prevent them polluting referencing modules -->
     <dependencies>
+        <!-- older FileVault shipped with AEM, necessary for non-core bundles which should work without updating vault core -->
+        <dependency>
+            <groupId>org.apache.jackrabbit.vault</groupId>
+            <artifactId>org.apache.jackrabbit.vault</artifactId>
+            <version>3.1.38</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
diff --git a/vault-cli/pom.xml b/vault-cli/pom.xml
index ae288865..81c9b20a 100644
--- a/vault-cli/pom.xml
+++ b/vault-cli/pom.xml
@@ -123,13 +123,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.sling</groupId>
-                        <artifactId>maven-enforcer-rules</artifactId>
-                        <version>1.0.0</version>
-                    </dependency>
-                </dependencies>
                 <executions>
                     <execution>
                         <id>enforce-complete-runtime-classpath</id>
@@ -147,6 +140,9 @@
                                         <exclude>*:stax2-api</exclude><!-- embedded in vault-core -->
                                         <exclude>*:maven-artifact</exclude><!-- embedded in vault-core -->
                                         <exclude>*:h2</exclude><!-- embedded in vault-core -->
+                                        <exclude>org.apache.commons:commons-jci-fam</exclude><!-- embedded in vault-sync -->
+                                        <exclude>commons-logging:commons-logging-api</exclude><!-- embedded in vault-sync -->
+                                        <exclude>org.apache.sling:org.apache.sling.jcr.api</exclude><!-- only used on server-side -->
                                         <!-- no annotations are evaluated at run time -->
                                         <exclude>org.jetbrains:annotations</exclude>
                                         <exclude>org.osgi:org.osgi.annotation</exclude>
@@ -191,7 +187,8 @@
         <dependency>
             <groupId>org.apache.jackrabbit.vault</groupId>
             <artifactId>org.apache.jackrabbit.vault</artifactId>
-            <version>3.6.1-SNAPSHOT</version>
+            <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
         <!-- transitive (but with scope "provided") dependency of vault -->
         <dependency>
@@ -202,17 +199,20 @@
         <dependency>
             <groupId>org.apache.jackrabbit.vault</groupId>
             <artifactId>vault-vlt</artifactId>
-            <version>3.6.1-SNAPSHOT</version>
+            <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit.vault</groupId>
             <artifactId>vault-sync</artifactId>
-            <version>3.6.1-SNAPSHOT</version>
+            <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit.vault</groupId>
             <artifactId>vault-davex</artifactId>
-            <version>3.6.1-SNAPSHOT</version>
+            <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
 
         <!-- CLI Stuff -->
@@ -220,11 +220,13 @@
             <groupId>org.apache.mahout.commons</groupId>
             <artifactId>commons-cli</artifactId>
             <version>2.0-mahout</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>jline</groupId>
             <artifactId>jline</artifactId>
             <version>1.0</version>
+            <scope>compile</scope>
         </dependency>
 
         <!-- JCR Stuff -->
@@ -251,6 +253,7 @@
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
             <version>1.2.10</version>
+            <scope>compile</scope>
         </dependency>
     </dependencies>
 </project>
diff --git a/vault-core/pom.xml b/vault-core/pom.xml
index 0b8b5a71..4b02b28d 100644
--- a/vault-core/pom.xml
+++ b/vault-core/pom.xml
@@ -220,16 +220,19 @@
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.annotation.versioning</artifactId>
+            <scope>provided</scope>
         </dependency>
         <!-- Declarative Service Annotations -->
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.service.component.annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
         <!-- Metatype Annotations -->
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.service.metatype.annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
diff --git a/vault-davex/pom.xml b/vault-davex/pom.xml
index 24c400bd..ca82a339 100644
--- a/vault-davex/pom.xml
+++ b/vault-davex/pom.xml
@@ -41,50 +41,59 @@
         <dependency>
             <groupId>org.apache.jackrabbit.vault</groupId>
             <artifactId>org.apache.jackrabbit.vault</artifactId>
-            <version>3.6.1-SNAPSHOT</version>
+            <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>jackrabbit-jcr-commons</artifactId>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>jackrabbit-jcr-client</artifactId>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>jackrabbit-spi-commons</artifactId>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>jackrabbit-jcr2spi</artifactId>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>jackrabbit-spi2dav</artifactId>
+            <scope>compile</scope>
         </dependency>
         
         <!-- add some dependencies of spi2davex -->
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>jackrabbit-webdav</artifactId>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.4</version>
+            <scope>compile</scope>
         </dependency>
 
         <!-- JCR Stuff -->
         <dependency>
             <groupId>javax.jcr</groupId>
             <artifactId>jcr</artifactId>
+            <scope>compile</scope>
         </dependency>
 
         <!-- SLF4j / Log4j -->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
+            <scope>compile</scope>
         </dependency>
     </dependencies>
     
diff --git a/vault-diff/pom.xml b/vault-diff/pom.xml
index bd2fd16b..d8445713 100644
--- a/vault-diff/pom.xml
+++ b/vault-diff/pom.xml
@@ -44,6 +44,7 @@
             <groupId>com.googlecode.java-diff-utils</groupId>
             <artifactId>diffutils</artifactId>
             <version>1.2.1</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
diff --git a/vault-hook-example/pom.xml b/vault-hook-example/pom.xml
index 10e409e6..d71f6b88 100644
--- a/vault-hook-example/pom.xml
+++ b/vault-hook-example/pom.xml
@@ -85,7 +85,8 @@
         <dependency>
             <groupId>org.apache.jackrabbit.vault</groupId>
             <artifactId>org.apache.jackrabbit.vault</artifactId>
-            <version>3.6.1-SNAPSHOT</version>
+            <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
 
         <!-- JCR Stuff -->
diff --git a/vault-hook-externalclass-test/pom.xml b/vault-hook-externalclass-test/pom.xml
index 5dbfd4a4..52351a4d 100644
--- a/vault-hook-externalclass-test/pom.xml
+++ b/vault-hook-externalclass-test/pom.xml
@@ -99,7 +99,8 @@
         <dependency>
             <groupId>org.apache.jackrabbit.vault</groupId>
             <artifactId>org.apache.jackrabbit.vault</artifactId>
-            <version>3.6.1-SNAPSHOT</version>
+            <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
 
         <!-- JCR Stuff -->
diff --git a/vault-rcp/bnd.bnd b/vault-rcp/bnd.bnd
index 5daae1b0..d3c13e49 100644
--- a/vault-rcp/bnd.bnd
+++ b/vault-rcp/bnd.bnd
@@ -19,7 +19,7 @@
                   @jackrabbit-spi2dav-[0-9.]*(-SNAPSHOT)?.jar,\
                   @jackrabbit-jcr-client-[0-9.]*(-SNAPSHOT)?.jar,\
                   @jackrabbit-jcr2spi-[0-9.]*(-SNAPSHOT)?.jar
--conditionalpackage: org.apache.jackrabbit.util,org.apache.jackrabbit.api.security,org.apache.felix.utils.json
+-conditionalpackage: org.apache.jackrabbit.util,org.apache.jackrabbit.api.security.*,org.apache.felix.utils.json
 # make sure to only export the relevant packages (https://github.com/bndtools/bnd/issues/4219)
 -exportcontents: org.apache.jackrabbit.vault.rcp
 # due to Jackrabbit2 JARs poorly designed for OSGi, only export the class used in the API from package "org.apache.jackrabbit.spi2dav", as the other classes in that package have lots of private references
diff --git a/vault-rcp/pom.xml b/vault-rcp/pom.xml
index dd46f7cb..4d79462f 100644
--- a/vault-rcp/pom.xml
+++ b/vault-rcp/pom.xml
@@ -119,6 +119,7 @@
             <groupId>org.apache.jackrabbit.vault</groupId>
             <artifactId>org.apache.jackrabbit.vault</artifactId>
             <version>3.1.38</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
@@ -162,6 +163,7 @@
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.utils</artifactId>
             <version>1.11.8</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
@@ -198,42 +200,42 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- include all relevant parts to be installable also on older distributions (having older Jackrabbit bundles) -->
+        <!-- embed all relevant parts to be installable also on older distributions (having older Jackrabbit bundles) -->
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>jackrabbit-jcr2spi</artifactId>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>jackrabbit-jcr-client</artifactId>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>jackrabbit-spi</artifactId>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>jackrabbit-spi-commons</artifactId>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>jackrabbit-spi2dav</artifactId>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>jackrabbit-webdav</artifactId>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit.vault</groupId>
             <artifactId>vault-davex</artifactId>
             <version>${project.version}</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
 
         <!-- Testing -->
diff --git a/vault-sync/bnd.bnd b/vault-sync/bnd.bnd
index a8276c64..ffb402ba 100644
--- a/vault-sync/bnd.bnd
+++ b/vault-sync/bnd.bnd
@@ -12,4 +12,6 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
--includeresource: @commons-jci-fam-[0-9.]*.jar
\ No newline at end of file
+Import-Package: org.apache.log4j;resolution:=optional,\
+               *
+-includeresource: @commons-jci-fam-[0-9.]*.jar,@commons-logging-api-[0-9.]*.jar
\ No newline at end of file
diff --git a/vault-sync/pom.xml b/vault-sync/pom.xml
index 1f50ec06..eaaf3135 100644
--- a/vault-sync/pom.xml
+++ b/vault-sync/pom.xml
@@ -106,6 +106,7 @@
             <groupId>org.apache.jackrabbit.vault</groupId>
             <artifactId>org.apache.jackrabbit.vault</artifactId>
             <version>3.1.38</version><!-- minimum version this bundle is compatible with -->
+            <scope>provided</scope>
         </dependency>
 
         <!-- JCR Stuff -->
@@ -134,25 +135,30 @@
             <artifactId>commons-io</artifactId>
             <scope>provided</scope>
         </dependency>
+        <!-- embedded dependency -->
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-jci-fam</artifactId>
             <version>1.0</version>
+            <scope>provided</scope>
         </dependency>
         <!-- OSGi Annotations: @Version -->
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.annotation.versioning</artifactId>
+            <scope>provided</scope>
         </dependency>
         <!-- Declarative Service Annotations -->
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.service.component.annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
         <!-- Metatype Annotations -->
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.service.metatype.annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <!-- sling -->
@@ -160,14 +166,15 @@
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.jcr.api</artifactId>
             <version>2.0.6</version>
+            <scope>provided</scope>
         </dependency>
 
         <!-- SLF4j / Log4j -->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
+            <scope>provided</scope>
         </dependency>
-
     </dependencies>
 
 </project>
diff --git a/vault-validation/pom.xml b/vault-validation/pom.xml
index 5c9a499b..4d5dcd17 100644
--- a/vault-validation/pom.xml
+++ b/vault-validation/pom.xml
@@ -37,6 +37,7 @@
     <properties>
         <!-- http://maven.apache.org/ref/3.6.3/maven-model-builder/index.html#Inheritance_Assembly -->
         <project.directory>vault-validation</project.directory>
+        <jackrabbit.version>2.16.0</jackrabbit.version>
     </properties>
 
     <build>
@@ -120,21 +121,30 @@
             <groupId>org.apache.jackrabbit.vault</groupId>
             <artifactId>org.apache.jackrabbit.vault</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <!-- JCR Stuff -->
+        <dependency>
+            <groupId>javax.jcr</groupId>
+            <artifactId>jcr</artifactId>
+            <scope>provided</scope>
         </dependency>
-
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>jackrabbit-spi-commons</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>jackrabbit-jcr2spi</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <!-- for parsing Maven versions -->
@@ -142,6 +152,7 @@
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-artifact</artifactId>
             <version>3.8.4</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -209,6 +220,7 @@
             <artifactId>metainf-services</artifactId>
             <version>1.8</version>
             <optional>true</optional>
+            <scope>provided</scope>
         </dependency>
 
         <!-- testing -->
diff --git a/vault-vlt/pom.xml b/vault-vlt/pom.xml
index d8462e40..93691ea8 100644
--- a/vault-vlt/pom.xml
+++ b/vault-vlt/pom.xml
@@ -41,42 +41,50 @@
         <dependency>
             <groupId>org.apache.jackrabbit.vault</groupId>
             <artifactId>org.apache.jackrabbit.vault</artifactId>
-            <version>3.6.1-SNAPSHOT</version>
+            <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit.vault</groupId>
             <artifactId>vault-sync</artifactId>
-            <version>3.6.1-SNAPSHOT</version>
+            <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>jackrabbit-jcr-commons</artifactId>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit.vault</groupId>
             <artifactId>vault-diff</artifactId>
-            <version>3.6.1-SNAPSHOT</version>
+            <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
         <!-- for org.apache.jackrabbit.spi2dav.ConnectionOptions -->
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>jackrabbit-spi2dav</artifactId>
+            <scope>compile</scope>
         </dependency>
 
         <!-- JCR Stuff -->
         <dependency>
             <groupId>javax.jcr</groupId>
             <artifactId>jcr</artifactId>
+            <scope>compile</scope>
         </dependency>
 
         <!-- SLF4j / Log4j -->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>