sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r646283 - in /incubator/sling/trunk: jcr/jackrabbit-server/pom.xml jcr/jackrabbit-text-extractors/pom.xml launchpad/app/pom.xml
Date Wed, 09 Apr 2008 11:43:51 GMT
Author: fmeschbe
Date: Wed Apr  9 04:43:50 2008
New Revision: 646283

URL: http://svn.apache.org/viewvc?rev=646283&view=rev
Log:
SLING-369 Use most recent jackrabbit modules
SLING-371 Rename jackrabbit-text-extractors module and have jackrabbit-server use it

Modified:
    incubator/sling/trunk/jcr/jackrabbit-server/pom.xml
    incubator/sling/trunk/jcr/jackrabbit-text-extractors/pom.xml
    incubator/sling/trunk/launchpad/app/pom.xml

Modified: incubator/sling/trunk/jcr/jackrabbit-server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/jackrabbit-server/pom.xml?rev=646283&r1=646282&r2=646283&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/jackrabbit-server/pom.xml (original)
+++ incubator/sling/trunk/jcr/jackrabbit-server/pom.xml Wed Apr  9 04:43:50 2008
@@ -120,23 +120,7 @@
                             version="1.4"
                         </Export-Package>
                         <Private-Package>
-                            <!-- !org.apache.jackrabbit.*, -->
-                            org.apache.sling.jcr.jackrabbit.server.*,
-                            META-INF.services.*;-split-package:=merge-first,
-
-                            <!-- Jackrabbit Text Extractors -->
-                            org.apache.jackrabbit.extractor,
-
-                            <!-- (server side) rmi packages -->
-                            org.apache.jackrabbit.rmi.*,
-
-                            EDU.oswego.cs.dl.util.concurrent.*,
-                            org.apache.lucene.*, org.apache.derby.*,
-                            
-                            <!-- needed since the move to Jackrabbit 1.4 -->
-                            org.apache.jackrabbit.spi.commons.conversion.*,
-                            org.apache.jackrabbit.spi.commons.namespace.*,
-                            org.apache.jackrabbit.spi.*,
+                            org.apache.sling.jcr.jackrabbit.server
                         </Private-Package>
                         <Import-Package>
                             org.apache.sling.jcr.api,
@@ -148,6 +132,9 @@
                             org.apache.commons.collections.*,
                             org.apache.jackrabbit.api,
 
+                            <!-- Jackrabbit Text Extractors -->
+                            org.apache.jackrabbit.extractor,
+
                             org.osgi.framework, org.osgi.service.cm,
                             org.osgi.service.component,
                             org.osgi.service.log,
@@ -159,8 +146,17 @@
                         <!-- Embedd some libraries -->
                         <Embed-Transitive>true</Embed-Transitive>
                         <Embed-Dependency>
-                            jackrabbit-jcr-rmi;jackrabbit-core;jackrabbit-jcr-commons;inline=true
+                            jackrabbit-jcr-rmi;
+                            jackrabbit-core;
+                            jackrabbit-jcr-commons;
+                            jackrabbit-spi-commons;
+                            jackrabbit-spi;
+                            lucene-core;
+                            derby;
+                            concurrent
                         </Embed-Dependency>
+                        <Embed-Transitive>true</Embed-Transitive>
+
 
                     </instructions>
                 </configuration>
@@ -184,8 +180,6 @@
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>jackrabbit-jcr-rmi</artifactId>
-            <!-- Required for JCR-1406 -->
-            <version>1.5-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

Modified: incubator/sling/trunk/jcr/jackrabbit-text-extractors/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/jackrabbit-text-extractors/pom.xml?rev=646283&r1=646282&r2=646283&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/jackrabbit-text-extractors/pom.xml (original)
+++ incubator/sling/trunk/jcr/jackrabbit-text-extractors/pom.xml Wed Apr  9 04:43:50 2008
@@ -32,12 +32,12 @@
         <pkgArtifactId>jackrabbit-text-extractors</pkgArtifactId>
         <pkgVersion>1.4</pkgVersion>
         <pkgSnapshot></pkgSnapshot><!-- declare empty for release version
-->
-        <pomVersion>0002</pomVersion>
+        <pomVersion>0003</pomVersion>
         <osgiVersion>${pkgVersion}.0</osgiVersion>
     </properties>
 
-    <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
-    <version>${osgiVersion}-${pomVersion}-SNAPSHOT</version>
+    <artifactId>org.apache.sling.jcr.${pkgArtifactId}</artifactId>
+    <version>${osgiVersion}-${pomVersion}-incubator-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>${pkgArtifactId} bundle</name>
     <description>

Modified: incubator/sling/trunk/launchpad/app/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/app/pom.xml?rev=646283&r1=646282&r2=646283&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/app/pom.xml (original)
+++ incubator/sling/trunk/launchpad/app/pom.xml Wed Apr  9 04:43:50 2008
@@ -362,9 +362,16 @@
             <optional>true</optional>
         </dependency>
         <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>
+                org.apache.sling.jcr.jackrabbit-text-extractors
+            </artifactId>
+            <version>1.4.0-0003-incubator-SNAPSHOT</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>jackrabbit-jcr-commons</artifactId>
-            <version>1.5-SNAPSHOT</version>
             <optional>true</optional>
         </dependency>
         <dependency>



Mime
View raw message