Excluding the logback-classic transitive test dependency.

adamcin · Sep 16, 2019 · d80f503 · d80f503
1 parent 384f201
commit d80f503
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/maven/src/test/java/net/adamcin/oakpal/maven/mojo/WebsterMojoTest.java b/maven/src/test/java/net/adamcin/oakpal/maven/mojo/WebsterMojoTest.java
@@ -226,6 +226,7 @@ public void testExecute_noFixture() throws Exception {
         final File projectRoot = new File(testOutDir, "content-package");
         FileUtils.copyDirectory(new File(srcDir, "content-package"), projectRoot);
         WebsterMojo mojo = newMojo();
+        mojo.baseDir = projectRoot;
         mojo.websterArchiveRoot = new File(projectRoot, "src/main/resources");
         mojo.websterTargets = obj().key("nodetypes", obj()).key("privileges", obj()).get();
         mojo.execute();
@@ -244,6 +245,7 @@ public void testExecute() throws Exception {
         WebsterMojo mojo = newMojo();
         final File archiveRoot = new File(projectRoot, "src/main/content");
         final File tempDir = new File(testOutDir, "webster-tmp");
+        mojo.baseDir = projectRoot;
         mojo.websterTempDirectory = tempDir;
         mojo.websterArchiveRoot = archiveRoot;
         mojo.websterTargets = obj().key("nodetypes", obj()).key("privileges", obj()).get();

diff --git a/pom.xml b/pom.xml
@@ -489,6 +489,7 @@
                 <artifactId>oak-commons</artifactId>
                 <version>${oak.version}</version>
             </dependency>
+            <!-- upgrade oak-store-composite for oakpal-webster to get OAK-7923 -->
             <dependency>
                 <groupId>org.apache.jackrabbit</groupId>
                 <artifactId>oak-store-composite</artifactId>
@@ -503,6 +504,12 @@
                 <groupId>org.apache.jackrabbit</groupId>
                 <artifactId>oak-run-commons</artifactId>
                 <version>${oak.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>ch.qos.logback</groupId>
+                        <artifactId>logback-classic</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.apache.jackrabbit</groupId>