jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r721419 - in /jackrabbit/branches/1.5: ./ jackrabbit-classloader/ jackrabbit-core/ jackrabbit-jca/ jackrabbit-jcr-benchmark/ jackrabbit-jcr-rmi/ jackrabbit-jcr-server/ jackrabbit-jcr-servlet/ jackrabbit-jcr2spi/ jackrabbit-ocm-nodemanagemen...
Date Fri, 28 Nov 2008 10:39:46 GMT
Author: jukka
Date: Fri Nov 28 02:39:45 2008
New Revision: 721419

URL: http://svn.apache.org/viewvc?rev=721419&view=rev
Log:
1.5: Merged revisions 720679 and 720687 (JCR-1882)

Modified:
    jackrabbit/branches/1.5/   (props changed)
    jackrabbit/branches/1.5/jackrabbit-classloader/pom.xml
    jackrabbit/branches/1.5/jackrabbit-core/pom.xml
    jackrabbit/branches/1.5/jackrabbit-jca/pom.xml
    jackrabbit/branches/1.5/jackrabbit-jcr-benchmark/pom.xml
    jackrabbit/branches/1.5/jackrabbit-jcr-rmi/pom.xml
    jackrabbit/branches/1.5/jackrabbit-jcr-server/pom.xml
    jackrabbit/branches/1.5/jackrabbit-jcr-servlet/pom.xml
    jackrabbit/branches/1.5/jackrabbit-jcr2spi/pom.xml
    jackrabbit/branches/1.5/jackrabbit-ocm-nodemanagement/pom.xml
    jackrabbit/branches/1.5/jackrabbit-ocm/pom.xml
    jackrabbit/branches/1.5/jackrabbit-parent/pom.xml
    jackrabbit/branches/1.5/jackrabbit-spi-commons/pom.xml
    jackrabbit/branches/1.5/jackrabbit-spi2jcr/pom.xml
    jackrabbit/branches/1.5/jackrabbit-standalone/pom.xml
    jackrabbit/branches/1.5/jackrabbit-webapp/pom.xml
    jackrabbit/branches/1.5/jackrabbit-webdav/pom.xml

Propchange: jackrabbit/branches/1.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 28 02:39:45 2008
@@ -1,2 +1,2 @@
 /jackrabbit/branches/1.3:631261
-/jackrabbit/trunk:703899-704158,704165,704167,704324,704358,704361,704864,704933,704939,705010,705033,705243,705496,705522,705579,705925,705932,705934,705937-705938,705961,706242,706273,706285-706286,706562,706606,706649,706655,706660,706697,706918,707303-707304,707307,707310,707630,708206,708598,708609,708613,708619,708634,708840,708863,708909,708929,708943,709115,709142,709207,709211,710047,711238,711566-711567,711595,711841-711843,712984-712985,713037,713059,713065,713072,713076,713162,713214,713956,713958,713964,713971,713975,714034,718218,718249-718250,718371,718376,718566,718632,718981,719225,719282,719575-719577,719579,719585-719586,719588,719592,720455,720492,720524,720533,720540,720673
+/jackrabbit/trunk:703899-704158,704165,704167,704324,704358,704361,704864,704933,704939,705010,705033,705243,705496,705522,705579,705925,705932,705934,705937-705938,705961,706242,706273,706285-706286,706562,706606,706649,706655,706660,706697,706918,707303-707304,707307,707310,707630,708206,708598,708609,708613,708619,708634,708840,708863,708909,708929,708943,709115,709142,709207,709211,710047,711238,711566-711567,711595,711841-711843,712984-712985,713037,713059,713065,713072,713076,713162,713214,713956,713958,713964,713971,713975,714034,718218,718249-718250,718371,718376,718566,718632,718981,719225,719282,719575-719577,719579,719585-719586,719588,719592,720455,720484,720492,720524,720533,720540,720673,720679,720687

Modified: jackrabbit/branches/1.5/jackrabbit-classloader/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.5/jackrabbit-classloader/pom.xml?rev=721419&r1=721418&r2=721419&view=diff
==============================================================================
--- jackrabbit/branches/1.5/jackrabbit-classloader/pom.xml (original)
+++ jackrabbit/branches/1.5/jackrabbit-classloader/pom.xml Fri Nov 28 02:39:45 2008
@@ -50,12 +50,12 @@
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-api</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-jcr-commons</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
     </dependency>
 
     <!-- Logging -->
