Author: doogie
Date: Fri Apr 24 03:05:55 2015
New Revision: 1675757
URL: http://svn.apache.org/r1675757
Log:
Update all the poms, so that the things they depend on are *not*
included when each pom is itself made a dependant. This is not the
officially sanctioned maven way, but is a stop-gap measure while
integration takes place.
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=1675757&r1=1675756&r2=1675757&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-6271/framework/base/pom.xml (original)
+++ ofbiz/branches/OFBIZ-6271/framework/base/pom.xml Fri Apr 24 03:05:55 2015
@@ -34,30 +34,35 @@ under the License.
<groupId>${project.groupId}</groupId>
<artifactId>ofbiz-start</artifactId>
<version>TRUNK</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>ofbiz-base-lib</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>
</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-lib-scripting</artifactId>
<version>TRUNK</version>
<type>pom</type>
+ <scope>provided</scope>
</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=1675757&r1=1675756&r2=1675757&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-6271/framework/catalina/pom.xml (original)
+++ ofbiz/branches/OFBIZ-6271/framework/catalina/pom.xml Fri Apr 24 03:05:55
2015
@@ -48,16 +48,32 @@ under the License.
<artifactId>ofbiz-catalina-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-start</artifactId>
+ <version>TRUNK</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>ofbiz-base</artifactId>
<version>TRUNK</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>ofbiz-entity</artifactId>
<version>TRUNK</version>
+ <scope>provided</scope>
</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=1675757&r1=1675756&r2=1675757&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-6271/framework/entity/pom.xml (original)
+++ ofbiz/branches/OFBIZ-6271/framework/entity/pom.xml Fri Apr 24 03:05:55 2015
@@ -31,26 +31,44 @@ under the License.
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>ofbiz-base-lib</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>
</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-lib-scripting</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>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>ofbiz-entity-lib</artifactId>
<version>TRUNK</version>
<type>pom</type>
+ <scope>provided</scope>
</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=1675757&r1=1675756&r2=1675757&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-6271/framework/geronimo/pom.xml (original)
+++ ofbiz/branches/OFBIZ-6271/framework/geronimo/pom.xml Fri Apr 24 03:05:55
2015
@@ -34,16 +34,26 @@ under the License.
<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>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>ofbiz-entity</artifactId>
<version>TRUNK</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
</project>
