jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r791848 - in /jackrabbit/branches/1.x: ./ jackrabbit-core/ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/db/ jackrabbit-jcr-tests/ jackrabbit-parent/ jackrabbit-spi-commons/ jackrabbit-spi2jcr/ jackrabbit-text-extractors/ ja...
Date Tue, 07 Jul 2009 14:44:23 GMT
Author: jukka
Date: Tue Jul  7 14:44:23 2009
New Revision: 791848

URL: http://svn.apache.org/viewvc?rev=791848&view=rev
Log:
1.x: Upgrade to parent pom version 3

Modified:
    jackrabbit/branches/1.x/   (props changed)
    jackrabbit/branches/1.x/jackrabbit-core/pom.xml
    jackrabbit/branches/1.x/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/db/DerbyDataStore.java
    jackrabbit/branches/1.x/jackrabbit-jcr-tests/pom.xml
    jackrabbit/branches/1.x/jackrabbit-parent/pom.xml
    jackrabbit/branches/1.x/jackrabbit-spi-commons/pom.xml
    jackrabbit/branches/1.x/jackrabbit-spi2jcr/pom.xml
    jackrabbit/branches/1.x/jackrabbit-text-extractors/pom.xml
    jackrabbit/branches/1.x/jackrabbit-webapp/pom.xml

Propchange: jackrabbit/branches/1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul  7 14:44:23 2009
@@ -1,2 +1,2 @@
 /incubator/jackrabbit/trunk:78926
-/jackrabbit/trunk:770143-773197,773483,773525-773554,773584,773588,773828,773835-775756,775833,775836,775840,775868,775981,775986,776036,776256,776310,776313,776321-776322,776332,776356-776357,776362,776373,776650-776693,776737,776757,776776-776777,777024,777029,777034,777478,777509,777541,777548,777936,778445,778613,778616,778621,778645,778720,778802,779032,779040,779068-779071,779074,779076,779081,779084,779086-779088,779090-779092,779094-779096,779101,779223,779225,779227-779228,779230,779233-779234,779460,779475-779476,779504,779550,779552,779555,779561,779563,779583,779590,779618,779621-779622,779624,779642,779654,779657-779659,779661,779936,780006,780010,780025,780085,780989,780993,781017,781051,781054,781294-781300,781305-781311,781318,781328,781338,781344,781347,781369,781372,781377,781416-781417,781423,782621-782622,782644,782646,782652,782669,782675,782677,782683,782694,782921,782925,782930,782936,783002,783004-783005,783042-783043,783239,783278,783304,783319-78332
 1,783324,783326,783330-783333,783337-783338,783340-783341,783343,783345-783346,783356,783359,783383,783386,783412,783435,783444,783447,783523,783688,783703,783708,783710,783719,783757,783759,783786,783809,784011,784013,784039,784058,784060-784061,784090-784091,784106,784108-784109,784111,784117-784120,784124,784163,784261,784680,784691,784696,784760,784824,785981,786003,786319,786680,787183,787219,787241,787942,787952,787964,787996,788002,788012-788013,788350-788351,788443,788446,788450,789245,789257,789270,789279,789307,789312,789324,789338,789347,789485,789986
