Author: simonetripodi
Date: Tue Jul 3 16:08:31 2012
New Revision: 1356807
URL: http://svn.apache.org/viewvc?rev=1356807&view=rev
Log:
different WARs including different legal files depending on their (no)
dependencies inclusion
Added:
incubator/any23/trunk/service/src/main/assembly/prepare-war-legals.xml
(with props)
Modified:
incubator/any23/trunk/service/pom.xml
Modified: incubator/any23/trunk/service/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/any23/trunk/service/pom.xml?rev=1356807&r1=1356806&r2=1356807&view=diff
==============================================================================
--- incubator/any23/trunk/service/pom.xml (original)
+++ incubator/any23/trunk/service/pom.xml Tue Jul 3 16:08:31 2012
@@ -68,18 +68,6 @@
</dependencies>
<build>
- <resources>
- <resource>
- <directory>${basedir}/../</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>DISCLAIMER.txt</include>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- </includes>
- </resource>
- </resources>
-
<plugins>
<plugin>
<groupId>org.mortbay.jetty</groupId>
@@ -103,6 +91,13 @@
<targetPath>/resources</targetPath>
<filtering>true</filtering>
</resource>
+ <resource>
+ <directory>${basedir}/../</directory>
+ <targetPath>/META-INF</targetPath>
+ <includes>
+ <include>DISCLAIMER.txt</include>
+ </includes>
+ </resource>
</webResources>
</configuration>
<executions>
@@ -112,6 +107,14 @@
<goals>
<goal>war</goal>
</goals>
+ <configuration>
+ <webResources>
+ <resource>
+
<directory>${project.build.directory}/${assembly.finalName}-prepare-war-legals/with-deps/</directory>
+ <targetPath>/META-INF</targetPath>
+ </resource>
+ </webResources>
+ </configuration>
</execution>
<execution>
<id>war-without-deps</id>
@@ -128,6 +131,19 @@
<classpathPrefix>lib/</classpathPrefix>
</manifest>
</archive>
+ <webResources>
+ <resource>
+ <directory>${basedir}/../</directory>
+ <targetPath>/META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ <resource>
+
<directory>${project.build.directory}/${assembly.finalName}-prepare-war-legals/without-deps/</directory>
+ <targetPath>/META-INF</targetPath>
+ </resource>
+ </webResources>
</configuration>
</execution>
</executions>
@@ -137,6 +153,21 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>prepare-package</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <attach>false</attach>
+ <descriptors>
+
<descriptor>${basedir}/src/main/assembly/prepare-war-legals.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
<configuration>
<descriptors>
<descriptor>${basedir}/src/main/assembly/with-deps.xml</descriptor>
Added: incubator/any23/trunk/service/src/main/assembly/prepare-war-legals.xml
URL:
http://svn.apache.org/viewvc/incubator/any23/trunk/service/src/main/assembly/prepare-war-legals.xml?rev=1356807&view=auto
==============================================================================
--- incubator/any23/trunk/service/src/main/assembly/prepare-war-legals.xml
(added)
+++ incubator/any23/trunk/service/src/main/assembly/prepare-war-legals.xml Tue
Jul 3 16:08:31 2012
@@ -0,0 +1,48 @@
+<?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.1";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1
http://maven.apache.org/xsd/assembly-1.1.1.xsd";>
+
+ <id>prepare-war-legals</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <files>
+ <file>
+ <source>${basedir}/src/main/assembly/LICENSE-with-deps.txt</source>
+ <destName>LICENSE.txt</destName>
+ <outputDirectory>/with-deps</outputDirectory>
+ <fileMode>666</fileMode>
+ </file>
+ <file>
+ <source>${basedir}/src/main/assembly/NOTICE-with-deps.txt</source>
+ <destName>NOTICE.txt</destName>
+ <outputDirectory>/with-deps</outputDirectory>
+ <fileMode>666</fileMode>
+ </file>
+ <file>
+ <source>${basedir}/src/main/assembly/LICENSE-without-deps.txt</source>
+ <destName>LICENSE.txt</destName>
+ <outputDirectory>/without-deps</outputDirectory>
+ <fileMode>666</fileMode>
+ </file>
+ </files>
+
+</assembly>
Propchange:
incubator/any23/trunk/service/src/main/assembly/prepare-war-legals.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/any23/trunk/service/src/main/assembly/prepare-war-legals.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange:
incubator/any23/trunk/service/src/main/assembly/prepare-war-legals.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
