You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ol...@apache.org on 2012/01/26 15:34:42 UTC
svn commit: r1236191 - in /tomcat/maven-plugin/trunk:
common-tomcat-maven-plugin/pom.xml pom.xml tomcat-maven-archetype/pom.xml
tomcat-maven-plugin-it/pom.xml tomcat6-maven-plugin/pom.xml
tomcat7-maven-plugin/pom.xml tomcat7-war-runner/pom.xml
Author: olamy
Date: Thu Jan 26 14:34:42 2012
New Revision: 1236191
URL: http://svn.apache.org/viewvc?rev=1236191&view=rev
Log:
[maven-release-plugin] prepare release tomcat-maven-plugin-2.0-beta-1
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml
tomcat/maven-plugin/trunk/pom.xml
tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml
tomcat/maven-plugin/trunk/tomcat7-war-runner/pom.xml
Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml?rev=1236191&r1=1236190&r2=1236191&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml Thu Jan 26 14:34:42 2012
@@ -19,13 +19,12 @@
~ under the License.
-->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>tomcat-maven-plugin</artifactId>
<groupId>org.apache.tomcat.maven</groupId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-beta-1</version>
</parent>
<artifactId>common-tomcat-maven-plugin</artifactId>
<name>Apache Tomcat Maven Plugin :: Common API</name>
Modified: tomcat/maven-plugin/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1236191&r1=1236190&r2=1236191&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Thu Jan 26 14:34:42 2012
@@ -32,7 +32,7 @@
<artifactId>tomcat-maven-plugin</artifactId>
<packaging>pom</packaging>
<name>Apache Tomcat Maven Plugin</name>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-beta-1</version>
<description>The Tomcat Maven Plugin provides goals to manipulate WAR projects within the Tomcat servlet
container.
</description>
@@ -200,9 +200,9 @@
</mailingLists>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/tomcat/maven-plugin/trunk/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tomcat/maven-plugin/trunk/</developerConnection>
- <url>http://svn.apache.org/viewvc/tomcat/maven-plugin/</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/tomcat/maven-plugin/tags/tomcat-maven-plugin-2.0-beta-1</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tomcat/maven-plugin/tags/tomcat-maven-plugin-2.0-beta-1</developerConnection>
+ <url>http://svn.apache.org/viewvc/tomcat/maven-plugin/tags/tomcat-maven-plugin-2.0-beta-1</url>
</scm>
<issueManagement>
Modified: tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml?rev=1236191&r1=1236190&r2=1236191&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml Thu Jan 26 14:34:42 2012
@@ -1,121 +1,121 @@
-<?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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <parent>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>tomcat-maven-archetype</artifactId>
-
- <packaging>maven-archetype</packaging>
-
- <name>Apache Tomcat Maven Plugin :: Archetype</name>
-
- <properties>
- <archetypeVersion>2.2</archetypeVersion>
- <tomcatPluginVersion>${project.version}</tomcatPluginVersion>
- <archetypeItGoals>clean,verify</archetypeItGoals>
- </properties>
- <build>
-
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
-
- <extensions>
- <extension>
- <groupId>org.apache.maven.archetype</groupId>
- <artifactId>archetype-packaging</artifactId>
- <version>${archetypeVersion}</version>
- </extension>
- </extensions>
-
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-archetype-plugin</artifactId>
- <version>${archetypeVersion}</version>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>0.8</version>
- <configuration>
- <excludes>
- <exclude>.gitignore</exclude>
- <exclude>DEPENDENCIES</exclude>
- <exclude>README.txt</exclude>
- <exclude>*.sh</exclude>
- <exclude>.git/**</exclude>
- <exclude>.idea/**</exclude>
- <exclude>.extract/**</exclude>
- <exclude>src/main/resources/archetype-resources/basic-webapp/src/main/webapp/css/bootstrap.min.1.4.0.css</exclude>
- <exclude>src/main/resources/archetype-resources/basic-webapp/src/main/webapp/js/jquery-1.7.js</exclude>
- <exclude>src/test/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
-
- <profiles>
- <profile>
- <id>run-its</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-archetype-plugin</artifactId>
- <version>${archetypeVersion}</version>
- <configuration>
- <settingsFile>${basedir}/src/test/test-settings.xml</settingsFile>
- <localRepositoryPath>${basedir}/target/local-repo</localRepositoryPath>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>headless</id>
- <properties>
- <archetypeItGoals>clean,verify,-Pheadless</archetypeItGoals>
- </properties>
- </profile>
- </profiles>
-
-</project>
+<?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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <parent>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat-maven-plugin</artifactId>
+ <version>2.0-beta-1</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>tomcat-maven-archetype</artifactId>
+
+ <packaging>maven-archetype</packaging>
+
+ <name>Apache Tomcat Maven Plugin :: Archetype</name>
+
+ <properties>
+ <archetypeVersion>2.2</archetypeVersion>
+ <tomcatPluginVersion>${project.version}</tomcatPluginVersion>
+ <archetypeItGoals>clean,verify</archetypeItGoals>
+ </properties>
+ <build>
+
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
+
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.archetype</groupId>
+ <artifactId>archetype-packaging</artifactId>
+ <version>${archetypeVersion}</version>
+ </extension>
+ </extensions>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-archetype-plugin</artifactId>
+ <version>${archetypeVersion}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.8</version>
+ <configuration>
+ <excludes>
+ <exclude>.gitignore</exclude>
+ <exclude>DEPENDENCIES</exclude>
+ <exclude>README.txt</exclude>
+ <exclude>*.sh</exclude>
+ <exclude>.git/**</exclude>
+ <exclude>.idea/**</exclude>
+ <exclude>.extract/**</exclude>
+ <exclude>src/main/resources/archetype-resources/basic-webapp/src/main/webapp/css/bootstrap.min.1.4.0.css</exclude>
+ <exclude>src/main/resources/archetype-resources/basic-webapp/src/main/webapp/js/jquery-1.7.js</exclude>
+ <exclude>src/test/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+
+ <profiles>
+ <profile>
+ <id>run-its</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-archetype-plugin</artifactId>
+ <version>${archetypeVersion}</version>
+ <configuration>
+ <settingsFile>${basedir}/src/test/test-settings.xml</settingsFile>
+ <localRepositoryPath>${basedir}/target/local-repo</localRepositoryPath>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>headless</id>
+ <properties>
+ <archetypeItGoals>clean,verify,-Pheadless</archetypeItGoals>
+ </properties>
+ </profile>
+ </profiles>
+
+</project>
Modified: tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml?rev=1236191&r1=1236190&r2=1236191&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml Thu Jan 26 14:34:42 2012
@@ -18,13 +18,11 @@
~ under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat-maven-plugin</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-beta-1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml?rev=1236191&r1=1236190&r2=1236191&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml Thu Jan 26 14:34:42 2012
@@ -17,12 +17,11 @@
~ under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat-maven-plugin</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-beta-1</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -210,7 +209,7 @@
</goals>
<configuration>
<target>
- <unzip src="src/test/manager.war" dest="${managerWebAppPath}"/>
+ <unzip src="src/test/manager.war" dest="${managerWebAppPath}" />
</target>
</configuration>
Modified: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml?rev=1236191&r1=1236190&r2=1236191&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml Thu Jan 26 14:34:42 2012
@@ -18,13 +18,12 @@
~ under the License.
-->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>tomcat-maven-plugin</artifactId>
<groupId>org.apache.tomcat.maven</groupId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-beta-1</version>
</parent>
<artifactId>tomcat7-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
@@ -242,7 +241,7 @@
</goals>
<configuration>
<target>
- <unzip src="src/test/manager.war" dest="${managerWebAppPath}"/>
+ <unzip src="src/test/manager.war" dest="${managerWebAppPath}" />
</target>
</configuration>
Modified: tomcat/maven-plugin/trunk/tomcat7-war-runner/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-war-runner/pom.xml?rev=1236191&r1=1236190&r2=1236191&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat7-war-runner/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat7-war-runner/pom.xml Thu Jan 26 14:34:42 2012
@@ -18,16 +18,15 @@
~ under the License.
-->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>tomcat-maven-plugin</artifactId>
<groupId>org.apache.tomcat.maven</groupId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-beta-1</version>
</parent>
<artifactId>tomcat7-war-runner</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-beta-1</version>
<name>Apache Tomcat Maven Plugin :: Tomcat 7.x War Runner</name>
<dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org