+/jackrabbit/trunk:770143-773197,773483,773525-773554,773584,773588,773828,773835-775756,775833,775836,775840,775868,775981,775986,776036,776256,776310,776313,776321-776322,776332,776356-776357,776362,776373,776650-776693,776737,776757,776776-776777,777024,777029,777034,777478,777509,777541,777548,777936,778445,778613,778616,778621,778645,778720,778802,779032,779040,779068-779071,779074,779076,779081,779084,779086-779088,779090-779092,779094-779096,779101,779223,779225,779227-779228,779230,779233-779234,779460,779475-779476,779504,779550,779552,779555,779561,779563,779583,779590,779618,779621-779622,779624,779642,779654,779657-779659,779661,779936,780006,780010,780025,780085,780989,780993,781017,781051,781054,781294-781300,781305-781311,781318,781328,781338,781344,781347,781369,781372,781377,781416-781417,781423,782621-782622,782644,782646,782652,782669,782675,782677,782683,782694,782921,782925,782930,782936,783002,783004-783005,783042-783043,783239,783278,783304,783319-78332
 1,783324,783326,783330-783333,783337-783338,783340-783341,783343,783345-783346,783356,783359,783383,783386,783412,783435,783444,783447,783523,783688,783703,783708,783710,783719,783757,783759,783786,783809,784011,784013,784039,784058,784060-784061,784090-784091,784106,784108-784109,784111,784117-784120,784124,784163,784261,784680,784691,784696,784760,784824,785981,786003,786319,786680,787183,787219,787241,787942,787952,787964,787996,788002,788012-788013,788350-788351,788443,788446,788450,789245,789257,789270,789279,789307,789312,789324,789338,789347,789485,789629,789809,789986

Modified: jackrabbit/branches/1.x/jackrabbit-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.x/jackrabbit-core/pom.xml?rev=791848&r1=791847&r2=791848&view=diff
==============================================================================
--- jackrabbit/branches/1.x/jackrabbit-core/pom.xml (original)
+++ jackrabbit/branches/1.x/jackrabbit-core/pom.xml Tue Jul  7 14:44:23 2009
@@ -115,14 +115,15 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>rat-maven-plugin</artifactId>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
         <configuration>
           <excludes>
             <exclude>src/main/javadoc/**/*.uxf</exclude>
             <exclude>src/test/repository/**</exclude>
             <exclude>src/test/resources/**/*.txt</exclude>
             <exclude>src/test/resources/**/*.cnd</exclude>
+            <exclude>repository/**</exclude>
           </excludes>
         </configuration>
       </plugin>

Modified: jackrabbit/branches/1.x/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/db/DerbyDataStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.x/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/db/DerbyDataStore.java?rev=791848&r1=791847&r2=791848&view=diff
==============================================================================
--- jackrabbit/branches/1.x/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/db/DerbyDataStore.java
(original)
+++ jackrabbit/branches/1.x/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/db/DerbyDataStore.java
Tue Jul  7 14:44:23 2009
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.jackrabbit.core.data.db;
 
 import java.sql.DriverManager;

Modified: jackrabbit/branches/1.x/jackrabbit-jcr-tests/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.x/jackrabbit-jcr-tests/pom.xml?rev=791848&r1=791847&r2=791848&view=diff
==============================================================================
--- jackrabbit/branches/1.x/jackrabbit-jcr-tests/pom.xml (original)
+++ jackrabbit/branches/1.x/jackrabbit-jcr-tests/pom.xml Tue Jul  7 14:44:23 2009
@@ -50,8 +50,8 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>rat-maven-plugin</artifactId>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
         <configuration>
           <excludes>
             <exclude>**/nodetype/spec/*.txt</exclude>

Modified: jackrabbit/branches/1.x/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.x/jackrabbit-parent/pom.xml?rev=791848&r1=791847&r2=791848&view=diff
==============================================================================
--- jackrabbit/branches/1.x/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/branches/1.x/jackrabbit-parent/pom.xml Tue Jul  7 14:44:23 2009
@@ -30,48 +30,23 @@
   <parent>
     <groupId>org.apache.jackrabbit</groupId>
     <artifactId>parent</artifactId>
-    <version>2</version>
+    <version>3</version>
   </parent>
 
   <artifactId>jackrabbit-parent</artifactId>
   <name>Jackrabbit Parent POM</name>
   <version>1.6-SNAPSHOT</version>
   <packaging>pom</packaging>
-  <description>
-    Apache Jackrabbit is a fully conforming implementation of the
-    Content Repository for Java Technology API (JCR). A content
-    repository is a hierarchical content store with support for
-    structured and unstructured content, full text search, versioning,
-    transactions, observation, and more.
-  </description>
   <issueManagement>
     <system>Jira</system>
     <url>http://issues.apache.org/jira/browse/JCR</url>
   </issueManagement>
-  <inceptionYear>2004</inceptionYear>
 
   <properties>
     <slf4j.version>1.5.3</slf4j.version>
     <jetty.version>6.1.14</jetty.version>
   </properties>
 
-  <distributionManagement>
-    <repository>
-      <id>apache.releases.https</id>
-      <name>Apache Release Distribution Repository</name>
-      <url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
-    </repository>
-    <snapshotRepository>
-      <id>apache.snapshots.https</id>
-      <name>Apache Development Snapshot Repository</name>
-      <url>https://repository.apache.org/content/repositories/snapshots</url>
-    </snapshotRepository>
-  </distributionManagement>
-
-  <prerequisites>
-    <maven>2.0.9</maven>
-  </prerequisites>
-
   <build>
     <plugins>
       <!-- Use Java 1.4 everywhere -->
@@ -153,11 +128,6 @@
             </instructions>
           </configuration>
         </plugin>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>rat-maven-plugin</artifactId>
-          <version>1.0-alpha-3</version>
-        </plugin>
       </plugins>
     </pluginManagement>
   </build>
@@ -223,25 +193,6 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>with-rat</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>rat-maven-plugin</artifactId>
-            <executions>
-              <execution>
-                <phase>verify</phase>
-                  <goals>
-                    <goal>check</goal>
-                  </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
   </profiles>
 
   <dependencyManagement>

Modified: jackrabbit/branches/1.x/jackrabbit-spi-commons/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.x/jackrabbit-spi-commons/pom.xml?rev=791848&r1=791847&r2=791848&view=diff
==============================================================================
--- jackrabbit/branches/1.x/jackrabbit-spi-commons/pom.xml (original)
+++ jackrabbit/branches/1.x/jackrabbit-spi-commons/pom.xml Tue Jul  7 14:44:23 2009
@@ -108,8 +108,8 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>rat-maven-plugin</artifactId>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
         <configuration>
           <excludes>
             <exclude>src/main/javacc/xpath/*</exclude>

Modified: jackrabbit/branches/1.x/jackrabbit-spi2jcr/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.x/jackrabbit-spi2jcr/pom.xml?rev=791848&r1=791847&r2=791848&view=diff
==============================================================================
--- jackrabbit/branches/1.x/jackrabbit-spi2jcr/pom.xml (original)
+++ jackrabbit/branches/1.x/jackrabbit-spi2jcr/pom.xml Tue Jul  7 14:44:23 2009
@@ -76,8 +76,8 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>rat-maven-plugin</artifactId>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
         <configuration>
           <excludes>
             <exclude>src/test/resources/jaas.config</exclude>

Modified: jackrabbit/branches/1.x/jackrabbit-text-extractors/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.x/jackrabbit-text-extractors/pom.xml?rev=791848&r1=791847&r2=791848&view=diff
==============================================================================
--- jackrabbit/branches/1.x/jackrabbit-text-extractors/pom.xml (original)
+++ jackrabbit/branches/1.x/jackrabbit-text-extractors/pom.xml Tue Jul  7 14:44:23 2009
@@ -49,8 +49,8 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>rat-maven-plugin</artifactId>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
         <configuration>
           <excludes>
             <exclude>**/*.rtf</exclude>

Modified: jackrabbit/branches/1.x/jackrabbit-webapp/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.x/jackrabbit-webapp/pom.xml?rev=791848&r1=791847&r2=791848&view=diff
==============================================================================
--- jackrabbit/branches/1.x/jackrabbit-webapp/pom.xml (original)
+++ jackrabbit/branches/1.x/jackrabbit-webapp/pom.xml Tue Jul  7 14:44:23 2009
@@ -160,8 +160,8 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>rat-maven-plugin</artifactId>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
         <configuration>
           <excludes>
             <exclude>src/main/webapp/WEB-INF/log4j.dtd</exclude>



Mime
View raw message