Author: doogie
Date: Fri May 1 00:15:07 2015
New Revision: 1677084
URL: http://svn.apache.org/r1677084
Log:
Rework the optional dependencies, so that it actually works, when the
files don't exist. I'm not super happy with this method.
Modified:
ofbiz/branches/OFBIZ-6271/applications/accounting/pom.xml
ofbiz/branches/OFBIZ-6271/applications/product/pom.xml
ofbiz/branches/OFBIZ-6271/pom.xml
ofbiz/branches/OFBIZ-6271/poms/component-pom.xml
Modified: ofbiz/branches/OFBIZ-6271/applications/accounting/pom.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-6271/applications/accounting/pom.xml?rev=1677084&r1=1677083&r2=1677084&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-6271/applications/accounting/pom.xml (original)
+++ ofbiz/branches/OFBIZ-6271/applications/accounting/pom.xml Fri May 1
00:15:07 2015
@@ -29,6 +29,9 @@ under the License.
<artifactId>ofbiz-accounting</artifactId>
<name>OFBiz - Accounting Component</name>
<description>Accounting Component</description>
+ <properties>
+
<ofbiz-accounting:verisign:payflow-phase>-undefined</ofbiz-accounting:verisign:payflow-phase>
+ </properties>
<dependencies>
<dependency>
@@ -139,7 +142,7 @@ under the License.
<profiles>
<profile>
- <id>accounting:verisign</id>
+ <id>ofbiz-accounting:verisign:payflow</id>
<activation>
<file>
<exists>${user.dir}/applications/accounting/lib/payflow.jar</exists>
@@ -149,8 +152,22 @@ under the License.
<dependency>
<groupId>verisign</groupId>
<artifactId>payflow</artifactId>
+ <version>x.x</version>
+ <scope>system</scope>
+
<systemPath>${user.dir}/applications/accounting/lib/payflow.jar</systemPath>
</dependency>
</dependencies>
+ <properties>
+
<ofbiz-accounting:verisign:payflow-phase></ofbiz-accounting:verisign:payflow-phase>
+ </properties>
+ </profile>
+ <profile>
+ <id>accounting:verisign</id>
+ <activation>
+ <file>
+ <exists>pom.xml</exists>
+ </file>
+ </activation>
<build>
<plugins>
<plugin>
@@ -159,7 +176,7 @@ under the License.
<executions>
<execution>
<id>accounting-verisign-compile</id>
- <phase>compile</phase>
+ <phase>compile${ofbiz-accounting:verisign:payflow}</phase>
<goals>
<goal>compile</goal>
</goals>
@@ -174,7 +191,7 @@ under the License.
</execution>
<execution>
<id>accounting-verisign-testCompile</id>
- <phase>test-compile</phase>
+ <phase>test-compile${ofbiz-accounting:verisign:payflow}</phase>
<goals>
<goal>testCompile</goal>
</goals>
Modified: ofbiz/branches/OFBIZ-6271/applications/product/pom.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-6271/applications/product/pom.xml?rev=1677084&r1=1677083&r2=1677084&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-6271/applications/product/pom.xml (original)
+++ ofbiz/branches/OFBIZ-6271/applications/product/pom.xml Fri May 1 00:15:07
2015
@@ -30,8 +30,7 @@ under the License.
<name>OFBiz - Product Component</name>
<description>Product Component</description>
<properties>
- <product:sun.comm:serial-phase>-undefined</product:sun.comm:serial-phase>
-
<product:sun.browser:plugin-phase>-undefined</product:sun.browser:plugin-phase>
+
<ofbiz-product:sun.comm:serial-phase>-undefined</ofbiz-product:sun.comm:serial-phase>
</properties>
<dependencies>
@@ -174,7 +173,7 @@ under the License.
conditions.
-->
<profile>
- <id>product:sun.comm:serial</id>
+ <id>ofbiz-product:sun.comm:serial</id>
<activation>
<file>
<exists>${user.dir}/applications/product/lib/comm.jar</exists>
@@ -184,27 +183,13 @@ under the License.
<dependency>
<groupId>sun.comm</groupId>
<artifactId>serial</artifactId>
+ <version>x.x</version>
+ <scope>system</scope>
+
<systemPath>${user.dir}/applications/product/lib/comm.jar</systemPath>
</dependency>
</dependencies>
<properties>
- <product:sun.comm:serial-phase></product:sun.comm:serial-phase>
- </properties>
- </profile>
- <profile>
- <id>product:sun.browser:plugin</id>
- <activation>
- <file>
- <exists>${user.dir}/framework/base/lib/plugin.jar</exists>
- </file>
- </activation>
- <dependencies>
- <dependency>
- <groupId>sun.browser</groupId>
- <artifactId>plugin</artifactId>
- </dependency>
- </dependencies>
- <properties>
- <product:sun.browser:plugin-phase></product:sun.browser:plugin-phase>
+
<ofbiz-product:sun.comm:serial-phase></ofbiz-product:sun.comm:serial-phase>
</properties>
</profile>
<profile>
@@ -222,7 +207,7 @@ under the License.
<executions>
<execution>
<id>product-ShipmentScaleApplet-compile</id>
-
<phase>compile${product:sun.comm:serial-phase}${product:sun.browser:plugin-phase}</phase>
+
<phase>compile${ofbiz-product:sun.comm:serial-phase}${ofbiz:sun.browser:plugin-phase}</phase>
<goals>
<goal>compile</goal>
</goals>
Modified: ofbiz/branches/OFBIZ-6271/pom.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-6271/pom.xml?rev=1677084&r1=1677083&r2=1677084&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-6271/pom.xml (original)
+++ ofbiz/branches/OFBIZ-6271/pom.xml Fri May 1 00:15:07 2015
@@ -1308,29 +1308,6 @@ under the License.
<systemPath>${user.dir}/specialpurpose/pos/lib/XuiOptional-v3.2rc2b.jar</systemPath>
</dependency>
- <!-- optional, activated deps -->
- <dependency>
- <groupId>sun.browser</groupId>
- <artifactId>plugin</artifactId>
- <version>x.x</version>
- <scope>system</scope>
- <systemPath>${user.dir}/framework/base/lib/plugin.jar</systemPath>
- </dependency>
- <dependency>
- <groupId>verisign</groupId>
- <artifactId>payflow</artifactId>
- <version>x.x</version>
- <scope>system</scope>
-
<systemPath>${user.dir}/applications/accounting/lib/payflow.jar</systemPath>
- </dependency>
- <dependency>
- <groupId>sun.comm</groupId>
- <artifactId>serial</artifactId>
- <version>x.x</version>
- <scope>system</scope>
- <systemPath>${user.dir}/applications/product/lib/comm.jar</systemPath>
- </dependency>
-
</dependencies>
</dependencyManagement>
Modified: ofbiz/branches/OFBIZ-6271/poms/component-pom.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-6271/poms/component-pom.xml?rev=1677084&r1=1677083&r2=1677084&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-6271/poms/component-pom.xml (original)
+++ ofbiz/branches/OFBIZ-6271/poms/component-pom.xml Fri May 1 00:15:07 2015
@@ -32,6 +32,7 @@ under the License.
<component.build.dir>build</component.build.dir>
<component.src.dir>src</component.src.dir>
<component.lib.dir>lib</component.lib.dir>
+ <ofbiz:sun.browser:plugin-phase>-undefined</ofbiz:sun.browser:plugin-phase>
</properties>
<build>
@@ -352,4 +353,27 @@ under the License.
</plugins>
</reporting>
+ <profiles>
+ <profile>
+ <id>ofbiz:sun.browser:plugin</id>
+ <activation>
+ <file>
+ <exists>${user.dir}/framework/base/lib/plugin.jar</exists>
+ </file>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>sun.browser</groupId>
+ <artifactId>plugin</artifactId>
+ <version>x.x</version>
+ <scope>system</scope>
+ <systemPath>${user.dir}/framework/base/lib/plugin.jar</systemPath>
+ </dependency>
+ </dependencies>
+ <properties>
+ <ofbiz:sun.browser:plugin-phase></ofbiz:sun.browser:plugin-phase>
+ </properties>
+ </profile>
+ </profiles>
+
</project>
