| commit | ce97e385ba3445835e9a2a4a3c3de1edde5bfa84 | [log] [tgz] |
|---|---|---|
| author | Olivier Lamy <olamy@apache.org> | Tue Aug 16 01:04:22 2016 +0000 |
| committer | Olivier Lamy <olamy@apache.org> | Tue Aug 16 01:04:22 2016 +0000 |
| tree | dd803853638aac7746faed0a2d20042e26145b36 | |
| parent | 5b0779fcdbc5cdabf9d81cd4da00c257a0b61d9b [diff] |
1. Fix: MTOMCAT-274 (updated maven-war-plugin version). 2. Fix: access_log.* files excluded from apache-rat-plugin configuration. These are generated during Tomcat run and should not be checked. git-svn-id: https://svn.apache.org/repos/asf/tomcat/maven-plugin/trunk@1756446 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml index d790b13..cdcc988 100644 --- a/pom.xml +++ b/pom.xml
@@ -782,6 +782,7 @@ <exclude>out/**</exclude> <exclude>.extract/**</exclude> <exclude>*.patch</exclude> + <exclude>**/access_log.*</exclude> </excludes> </configuration> </plugin>
diff --git a/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml b/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml index 620e135..f17fd96 100644 --- a/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml +++ b/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml
@@ -35,7 +35,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <version>2.1-alpha-2</version> + <version>2.4</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId>
diff --git a/tomcat8-maven-plugin/src/test/resources/deploy-war-project/pom.xml b/tomcat8-maven-plugin/src/test/resources/deploy-war-project/pom.xml index 0222662..44b7d6d 100644 --- a/tomcat8-maven-plugin/src/test/resources/deploy-war-project/pom.xml +++ b/tomcat8-maven-plugin/src/test/resources/deploy-war-project/pom.xml
@@ -35,7 +35,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <version>2.1-alpha-2</version> + <version>2.4</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId>
diff --git a/tomcat8-maven-plugin/src/test/resources/simple-war-project/pom.xml b/tomcat8-maven-plugin/src/test/resources/simple-war-project/pom.xml index ae60b93..e889456 100644 --- a/tomcat8-maven-plugin/src/test/resources/simple-war-project/pom.xml +++ b/tomcat8-maven-plugin/src/test/resources/simple-war-project/pom.xml
@@ -35,7 +35,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <version>2.1-alpha-2</version> + <version>2.4</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId>