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 ju...@apache.org on 2012/06/01 17:50:11 UTC

svn commit: r1345256 - in /jackrabbit/oak/trunk: oak-core/ oak-core/src/test/resources/org/apache/jackrabbit/oak/util/ oak-mk/ oak-mk/src/test/resources/org/apache/jackrabbit/mk/json/

Author: jukka
Date: Fri Jun  1 15:50:11 2012
New Revision: 1345256

URL: http://svn.apache.org/viewvc?rev=1345256&view=rev
Log:
OAK-77: Consolidate Utilities

Move test.json file to go with the moved test case

Added:
    jackrabbit/oak/trunk/oak-core/src/test/resources/org/apache/jackrabbit/oak/util/
    jackrabbit/oak/trunk/oak-core/src/test/resources/org/apache/jackrabbit/oak/util/test.json
      - copied, changed from r1345255, jackrabbit/oak/trunk/oak-mk/src/test/resources/org/apache/jackrabbit/mk/json/test.json
Removed:
    jackrabbit/oak/trunk/oak-mk/src/test/resources/org/apache/jackrabbit/mk/json/test.json
Modified:
    jackrabbit/oak/trunk/oak-core/pom.xml
    jackrabbit/oak/trunk/oak-mk/pom.xml

Modified: jackrabbit/oak/trunk/oak-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/pom.xml?rev=1345256&r1=1345255&r2=1345256&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-core/pom.xml Fri Jun  1 15:50:11 2012
@@ -65,6 +65,9 @@
           <groupId>org.apache.rat</groupId>
           <artifactId>apache-rat-plugin</artifactId>
           <configuration>
+            <excludes>
+              <exclude>src/test/resources/org/apache/jackrabbit/oak/util/test.json</exclude>
+            </excludes>
           </configuration>
         </plugin>
       </plugins>

Copied: jackrabbit/oak/trunk/oak-core/src/test/resources/org/apache/jackrabbit/oak/util/test.json (from r1345255, jackrabbit/oak/trunk/oak-mk/src/test/resources/org/apache/jackrabbit/mk/json/test.json)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/resources/org/apache/jackrabbit/oak/util/test.json?p2=jackrabbit/oak/trunk/oak-core/src/test/resources/org/apache/jackrabbit/oak/util/test.json&p1=jackrabbit/oak/trunk/oak-mk/src/test/resources/org/apache/jackrabbit/mk/json/test.json&r1=1345255&r2=1345256&rev=1345256&view=diff
==============================================================================
    (empty)

Modified: jackrabbit/oak/trunk/oak-mk/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/pom.xml?rev=1345256&r1=1345255&r2=1345256&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-mk/pom.xml Fri Jun  1 15:50:11 2012
@@ -55,19 +55,6 @@
         <artifactId>maven-scr-plugin</artifactId>
       </plugin>
     </plugins>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.rat</groupId>
-          <artifactId>apache-rat-plugin</artifactId>
-          <configuration>
-            <excludes>
-              <exclude>src/test/resources/org/apache/jackrabbit/mk/json/test.json</exclude>
-            </excludes>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
   </build>
 
   <dependencies>