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 tr...@apache.org on 2014/02/17 20:01:58 UTC

svn commit: r1569086 - in /jackrabbit/oak/trunk: oak-auth-external/pom.xml oak-auth-ldap/pom.xml pom.xml

Author: tripod
Date: Mon Feb 17 19:01:57 2014
New Revision: 1569086

URL: http://svn.apache.org/r1569086
Log:
@trivial update felix jaas to released version

Modified:
    jackrabbit/oak/trunk/oak-auth-external/pom.xml
    jackrabbit/oak/trunk/oak-auth-ldap/pom.xml
    jackrabbit/oak/trunk/pom.xml

Modified: jackrabbit/oak/trunk/oak-auth-external/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/pom.xml?rev=1569086&r1=1569085&r2=1569086&view=diff
==============================================================================
Binary files - no diff available.

Modified: jackrabbit/oak/trunk/oak-auth-ldap/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-ldap/pom.xml?rev=1569086&r1=1569085&r2=1569086&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-auth-ldap/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-auth-ldap/pom.xml Mon Feb 17 19:01:57 2014
@@ -96,25 +96,6 @@
             <scope>provided</scope>
         </dependency>
 
-
-        <!-- Optional OSGi dependencies, used only when running within OSGi -->
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.jaas</artifactId>
-            <version>0.0.1-R1560269</version>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>biz.aQute.bnd</groupId>
             <artifactId>bndlib</artifactId>
@@ -138,20 +119,9 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.jackrabbit</groupId>
-            <artifactId>oak-commons</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>1.5</version>
-        </dependency>
 
         <!-- JCR and Jackrabbit dependencies -->
         <dependency>
@@ -159,16 +129,6 @@
             <artifactId>jcr</artifactId>
             <version>2.0</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.jackrabbit</groupId>
-            <artifactId>jackrabbit-api</artifactId>
-            <version>${jackrabbit.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.jackrabbit</groupId>
-            <artifactId>jackrabbit-jcr-commons</artifactId>
-            <version>${jackrabbit.version}</version>
-        </dependency>
 
         <!-- Logging -->
         <dependency>
@@ -196,12 +156,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <version>1.3.158</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jul-to-slf4j</artifactId>
             <scope>test</scope>

Modified: jackrabbit/oak/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/pom.xml?rev=1569086&r1=1569085&r2=1569086&view=diff
==============================================================================
--- jackrabbit/oak/trunk/pom.xml (original)
+++ jackrabbit/oak/trunk/pom.xml Mon Feb 17 19:01:57 2014
@@ -49,8 +49,8 @@
     <module>oak-solr-core</module>
     <module>oak-solr-remote</module>
     <module>oak-solr-embedded</module>
-    <!--<module>oak-auth-external</module>
-    <module>oak-auth-ldap</module>-->
+    <module>oak-auth-external</module>
+    <module>oak-auth-ldap</module>
     <module>oak-run</module>
     <module>oak-it</module>
     <!-- <module>oak-mk-perf</module> -->