You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ba...@apache.org on 2020/04/09 14:00:32 UTC
svn commit: r1876325 - in /jackrabbit/oak/trunk/oak-it-osgi: pom.xml
src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java test-bundles.xml
Author: baedke
Date: Thu Apr 9 14:00:32 2020
New Revision: 1876325
URL: http://svn.apache.org/viewvc?rev=1876325&view=rev
Log:
OAK-8993: oak-auth-external and oak-auth-ldap are not covered by oak-it-osgi.
Added both bundles and dependencies.
Modified:
jackrabbit/oak/trunk/oak-it-osgi/pom.xml
jackrabbit/oak/trunk/oak-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
jackrabbit/oak/trunk/oak-it-osgi/test-bundles.xml
Modified: jackrabbit/oak/trunk/oak-it-osgi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it-osgi/pom.xml?rev=1876325&r1=1876324&r2=1876325&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it-osgi/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-it-osgi/pom.xml Thu Apr 9 14:00:32 2020
@@ -182,6 +182,18 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-auth-external</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-auth-ldap</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2.2</version>
@@ -251,6 +263,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.jaas</artifactId>
+ <version>1.0.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-link-mvn</artifactId>
<version>${pax.exam.version}</version>
Modified: jackrabbit/oak/trunk/oak-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java?rev=1876325&r1=1876324&r2=1876325&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java (original)
+++ jackrabbit/oak/trunk/oak-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java Thu Apr 9 14:00:32 2020
@@ -60,6 +60,7 @@ public class OSGiIT {
return CoreOptions.options(
junitBundles(),
mavenBundle("org.apache.felix", "org.apache.felix.scr", "2.0.12"),
+ mavenBundle("org.apache.felix", "org.apache.felix.jaas", "1.0.2"),
mavenBundle("org.osgi", "org.osgi.dto", "1.0.0"),
mavenBundle( "org.apache.felix", "org.apache.felix.configadmin", "1.8.16" ),
mavenBundle( "org.apache.felix", "org.apache.felix.fileinstall", "3.2.6" ),
Modified: jackrabbit/oak/trunk/oak-it-osgi/test-bundles.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it-osgi/test-bundles.xml?rev=1876325&r1=1876324&r2=1876325&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it-osgi/test-bundles.xml (original)
+++ jackrabbit/oak/trunk/oak-it-osgi/test-bundles.xml Thu Apr 9 14:00:32 2020
@@ -58,6 +58,8 @@
<include>org.apache.jackrabbit:oak-security-spi</include>
<include>org.apache.jackrabbit:oak-blob-plugins</include>
<include>org.apache.jackrabbit:oak-solr-osgi</include>
+ <include>org.apache.jackrabbit:oak-auth-external</include>
+ <include>org.apache.jackrabbit:oak-auth-ldap</include>
<include>io.dropwizard.metrics:metrics-core</include>
</includes>
</dependencySet>