Author: doogie
Date: Tue Apr 28 20:23:34 2015
New Revision: 1676613
URL: http://svn.apache.org/r1676613
Log:
Move the building of the NOTICE+LICENSE helper zip to a sub-module,
which can then be independently depended on. This fixes reactor
ordering. Previously, ofbiz-parent would build the assembly, and maven
was confused(this lead to a dep cycle), so ofbiz-parent was being built
last. Now, the LICENSE+NOTICE assembly is built early, so it can be
unpacked by each sub-component.
Added:
ofbiz/branches/OFBIZ-6271/poms/assembly/
ofbiz/branches/OFBIZ-6271/poms/assembly/LICENSE+NOTICE.xml
- copied, changed from r1676612,
ofbiz/branches/OFBIZ-6271/assembly/LICENSE+NOTICE.xml
ofbiz/branches/OFBIZ-6271/poms/maven-support.xml
Removed:
ofbiz/branches/OFBIZ-6271/assembly/LICENSE+NOTICE.xml
Modified:
ofbiz/branches/OFBIZ-6271/framework/service/pom.xml
ofbiz/branches/OFBIZ-6271/pom.xml
ofbiz/branches/OFBIZ-6271/poms/component-pom.xml
Modified: ofbiz/branches/OFBIZ-6271/framework/service/pom.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-6271/framework/service/pom.xml?rev=1676613&r1=1676612&r2=1676613&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-6271/framework/service/pom.xml (original)
+++ ofbiz/branches/OFBIZ-6271/framework/service/pom.xml Tue Apr 28 20:23:34 2015
@@ -116,7 +116,7 @@ under the License.
<artifactItems>
<artifactItem>
<groupId>org.apache.ofbiz</groupId>
- <artifactId>ofbiz-parent</artifactId>
+ <artifactId>ofbiz-maven-support</artifactId>
<version>TRUNK</version>
<type>zip</type>
<classifier>assembly-LICENSE+NOTICE</classifier>
Modified: ofbiz/branches/OFBIZ-6271/pom.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-6271/pom.xml?rev=1676613&r1=1676612&r2=1676613&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-6271/pom.xml (original)
+++ ofbiz/branches/OFBIZ-6271/pom.xml Tue Apr 28 20:23:34 2015
@@ -30,6 +30,7 @@ under the License.
</properties>
<modules>
+ <module>poms/maven-support.xml</module>
<module>framework</module>
<module>applications</module>
<module>specialpurpose</module>
Copied: ofbiz/branches/OFBIZ-6271/poms/assembly/LICENSE+NOTICE.xml (from
r1676612, ofbiz/branches/OFBIZ-6271/assembly/LICENSE+NOTICE.xml)
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-6271/poms/assembly/LICENSE%2BNOTICE.xml?p2=ofbiz/branches/OFBIZ-6271/poms/assembly/LICENSE%2BNOTICE.xml&p1=ofbiz/branches/OFBIZ-6271/assembly/LICENSE%2BNOTICE.xml&r1=1676612&r2=1676613&rev=1676613&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-6271/assembly/LICENSE+NOTICE.xml (original)
+++ ofbiz/branches/OFBIZ-6271/poms/assembly/LICENSE+NOTICE.xml Tue Apr 28
20:23:34 2015
@@ -27,7 +27,7 @@ under the License.
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
- <directory>${project.basedir}</directory>
+ <directory>${project.basedir}/..</directory>
<outputDirectory/>
<includes>
<include>LICENSE</include>
Modified: ofbiz/branches/OFBIZ-6271/poms/component-pom.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-6271/poms/component-pom.xml?rev=1676613&r1=1676612&r2=1676613&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-6271/poms/component-pom.xml (original)
+++ ofbiz/branches/OFBIZ-6271/poms/component-pom.xml Tue Apr 28 20:23:34 2015
@@ -79,6 +79,15 @@ under the License.
</testResource>
</testResources>
<scriptSourceDirectory>scripts</scriptSourceDirectory>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>ofbiz-maven-support</artifactId>
+ <version>${project.version}</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -128,24 +137,6 @@ under the License.
</executions>
</plugin>
<plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <inherited>false</inherited>
- <configuration>
- <descriptors>
-
<descriptor>${project.basedir}/assembly/LICENSE+NOTICE.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>initialize</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
@@ -164,7 +155,7 @@ under the License.
<artifactItems>
<artifactItem>
<groupId>org.apache.ofbiz</groupId>
- <artifactId>ofbiz-parent</artifactId>
+ <artifactId>ofbiz-maven-support</artifactId>
<version>TRUNK</version>
<type>zip</type>
<classifier>assembly-LICENSE+NOTICE</classifier>
@@ -185,7 +176,7 @@ under the License.
<artifactItems>
<artifactItem>
<groupId>org.apache.ofbiz</groupId>
- <artifactId>ofbiz-parent</artifactId>
+ <artifactId>ofbiz-maven-support</artifactId>
<version>TRUNK</version>
<type>zip</type>
<classifier>assembly-LICENSE+NOTICE</classifier>
Added: ofbiz/branches/OFBIZ-6271/poms/maven-support.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-6271/poms/maven-support.xml?rev=1676613&view=auto
==============================================================================
--- ofbiz/branches/OFBIZ-6271/poms/maven-support.xml (added)
+++ ofbiz/branches/OFBIZ-6271/poms/maven-support.xml Tue Apr 28 20:23:34 2015
@@ -0,0 +1,56 @@
+<?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-parent</artifactId>
+ <version>TRUNK</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>ofbiz-maven-support</artifactId>
+ <packaging>pom</packaging>
+ <name>OFBiz Maven Support</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <inherited>false</inherited>
+ <configuration>
+ <descriptors>
+
<descriptor>${project.basedir}/assembly/LICENSE+NOTICE.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>initialize</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
