Author: doogie
Date: Tue Apr 21 23:34:57 2015
New Revision: 1675217
URL: http://svn.apache.org/r1675217
Log:
Change how the LICENSE and NOTICE files are added to each built jar
file.
Added:
ofbiz/branches/OFBIZ-6271/assembly/
ofbiz/branches/OFBIZ-6271/assembly/LICENSE+NOTICE.xml
Modified:
ofbiz/branches/OFBIZ-6271/pom.xml
Added: ofbiz/branches/OFBIZ-6271/assembly/LICENSE+NOTICE.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-6271/assembly/LICENSE%2BNOTICE.xml?rev=1675217&view=auto
==============================================================================
--- ofbiz/branches/OFBIZ-6271/assembly/LICENSE+NOTICE.xml (added)
+++ ofbiz/branches/OFBIZ-6271/assembly/LICENSE+NOTICE.xml Tue Apr 21 23:34:57
2015
@@ -0,0 +1,38 @@
+<?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.
+-->
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+ <id>assembly-LICENSE+NOTICE</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}</directory>
+ <outputDirectory/>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
Modified: ofbiz/branches/OFBIZ-6271/pom.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-6271/pom.xml?rev=1675217&r1=1675216&r2=1675217&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-6271/pom.xml (original)
+++ ofbiz/branches/OFBIZ-6271/pom.xml Tue Apr 21 23:34:57 2015
@@ -48,13 +48,6 @@ under the License.
<include>META-INF/**</include>
</includes>
</resource>
- <resource>
- <directory>${project.parent.relativePath}/..</directory>
- <includes>
- <include>LICENSE</include>
- <include>NOTICE</include>
- </includes>
- </resource>
</resources>
<scriptSourceDirectory>scripts</scriptSourceDirectory>
<pluginManagement>
@@ -66,6 +59,10 @@ under the License.
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
</plugin>
@@ -98,6 +95,55 @@ under the License.
</configuration>
</execution>
</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>
+ <version>2.3</version>
+ <executions>
+ <execution>
+ <id>unpack-LICENSE+NOTICE</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.ofbiz</groupId>
+ <artifactId>ofbiz-parent</artifactId>
+ <version>TRUNK</version>
+ <type>zip</type>
+ <classifier>assembly-LICENSE+NOTICE</classifier>
+ <overWrite>true</overWrite>
+
<outputDirectory>${project.build.outputDirectory}/META-INF</outputDirectory>
+ <includes>*</includes>
+ </artifactItem>
+ </artifactItems>
+ <includes>**/*</includes>
+ <overWriteReleases>true</overWriteReleases>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
