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 05:06:28 UTC
svn commit: r1675762 - in /ofbiz/branches/OFBIZ-6271/framework: base/pom.xml
catalina/pom.xml entity/pom.xml geronimo/pom.xml
Author: doogie
Date: Fri Apr 24 03:06:27 2015
New Revision: 1675762
URL: http://svn.apache.org/r1675762
Log:
Real dependencies are now being specified, instead of just wildcards.
This is a major milestone. Everything compiles upto this point(tests
included). The unit tests are also running.
Notingly, the list of dependencies needed to compile and run tests is
much less than the number of jars actually in each of the lib folders(of
the components that have been converted, that is).
Modified:
ofbiz/branches/OFBIZ-6271/framework/base/pom.xml
ofbiz/branches/OFBIZ-6271/framework/catalina/pom.xml
ofbiz/branches/OFBIZ-6271/framework/entity/pom.xml
ofbiz/branches/OFBIZ-6271/framework/geronimo/pom.xml
Modified: ofbiz/branches/OFBIZ-6271/framework/base/pom.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-6271/framework/base/pom.xml?rev=1675762&r1=1675761&r2=1675762&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-6271/framework/base/pom.xml (original)
+++ ofbiz/branches/OFBIZ-6271/framework/base/pom.xml Fri Apr 24 03:06:27 2015
@@ -29,7 +29,6 @@ under the License.
<artifactId>ofbiz-base</artifactId>
<dependencies>
- <!-- internal dependencies -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>ofbiz-start</artifactId>
@@ -37,32 +36,121 @@ under the License.
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ofbiz-base-lib</artifactId>
- <version>TRUNK</version>
- <type>pom</type>
- <scope>provided</scope>
+ <groupId>apache-oro</groupId>
+ <artifactId>oro</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ofbiz-base-lib-commons</artifactId>
- <version>TRUNK</version>
- <type>pom</type>
- <scope>provided</scope>
+ <groupId>bsf</groupId>
+ <artifactId>bsf</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ofbiz-base-lib-j2eespecs</artifactId>
- <version>TRUNK</version>
- <type>pom</type>
- <scope>provided</scope>
+ <groupId>bsh</groupId>
+ <artifactId>bsh</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ofbiz-base-lib-scripting</artifactId>
- <version>TRUNK</version>
- <type>pom</type>
- <scope>provided</scope>
+ <groupId>bsh</groupId>
+ <artifactId>bsh-engine-modified</artifactId>
+ <!--<scope>test</scope>-->
+ </dependency>
+ <dependency>
+ <groupId>clhm</groupId>
+ <artifactId>clhm-release-lru</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-validator</groupId>
+ <artifactId>commons-validator</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>esapi</groupId>
+ <artifactId>esapi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>groovy-all</groupId>
+ <artifactId>groovy-all</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>hamcrest-all</groupId>
+ <artifactId>hamcrest-all</artifactId>
+ <!--<scope>test</scope>-->
+ </dependency>
+ <dependency>
+ <groupId>icu4j</groupId>
+ <artifactId>icu4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jackson</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <!--<scope>test</scope>-->
+ </dependency>
+ <dependency>
+ <groupId>jackson</groupId>
+ <artifactId>jackson-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jackson</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jdbm</groupId>
+ <artifactId>jdbm</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>juel-impl</groupId>
+ <artifactId>juel-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit-dep</artifactId>
+ <!--<scope>test</scope>-->
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <!--<scope>test</scope>-->
+ </dependency>
+ <dependency>
+ <groupId>nekohtml</groupId>
+ <artifactId>nekohtml</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xerces</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xstream</groupId>
+ <artifactId>xstream</artifactId>
</dependency>
</dependencies>
<build>
Modified: ofbiz/branches/OFBIZ-6271/framework/catalina/pom.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-6271/framework/catalina/pom.xml?rev=1675762&r1=1675761&r2=1675762&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-6271/framework/catalina/pom.xml (original)
+++ ofbiz/branches/OFBIZ-6271/framework/catalina/pom.xml Fri Apr 24 03:06:27 2015
@@ -29,51 +29,63 @@ under the License.
<artifactId>ofbiz-catalina</artifactId>
<dependencies>
- <!--
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>ofbiz-base-lib-commons</artifactId>
+ <artifactId>ofbiz-start</artifactId>
<version>TRUNK</version>
- <type>pom</type>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>ofbiz-base-lib-j2eespecs</artifactId>
+ <artifactId>ofbiz-base</artifactId>
<version>TRUNK</version>
- <type>pom</type>
+ <scope>provided</scope>
</dependency>
--->
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>ofbiz-catalina-lib</artifactId>
+ <artifactId>ofbiz-entity</artifactId>
<version>TRUNK</version>
- <type>pom</type>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ofbiz-base-lib-j2eespecs</artifactId>
- <version>TRUNK</version>
- <type>pom</type>
- <scope>provided</scope>
+ <groupId>apache-tomcat</groupId>
+ <artifactId>catalina</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ofbiz-start</artifactId>
- <version>TRUNK</version>
- <scope>provided</scope>
+ <groupId>apache-tomcat</groupId>
+ <artifactId>catalina-ha</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ofbiz-base</artifactId>
- <version>TRUNK</version>
- <scope>provided</scope>
+ <groupId>apache-tomcat</groupId>
+ <artifactId>catalina-tribes</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ofbiz-entity</artifactId>
- <version>TRUNK</version>
- <scope>provided</scope>
+ <groupId>apache-tomcat</groupId>
+ <artifactId>jasper</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>apache-tomcat</groupId>
+ <artifactId>tomcat-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>apache-tomcat</groupId>
+ <artifactId>tomcat-coyote</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>apache-tomcat</groupId>
+ <artifactId>tomcat-util</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>apache-tomcat-extras</groupId>
+ <artifactId>tomcat-juli-adapters</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>apache-tomcat-extras</groupId>
+ <artifactId>tomcat-juli</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>ecj</groupId>
+ <artifactId>ecj</artifactId>
</dependency>
</dependencies>
</project>
Modified: ofbiz/branches/OFBIZ-6271/framework/entity/pom.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-6271/framework/entity/pom.xml?rev=1675762&r1=1675761&r2=1675762&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-6271/framework/entity/pom.xml (original)
+++ ofbiz/branches/OFBIZ-6271/framework/entity/pom.xml Fri Apr 24 03:06:27 2015
@@ -31,44 +31,29 @@ under the License.
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>ofbiz-base-lib</artifactId>
+ <artifactId>ofbiz-base</artifactId>
<version>TRUNK</version>
- <type>pom</type>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ofbiz-base-lib-commons</artifactId>
- <version>TRUNK</version>
- <type>pom</type>
- <scope>provided</scope>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ofbiz-base-lib-j2eespecs</artifactId>
- <version>TRUNK</version>
- <type>pom</type>
- <scope>provided</scope>
+ <groupId>commons-dbcp2</groupId>
+ <artifactId>commons-dbcp2</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ofbiz-base-lib-scripting</artifactId>
- <version>TRUNK</version>
- <type>pom</type>
- <scope>provided</scope>
+ <groupId>commons-pool2</groupId>
+ <artifactId>commons-pool2</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ofbiz-base</artifactId>
- <version>TRUNK</version>
- <scope>provided</scope>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-jta</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ofbiz-entity-lib</artifactId>
- <version>TRUNK</version>
- <type>pom</type>
- <scope>provided</scope>
+ <groupId>javolution</groupId>
+ <artifactId>javolution</artifactId>
</dependency>
</dependencies>
</project>
Modified: ofbiz/branches/OFBIZ-6271/framework/geronimo/pom.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-6271/framework/geronimo/pom.xml?rev=1675762&r1=1675761&r2=1675762&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-6271/framework/geronimo/pom.xml (original)
+++ ofbiz/branches/OFBIZ-6271/framework/geronimo/pom.xml Fri Apr 24 03:06:27 2015
@@ -31,20 +31,6 @@ under the License.
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>ofbiz-geronimo-lib</artifactId>
- <version>TRUNK</version>
- <type>pom</type>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ofbiz-base-lib-j2eespecs</artifactId>
- <version>TRUNK</version>
- <type>pom</type>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>ofbiz-base</artifactId>
<version>TRUNK</version>
<scope>provided</scope>
@@ -55,5 +41,9 @@ under the License.
<version>TRUNK</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-transaction</artifactId>
+ </dependency>
</dependencies>
</project>
Re: svn commit: r1675762 - in /ofbiz/branches/OFBIZ-6271/framework:
base/pom.xml catalina/pom.xml entity/pom.xml geronimo/pom.xml
Posted by Adam Heath <do...@brainfood.com>.
On 04/23/2015 10:13 PM, Adam Heath wrote:
> Replying to my own commit; this is a major milestone, as mentioned in
> the commit log.
>
Self replying again. Note, that everything that is in this branch is
only a week old. I have only been working with maven directly for that
time. Just *1* week. My previous interactions were:
* download random software to solve a problem off the net; it uses
maven? OMG! Run away!
* A few months ago, a subcontractor configured a guilius/guice based
test system, which used maven. It worked, but was a black box. I'm not
actually involved in that project, so it wasn't such a big deal.
Anyone saying maven is difficult to figure out will need to consider
that it actually isn't, once you get past the inertia.
Re: svn commit: r1675762 - in /ofbiz/branches/OFBIZ-6271/framework:
base/pom.xml catalina/pom.xml entity/pom.xml geronimo/pom.xml
Posted by Adam Heath <do...@brainfood.com>.
Replying to my own commit; this is a major milestone, as mentioned in
the commit log.
Internal and external components can still make use of the wildcard
includes on the lib folders; there is no current example in this branch
that shows this, however.
Once all this conversion is done, the top-level NOTICE that was
hand-created can be reduced to a fraction of its size. The way it would
work in the future, is each of the depended-upon artifacts would have a
license defined in its respective pom; such license metadata can then be
extracted, along with the description and file name, and auto-assembled
into a full NOTICE that is added into the built jars.
I have not started any of that, as I still need to add correct metadata
to the top-level pom, and have much more conversion to do. But progress
seems to be going quite well.
ps: I have security, service, entityext, minilang, webapp, and widget
converted locally. I need to retool them to do proper dependency
referencing, so they aren't ready to commit yet.
On 04/23/2015 10:06 PM, doogie@apache.org wrote:
> Author: doogie
> Date: Fri Apr 24 03:06:27 2015
> New Revision: 1675762
>
> URL: http://svn.apache.org/r1675762
> Log:
> Real dependencies are now being specified, instead of just wildcards.
> This is a major milestone. Everything compiles upto this point(tests
> included). The unit tests are also running.
>
> Notingly, the list of dependencies needed to compile and run tests is
> much less than the number of jars actually in each of the lib folders(of
> the components that have been converted, that is).
>
> Modified:
> ofbiz/branches/OFBIZ-6271/framework/base/pom.xml
> ofbiz/branches/OFBIZ-6271/framework/catalina/pom.xml
> ofbiz/branches/OFBIZ-6271/framework/entity/pom.xml
> ofbiz/branches/OFBIZ-6271/framework/geronimo/pom.xml
>
> Modified: ofbiz/branches/OFBIZ-6271/framework/base/pom.xml
> URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-6271/framework/base/pom.xml?rev=1675762&r1=1675761&r2=1675762&view=diff
> ==============================================================================
> --- ofbiz/branches/OFBIZ-6271/framework/base/pom.xml (original)
> +++ ofbiz/branches/OFBIZ-6271/framework/base/pom.xml Fri Apr 24 03:06:27 2015
> @@ -29,7 +29,6 @@ under the License.
> <artifactId>ofbiz-base</artifactId>
>
> <dependencies>
> - <!-- internal dependencies -->
> <dependency>
> <groupId>${project.groupId}</groupId>
> <artifactId>ofbiz-start</artifactId>
> @@ -37,32 +36,121 @@ under the License.
> <scope>provided</scope>
> </dependency>
> <dependency>
> - <groupId>${project.groupId}</groupId>
> - <artifactId>ofbiz-base-lib</artifactId>
> - <version>TRUNK</version>
> - <type>pom</type>
> - <scope>provided</scope>
> + <groupId>apache-oro</groupId>
> + <artifactId>oro</artifactId>
> </dependency>
> <dependency>
> - <groupId>${project.groupId}</groupId>
> - <artifactId>ofbiz-base-lib-commons</artifactId>
> - <version>TRUNK</version>
> - <type>pom</type>
> - <scope>provided</scope>
> + <groupId>bsf</groupId>
> + <artifactId>bsf</artifactId>
> </dependency>
> <dependency>
> - <groupId>${project.groupId}</groupId>
> - <artifactId>ofbiz-base-lib-j2eespecs</artifactId>
> - <version>TRUNK</version>
> - <type>pom</type>
> - <scope>provided</scope>
> + <groupId>bsh</groupId>
> + <artifactId>bsh</artifactId>
> </dependency>
> <dependency>
> - <groupId>${project.groupId}</groupId>
> - <artifactId>ofbiz-base-lib-scripting</artifactId>
> - <version>TRUNK</version>
> - <type>pom</type>
> - <scope>provided</scope>
> + <groupId>bsh</groupId>
> + <artifactId>bsh-engine-modified</artifactId>
> + <!--<scope>test</scope>-->
> + </dependency>
> + <dependency>
> + <groupId>clhm</groupId>
> + <artifactId>clhm-release-lru</artifactId>
> + </dependency>
> + <dependency>
> + <groupId>commons-io</groupId>
> + <artifactId>commons-io</artifactId>
> + </dependency>
> + <dependency>
> + <groupId>commons-codec</groupId>
> + <artifactId>commons-codec</artifactId>
> + </dependency>
> + <dependency>
> + <groupId>commons-lang</groupId>
> + <artifactId>commons-lang</artifactId>
> + </dependency>
> + <dependency>
> + <groupId>commons-validator</groupId>
> + <artifactId>commons-validator</artifactId>
> + </dependency>
> + <dependency>
> + <groupId>esapi</groupId>
> + <artifactId>esapi</artifactId>
> + </dependency>
> + <dependency>
> + <groupId>freemarker</groupId>
> + <artifactId>freemarker</artifactId>
> + </dependency>
> + <dependency>
> + <groupId>groovy-all</groupId>
> + <artifactId>groovy-all</artifactId>
> + </dependency>
> + <dependency>
> + <groupId>hamcrest-all</groupId>
> + <artifactId>hamcrest-all</artifactId>
> + <!--<scope>test</scope>-->
> + </dependency>
> + <dependency>
> + <groupId>icu4j</groupId>
> + <artifactId>icu4j</artifactId>
> + </dependency>
> + <dependency>
> + <groupId>jackson</groupId>
> + <artifactId>jackson-annotations</artifactId>
> + <!--<scope>test</scope>-->
> + </dependency>
> + <dependency>
> + <groupId>jackson</groupId>
> + <artifactId>jackson-core</artifactId>
> + </dependency>
> + <dependency>
> + <groupId>jackson</groupId>
> + <artifactId>jackson-databind</artifactId>
> + </dependency>
> + <dependency>
> + <groupId>javax.el</groupId>
> + <artifactId>el-api</artifactId>
> + </dependency>
> + <dependency>
> + <groupId>javax.servlet</groupId>
> + <artifactId>servlet-api</artifactId>
> + </dependency>
> + <dependency>
> + <groupId>jdbm</groupId>
> + <artifactId>jdbm</artifactId>
> + </dependency>
> + <dependency>
> + <groupId>juel-impl</groupId>
> + <artifactId>juel-impl</artifactId>
> + </dependency>
> + <dependency>
> + <groupId>junit</groupId>
> + <artifactId>junit-dep</artifactId>
> + <!--<scope>test</scope>-->
> + </dependency>
> + <dependency>
> + <groupId>log4j</groupId>
> + <artifactId>log4j-api</artifactId>
> + </dependency>
> + <dependency>
> + <groupId>log4j</groupId>
> + <artifactId>log4j-core</artifactId>
> + <!--<scope>test</scope>-->
> + </dependency>
> + <dependency>
> + <groupId>nekohtml</groupId>
> + <artifactId>nekohtml</artifactId>
> + </dependency>
> + <dependency>
> + <groupId>xerces</groupId>
> + <artifactId>xerces</artifactId>
> + </dependency>
> + <dependency>
> + <groupId>xpp3</groupId>
> + <artifactId>xpp3</artifactId>
> + </dependency>
> + <dependency>
> + <groupId>xstream</groupId>
> + <artifactId>xstream</artifactId>
> </dependency>
> </dependencies>
> <build>
>
> Modified: ofbiz/branches/OFBIZ-6271/framework/catalina/pom.xml
> URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-6271/framework/catalina/pom.xml?rev=1675762&r1=1675761&r2=1675762&view=diff
> ==============================================================================
> --- ofbiz/branches/OFBIZ-6271/framework/catalina/pom.xml (original)
> +++ ofbiz/branches/OFBIZ-6271/framework/catalina/pom.xml Fri Apr 24 03:06:27 2015
> @@ -29,51 +29,63 @@ under the License.
> <artifactId>ofbiz-catalina</artifactId>
>
> <dependencies>
> - <!--
> <dependency>
> <groupId>${project.groupId}</groupId>
> - <artifactId>ofbiz-base-lib-commons</artifactId>
> + <artifactId>ofbiz-start</artifactId>
> <version>TRUNK</version>
> - <type>pom</type>
> + <scope>provided</scope>
> </dependency>
> <dependency>
> <groupId>${project.groupId}</groupId>
> - <artifactId>ofbiz-base-lib-j2eespecs</artifactId>
> + <artifactId>ofbiz-base</artifactId>
> <version>TRUNK</version>
> - <type>pom</type>
> + <scope>provided</scope>
> </dependency>
> --->
> <dependency>
> <groupId>${project.groupId}</groupId>
> - <artifactId>ofbiz-catalina-lib</artifactId>
> + <artifactId>ofbiz-entity</artifactId>
> <version>TRUNK</version>
> - <type>pom</type>
> <scope>provided</scope>
> </dependency>
> <dependency>
> - <groupId>${project.groupId}</groupId>
> - <artifactId>ofbiz-base-lib-j2eespecs</artifactId>
> - <version>TRUNK</version>
> - <type>pom</type>
> - <scope>provided</scope>
> + <groupId>apache-tomcat</groupId>
> + <artifactId>catalina</artifactId>
> </dependency>
> <dependency>
> - <groupId>${project.groupId}</groupId>
> - <artifactId>ofbiz-start</artifactId>
> - <version>TRUNK</version>
> - <scope>provided</scope>
> + <groupId>apache-tomcat</groupId>
> + <artifactId>catalina-ha</artifactId>
> </dependency>
> <dependency>
> - <groupId>${project.groupId}</groupId>
> - <artifactId>ofbiz-base</artifactId>
> - <version>TRUNK</version>
> - <scope>provided</scope>
> + <groupId>apache-tomcat</groupId>
> + <artifactId>catalina-tribes</artifactId>
> </dependency>
> <dependency>
> - <groupId>${project.groupId}</groupId>
> - <artifactId>ofbiz-entity</artifactId>
> - <version>TRUNK</version>
> - <scope>provided</scope>
> + <groupId>apache-tomcat</groupId>
> + <artifactId>jasper</artifactId>
> + </dependency>
> + <dependency>
> + <groupId>apache-tomcat</groupId>
> + <artifactId>tomcat-api</artifactId>
> + </dependency>
> + <dependency>
> + <groupId>apache-tomcat</groupId>
> + <artifactId>tomcat-coyote</artifactId>
> + </dependency>
> + <dependency>
> + <groupId>apache-tomcat</groupId>
> + <artifactId>tomcat-util</artifactId>
> + </dependency>
> + <dependency>
> + <groupId>apache-tomcat-extras</groupId>
> + <artifactId>tomcat-juli-adapters</artifactId>
> + </dependency>
> + <dependency>
> + <groupId>apache-tomcat-extras</groupId>
> + <artifactId>tomcat-juli</artifactId>
> + </dependency>
> + <dependency>
> + <groupId>ecj</groupId>
> + <artifactId>ecj</artifactId>
> </dependency>
> </dependencies>
> </project>
>
> Modified: ofbiz/branches/OFBIZ-6271/framework/entity/pom.xml
> URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-6271/framework/entity/pom.xml?rev=1675762&r1=1675761&r2=1675762&view=diff
> ==============================================================================
> --- ofbiz/branches/OFBIZ-6271/framework/entity/pom.xml (original)
> +++ ofbiz/branches/OFBIZ-6271/framework/entity/pom.xml Fri Apr 24 03:06:27 2015
> @@ -31,44 +31,29 @@ under the License.
> <dependencies>
> <dependency>
> <groupId>${project.groupId}</groupId>
> - <artifactId>ofbiz-base-lib</artifactId>
> + <artifactId>ofbiz-base</artifactId>
> <version>TRUNK</version>
> - <type>pom</type>
> <scope>provided</scope>
> </dependency>
> <dependency>
> - <groupId>${project.groupId}</groupId>
> - <artifactId>ofbiz-base-lib-commons</artifactId>
> - <version>TRUNK</version>
> - <type>pom</type>
> - <scope>provided</scope>
> + <groupId>commons-collections</groupId>
> + <artifactId>commons-collections</artifactId>
> </dependency>
> <dependency>
> - <groupId>${project.groupId}</groupId>
> - <artifactId>ofbiz-base-lib-j2eespecs</artifactId>
> - <version>TRUNK</version>
> - <type>pom</type>
> - <scope>provided</scope>
> + <groupId>commons-dbcp2</groupId>
> + <artifactId>commons-dbcp2</artifactId>
> </dependency>
> <dependency>
> - <groupId>${project.groupId}</groupId>
> - <artifactId>ofbiz-base-lib-scripting</artifactId>
> - <version>TRUNK</version>
> - <type>pom</type>
> - <scope>provided</scope>
> + <groupId>commons-pool2</groupId>
> + <artifactId>commons-pool2</artifactId>
> </dependency>
> <dependency>
> - <groupId>${project.groupId}</groupId>
> - <artifactId>ofbiz-base</artifactId>
> - <version>TRUNK</version>
> - <scope>provided</scope>
> + <groupId>geronimo</groupId>
> + <artifactId>geronimo-jta</artifactId>
> </dependency>
> <dependency>
> - <groupId>${project.groupId}</groupId>
> - <artifactId>ofbiz-entity-lib</artifactId>
> - <version>TRUNK</version>
> - <type>pom</type>
> - <scope>provided</scope>
> + <groupId>javolution</groupId>
> + <artifactId>javolution</artifactId>
> </dependency>
> </dependencies>
> </project>
>
> Modified: ofbiz/branches/OFBIZ-6271/framework/geronimo/pom.xml
> URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-6271/framework/geronimo/pom.xml?rev=1675762&r1=1675761&r2=1675762&view=diff
> ==============================================================================
> --- ofbiz/branches/OFBIZ-6271/framework/geronimo/pom.xml (original)
> +++ ofbiz/branches/OFBIZ-6271/framework/geronimo/pom.xml Fri Apr 24 03:06:27 2015
> @@ -31,20 +31,6 @@ under the License.
> <dependencies>
> <dependency>
> <groupId>${project.groupId}</groupId>
> - <artifactId>ofbiz-geronimo-lib</artifactId>
> - <version>TRUNK</version>
> - <type>pom</type>
> - <scope>provided</scope>
> - </dependency>
> - <dependency>
> - <groupId>${project.groupId}</groupId>
> - <artifactId>ofbiz-base-lib-j2eespecs</artifactId>
> - <version>TRUNK</version>
> - <type>pom</type>
> - <scope>provided</scope>
> - </dependency>
> - <dependency>
> - <groupId>${project.groupId}</groupId>
> <artifactId>ofbiz-base</artifactId>
> <version>TRUNK</version>
> <scope>provided</scope>
> @@ -55,5 +41,9 @@ under the License.
> <version>TRUNK</version>
> <scope>provided</scope>
> </dependency>
> + <dependency>
> + <groupId>geronimo</groupId>
> + <artifactId>geronimo-transaction</artifactId>
> + </dependency>
> </dependencies>
> </project>
>
>