@@ -73,7 +73,7 @@
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-core</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: jackrabbit/branches/1.5/jackrabbit-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.5/jackrabbit-core/pom.xml?rev=721419&r1=721418&r2=721419&view=diff
==============================================================================
--- jackrabbit/branches/1.5/jackrabbit-core/pom.xml (original)
+++ jackrabbit/branches/1.5/jackrabbit-core/pom.xml Fri Nov 28 02:39:45 2008
@@ -176,27 +176,27 @@
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-api</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-jcr-commons</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-spi-commons</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-spi</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-text-extractors</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -218,13 +218,13 @@
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-jcr-tests</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-jcr-benchmark</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: jackrabbit/branches/1.5/jackrabbit-jca/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.5/jackrabbit-jca/pom.xml?rev=721419&r1=721418&r2=721419&view=diff
==============================================================================
--- jackrabbit/branches/1.5/jackrabbit-jca/pom.xml (original)
+++ jackrabbit/branches/1.5/jackrabbit-jca/pom.xml Fri Nov 28 02:39:45 2008
@@ -121,7 +121,7 @@
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-core</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
       <exclusions>
         <exclusion>
           <groupId>commons-logging</groupId>

Modified: jackrabbit/branches/1.5/jackrabbit-jcr-benchmark/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.5/jackrabbit-jcr-benchmark/pom.xml?rev=721419&r1=721418&r2=721419&view=diff
==============================================================================
--- jackrabbit/branches/1.5/jackrabbit-jcr-benchmark/pom.xml (original)
+++ jackrabbit/branches/1.5/jackrabbit-jcr-benchmark/pom.xml Fri Nov 28 02:39:45 2008
@@ -62,7 +62,7 @@
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-jcr-tests</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

Modified: jackrabbit/branches/1.5/jackrabbit-jcr-rmi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.5/jackrabbit-jcr-rmi/pom.xml?rev=721419&r1=721418&r2=721419&view=diff
==============================================================================
--- jackrabbit/branches/1.5/jackrabbit-jcr-rmi/pom.xml (original)
+++ jackrabbit/branches/1.5/jackrabbit-jcr-rmi/pom.xml Fri Nov 28 02:39:45 2008
@@ -107,13 +107,13 @@
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-api</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-jcr-commons</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>

Modified: jackrabbit/branches/1.5/jackrabbit-jcr-server/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.5/jackrabbit-jcr-server/pom.xml?rev=721419&r1=721418&r2=721419&view=diff
==============================================================================
--- jackrabbit/branches/1.5/jackrabbit-jcr-server/pom.xml (original)
+++ jackrabbit/branches/1.5/jackrabbit-jcr-server/pom.xml Fri Nov 28 02:39:45 2008
@@ -70,17 +70,17 @@
       <!-- temporarily added dependency, needed as long as JCR2 interfaces are contained
in jackrabbit-api -->
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-api</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-jcr-commons</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-webdav</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>

Modified: jackrabbit/branches/1.5/jackrabbit-jcr-servlet/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.5/jackrabbit-jcr-servlet/pom.xml?rev=721419&r1=721418&r2=721419&view=diff
==============================================================================
--- jackrabbit/branches/1.5/jackrabbit-jcr-servlet/pom.xml (original)
+++ jackrabbit/branches/1.5/jackrabbit-jcr-servlet/pom.xml Fri Nov 28 02:39:45 2008
@@ -52,18 +52,18 @@
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-jcr-commons</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-jcr-rmi</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-core</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
       <optional>true</optional>
     </dependency>
   </dependencies>

Modified: jackrabbit/branches/1.5/jackrabbit-jcr2spi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.5/jackrabbit-jcr2spi/pom.xml?rev=721419&r1=721418&r2=721419&view=diff
==============================================================================
--- jackrabbit/branches/1.5/jackrabbit-jcr2spi/pom.xml (original)
+++ jackrabbit/branches/1.5/jackrabbit-jcr2spi/pom.xml Fri Nov 28 02:39:45 2008
@@ -76,17 +76,17 @@
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-spi</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-spi-commons</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-jcr-commons</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -108,7 +108,7 @@
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-jcr-tests</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: jackrabbit/branches/1.5/jackrabbit-ocm-nodemanagement/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.5/jackrabbit-ocm-nodemanagement/pom.xml?rev=721419&r1=721418&r2=721419&view=diff
==============================================================================
--- jackrabbit/branches/1.5/jackrabbit-ocm-nodemanagement/pom.xml (original)
+++ jackrabbit/branches/1.5/jackrabbit-ocm-nodemanagement/pom.xml Fri Nov 28 02:39:45 2008
@@ -50,12 +50,12 @@
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-ocm</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-core</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>

Modified: jackrabbit/branches/1.5/jackrabbit-ocm/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.5/jackrabbit-ocm/pom.xml?rev=721419&r1=721418&r2=721419&view=diff
==============================================================================
--- jackrabbit/branches/1.5/jackrabbit-ocm/pom.xml (original)
+++ jackrabbit/branches/1.5/jackrabbit-ocm/pom.xml Fri Nov 28 02:39:45 2008
@@ -122,7 +122,7 @@
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-core</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: jackrabbit/branches/1.5/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.5/jackrabbit-parent/pom.xml?rev=721419&r1=721418&r2=721419&view=diff
==============================================================================
--- jackrabbit/branches/1.5/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/branches/1.5/jackrabbit-parent/pom.xml Fri Nov 28 02:39:45 2008
@@ -55,6 +55,7 @@
 
   <properties>
     <slf4j.version>1.5.3</slf4j.version>
