You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by do...@apache.org on 2015/04/24 20:04:11 UTC

svn commit: r1675921 - in /ofbiz/branches/OFBIZ-6271: framework/pom.xml framework/testtools/lib/pom.xml framework/testtools/pom.xml pom.xml

Author: doogie
Date: Fri Apr 24 18:04:11 2015
New Revision: 1675921

URL: http://svn.apache.org/r1675921
Log:
Add a pom.xml to framework/testtools/lib and framework/testtools.

Note, that this has a dependency on ant; I was hoping I wouldn't have to
add that dep in from framework/base/lib, but I was mistaken.  It might
be nice to investigate this and see if there is some kind of replacement
mechanism that could be used.

Added:
    ofbiz/branches/OFBIZ-6271/framework/testtools/lib/pom.xml
      - copied, changed from r1675920, ofbiz/branches/OFBIZ-6271/framework/pom.xml
    ofbiz/branches/OFBIZ-6271/framework/testtools/pom.xml
Modified:
    ofbiz/branches/OFBIZ-6271/framework/pom.xml
    ofbiz/branches/OFBIZ-6271/pom.xml

Modified: ofbiz/branches/OFBIZ-6271/framework/pom.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-6271/framework/pom.xml?rev=1675921&r1=1675920&r2=1675921&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-6271/framework/pom.xml (original)
+++ ofbiz/branches/OFBIZ-6271/framework/pom.xml Fri Apr 24 18:04:11 2015
@@ -53,5 +53,7 @@ under the License.
     <module>widget</module>
     <module>common</module>
     <module>datafile</module>
+    <module>testtools/lib</module>
+    <module>testtools</module>
   </modules>
 </project>

Copied: ofbiz/branches/OFBIZ-6271/framework/testtools/lib/pom.xml (from r1675920, ofbiz/branches/OFBIZ-6271/framework/pom.xml)
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-6271/framework/testtools/lib/pom.xml?p2=ofbiz/branches/OFBIZ-6271/framework/testtools/lib/pom.xml&p1=ofbiz/branches/OFBIZ-6271/framework/pom.xml&r1=1675920&r2=1675921&rev=1675921&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-6271/framework/pom.xml (original)
+++ ofbiz/branches/OFBIZ-6271/framework/testtools/lib/pom.xml Fri Apr 24 18:04:11 2015
@@ -24,34 +24,19 @@ under the License.
     <groupId>org.apache.ofbiz</groupId>
     <artifactId>ofbiz-parent</artifactId>
     <version>TRUNK</version>
-    <relativePath>../pom.xml</relativePath>
+    <relativePath>../../../pom.xml</relativePath>
   </parent>
-  <artifactId>ofbiz-framework</artifactId>
+  <artifactId>ofbiz-testtools-lib</artifactId>
   <packaging>pom</packaging>
 
-  <modules>
-    <module>start</module>
-    <module>base/lib</module>
-    <module>base/lib/commons</module>
-    <module>base/lib/j2eespecs</module>
-    <module>base/lib/scripting</module>
-    <module>base</module>
-    <module>entity/lib</module>
-    <module>entity/lib/jdbc</module>
-    <module>entity</module>
-    <module>geronimo/lib</module>
-    <module>geronimo</module>
-    <module>catalina/lib</module>
-    <module>catalina</module>
-    <module>security</module>
-    <module>service/lib</module>
-    <module>service</module>
-    <module>entityext</module>
-    <module>minilang</module>
-    <module>webapp/lib</module>
-    <module>webapp</module>
-    <module>widget</module>
-    <module>common</module>
-    <module>datafile</module>
-  </modules>
+  <dependencies>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>org.springframework.core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>org.springframework.test</artifactId>
+    </dependency>
+  </dependencies>
 </project>

Added: ofbiz/branches/OFBIZ-6271/framework/testtools/pom.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-6271/framework/testtools/pom.xml?rev=1675921&view=auto
==============================================================================
--- ofbiz/branches/OFBIZ-6271/framework/testtools/pom.xml (added)
+++ ofbiz/branches/OFBIZ-6271/framework/testtools/pom.xml Fri Apr 24 18:04:11 2015
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.ofbiz</groupId>
+    <artifactId>ofbiz-component</artifactId>
+    <version>TRUNK</version>
+    <relativePath>../../ofbiz-component-pom.xml</relativePath>
+  </parent>
+  <artifactId>ofbiz-testtools</artifactId>
+
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>ofbiz-base</artifactId>
+      <version>TRUNK</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>ofbiz-entity</artifactId>
+      <version>TRUNK</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>ofbiz-security</artifactId>
+      <version>TRUNK</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>ofbiz-service</artifactId>
+      <version>TRUNK</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>ofbiz-minilang</artifactId>
+      <version>TRUNK</version>
+    </dependency>
+    <dependency>
+      <groupId>apache-ant</groupId>
+      <artifactId>ant</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>apache-ant</groupId>
+      <artifactId>ant-junit</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit-dep</artifactId>
+    </dependency>
+    <!--
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>org.springframework.core</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    -->
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>org.springframework.test</artifactId>
+    </dependency>
+  </dependencies>
+</project>

Modified: ofbiz/branches/OFBIZ-6271/pom.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-6271/pom.xml?rev=1675921&r1=1675920&r2=1675921&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-6271/pom.xml (original)
+++ ofbiz/branches/OFBIZ-6271/pom.xml Fri Apr 24 18:04:11 2015
@@ -35,9 +35,21 @@ under the License.
   <dependencyManagement>
     <dependencies>
       <!-- framework/base/lib -->
+      <dependency>
+        <groupId>apache-ant</groupId>
+        <artifactId>ant</artifactId>
+        <version>1.9.0</version>
+        <scope>system</scope>
+        <systemPath>${user.dir}/framework/base/lib/ant-1.9.0-ant.jar</systemPath>
+      </dependency>
+      <dependency>
+        <groupId>apache-ant</groupId>
+        <artifactId>ant-junit</artifactId>
+        <version>1.9.0</version>
+        <scope>system</scope>
+        <systemPath>${user.dir}/framework/base/lib/ant-1.9.0-ant-junit.jar</systemPath>
+      </dependency>
       <!--
-      ant-1.9.0-ant.jar
-      ant-1.9.0-ant-junit.jar
       ant-1.9.0-ant-launcher.jar
       -->
       <dependency>
@@ -789,6 +801,22 @@ under the License.
         <scope>system</scope>
         <systemPath>${user.dir}/framework/webapp/lib/rome-0.9.jar</systemPath>
       </dependency>
+
+      <!-- framework/testtools/lib -->
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>org.springframework.core</artifactId>
+        <version>3.1.0.M2</version>
+        <scope>system</scope>
+        <systemPath>${user.dir}/framework/testtools/lib/org.springframework.core-3.1.0.M2.jar</systemPath>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>org.springframework.test</artifactId>
+        <version>3.1.0.M2</version>
+        <scope>system</scope>
+        <systemPath>${user.dir}/framework/testtools/lib/org.springframework.test-3.1.0.M2.jar</systemPath>
+      </dependency>
     </dependencies>
   </dependencyManagement>