Author: markt
Date: Tue Oct 14 19:16:14 2014
New Revision: 1631843
URL: http://svn.apache.org/r1631843
Log:
Apply latest patch from Pierre Viret
Modified:
tomcat/sandbox/trunk-maven-layout/pom.xml
tomcat/sandbox/trunk-maven-layout/tomcat-webapps/ROOT/pom.xml
tomcat/sandbox/trunk-maven-layout/tomcat-webapps/docs/pom.xml
Modified: tomcat/sandbox/trunk-maven-layout/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/pom.xml?rev=1631843&r1=1631842&r2=1631843&view=diff
==============================================================================
--- tomcat/sandbox/trunk-maven-layout/pom.xml (original)
+++ tomcat/sandbox/trunk-maven-layout/pom.xml Tue Oct 14 19:16:14 2014
@@ -393,7 +393,7 @@
<!-- define properties for the resource filter -->
<version.major>8</version.major>
<version.minor>0</version.minor>
- <version.build>13</version.build>
+ <version.build>15</version.build>
<version.patch>0</version.patch>
<version.suffix>-SNAPSHOT</version.suffix>
<version>${version.major}.${version.minor}.${version.build}${version.suffix}</version>
Modified: tomcat/sandbox/trunk-maven-layout/tomcat-webapps/ROOT/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/tomcat-webapps/ROOT/pom.xml?rev=1631843&r1=1631842&r2=1631843&view=diff
==============================================================================
--- tomcat/sandbox/trunk-maven-layout/tomcat-webapps/ROOT/pom.xml (original)
+++ tomcat/sandbox/trunk-maven-layout/tomcat-webapps/ROOT/pom.xml Tue Oct 14
19:16:14 2014
@@ -53,6 +53,24 @@
</executions>
</plugin>
<plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>rename-RELEASE-NOTES</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <move
file="${project.build.directory}/generated-resources/RELEASE-NOTES"
+
tofile="${project.build.directory}/generated-resources/RELEASE-NOTES.txt" />
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<webResources>
Modified: tomcat/sandbox/trunk-maven-layout/tomcat-webapps/docs/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-maven-layout/tomcat-webapps/docs/pom.xml?rev=1631843&r1=1631842&r2=1631843&view=diff
==============================================================================
--- tomcat/sandbox/trunk-maven-layout/tomcat-webapps/docs/pom.xml (original)
+++ tomcat/sandbox/trunk-maven-layout/tomcat-webapps/docs/pom.xml Tue Oct 14
19:16:14 2014
@@ -29,8 +29,47 @@
<packaging>war</packaging>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/webapp</directory>
+ <targetPath>${webapp.generated.resources}</targetPath>
+ <includes>
+ <include>images/**</include>
+ <include>WEB-INF/**</include>
+ <include>appdev/*.txt</include>
+ <include>appdev/sample/**</include>
+ <include>architecture/**</include>
+ <include>**/*.html</include>
+ </includes>
+ <excludes>
+ <exclude>architecture/*.xml</exclude>
+ </excludes>
+ </resource>
+ </resources>
<plugins>
<plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-global-resources</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>global-resources</artifactId>
+
<includes>RELEASE-NOTES,RUNNING.txt,BUILDING.txt</includes>
+ </artifactItem>
+ </artifactItems>
+
<outputDirectory>${webapp.generated.resources}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xml-maven-plugin</artifactId>
<executions>
@@ -52,7 +91,7 @@
<exclude>**/project.xml</exclude>
<exclude>**/build.xml</exclude>
<exclude>META-INF/**</exclude>
- <exclude>WEB-INF/**</exclude>
+ <exclude>**/WEB-INF/**</exclude>
</excludes>
<fileMappers>
<fileMapper
implementation="org.codehaus.plexus.components.io.filemappers.FileExtensionMapper">
@@ -106,6 +145,26 @@
</configuration>
</plugin>
<plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>prepare-docs</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <copy
file="src/main/webapp/appdev/build.xml.txt"
+
tofile="${webapp.generated.resources}/appdev/sample/build.xml" />
+ <move
file="${webapp.generated.resources}/RELEASE-NOTES"
+
tofile="${webapp.generated.resources}/RELEASE-NOTES.txt" />
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<warSourceIncludes>META-INF/**,WEB-INF/**</warSourceIncludes>
@@ -113,9 +172,16 @@
<resource>
<directory>${project.build.directory}/generated-resources/xml/xslt</directory>
</resource>
+ <resource>
+
<directory>${webapp.generated.resources}</directory>
+ </resource>
</webResources>
</configuration>
</plugin>
</plugins>
</build>
+
+ <properties>
+
<webapp.generated.resources>${project.build.directory}/generated-resources/webapp</webapp.generated.resources>
+ </properties>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