+    <jetty.version>6.1.14</jetty.version>
   </properties>
 
   <build>
@@ -759,6 +760,31 @@
         <scope>provided</scope>
       </dependency>
       <dependency>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>jetty</artifactId>
+        <version>${jetty.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>jsp-2.1</artifactId>
+        <version>${jetty.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>jetty-util</artifactId>
+        <version>${jetty.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>servlet-api-2.5</artifactId>
+        <version>${jetty.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>jsp-api-2.1</artifactId>
+        <version>${jetty.version}</version>
+      </dependency>
+      <dependency>
         <groupId>xerces</groupId>
         <artifactId>xercesImpl</artifactId>
         <version>2.8.1</version>

Modified: jackrabbit/branches/1.5/jackrabbit-spi-commons/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.5/jackrabbit-spi-commons/pom.xml?rev=721419&r1=721418&r2=721419&view=diff
==============================================================================
--- jackrabbit/branches/1.5/jackrabbit-spi-commons/pom.xml (original)
+++ jackrabbit/branches/1.5/jackrabbit-spi-commons/pom.xml Fri Nov 28 02:39:45 2008
@@ -189,12 +189,12 @@
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-spi</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-jcr-commons</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>commons-collections</groupId>

Modified: jackrabbit/branches/1.5/jackrabbit-spi2jcr/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.5/jackrabbit-spi2jcr/pom.xml?rev=721419&r1=721418&r2=721419&view=diff
==============================================================================
--- jackrabbit/branches/1.5/jackrabbit-spi2jcr/pom.xml (original)
+++ jackrabbit/branches/1.5/jackrabbit-spi2jcr/pom.xml Fri Nov 28 02:39:45 2008
@@ -87,25 +87,25 @@
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-spi</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
       <classifier></classifier>
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-spi</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-spi-commons</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-jcr-commons</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -119,38 +119,38 @@
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-jcr-tests</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-jcr-benchmark</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-core</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-jcr-rmi</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-jcr2spi</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-jcr2spi</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
       <classifier></classifier>
       <scope>test</scope>
     </dependency>

Modified: jackrabbit/branches/1.5/jackrabbit-standalone/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.5/jackrabbit-standalone/pom.xml?rev=721419&r1=721418&r2=721419&view=diff
==============================================================================
--- jackrabbit/branches/1.5/jackrabbit-standalone/pom.xml (original)
+++ jackrabbit/branches/1.5/jackrabbit-standalone/pom.xml Fri Nov 28 02:39:45 2008
@@ -82,24 +82,38 @@
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-webapp</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
       <type>war</type>
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-webapp</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
       <type>jar</type>
     </dependency>
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jetty</artifactId>
-      <version>6.1.11</version>
     </dependency>
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jsp-2.1</artifactId>
-      <version>6.1.11</version>
+    </dependency>
+    <!--
+      JCR-1882: Explicitly declare versions of transitive Jetty dependencies
+      to avoid problems with the ${project.version} setting that Jetty uses.
+    -->
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jetty-util</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>servlet-api-2.5</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jsp-api-2.1</artifactId>
     </dependency>
   </dependencies>
 

Modified: jackrabbit/branches/1.5/jackrabbit-webapp/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.5/jackrabbit-webapp/pom.xml?rev=721419&r1=721418&r2=721419&view=diff
==============================================================================
--- jackrabbit/branches/1.5/jackrabbit-webapp/pom.xml (original)
+++ jackrabbit/branches/1.5/jackrabbit-webapp/pom.xml Fri Nov 28 02:39:45 2008
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-core</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
       <exclusions>
         <exclusion>
           <groupId>commons-logging</groupId>
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-jcr-server</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
       <exclusions>
         <!-- JCR-683: The commons-httpclient dependency from            -->
         <!-- jackrabbit-webapp depends on commons-logging. Since this   -->
@@ -82,12 +82,12 @@
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-jcr-servlet</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-jcr-rmi</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>

Modified: jackrabbit/branches/1.5/jackrabbit-webdav/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.5/jackrabbit-webdav/pom.xml?rev=721419&r1=721418&r2=721419&view=diff
==============================================================================
--- jackrabbit/branches/1.5/jackrabbit-webdav/pom.xml (original)
+++ jackrabbit/branches/1.5/jackrabbit-webdav/pom.xml Fri Nov 28 02:39:45 2008
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-jcr-commons</artifactId>
-      <version>${project.version}</version>
+      <version>1.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>



Mime
View raw message