Modified: tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml?rev=1369603&r1=1369602&r2=1369603&view=diff ============================================================================== --- tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml (original) +++ tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml Sun Aug 5 14:30:03 2012 @@ -1,222 +1,222 @@ -<?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";> - - <modelVersion>4.0.0</modelVersion> - <groupId>\${groupId}</groupId> - <artifactId>${rootArtifactId}</artifactId> - <version>\${version}</version> - <packaging>pom</packaging> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <spring.version>3.1.1.RELEASE</spring.version> - </properties> - - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.5.1</version> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.12</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <version>2.2</version> - </plugin> - <plugin> - <groupId>org.apache.tomcat.maven</groupId> - <artifactId>tomcat6-maven-plugin</artifactId> - <version>${tomcatPluginVersion}</version> - </plugin> - <plugin> - <groupId>org.apache.tomcat.maven</groupId> - <artifactId>tomcat7-maven-plugin</artifactId> - <version>${tomcatPluginVersion}</version> - </plugin> - </plugins> - </pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>1.0.1</version> - <executions> - <execution> - <id>enforce-java</id> - <goals> - <goal>enforce</goal> - </goals> - <configuration> - <rules> - <requireJavaVersion> - <version>1.6.0</version> - </requireJavaVersion> - </rules> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>\${groupId}</groupId> - <artifactId>${artifactId-api}</artifactId> - <version>\${project.version}</version> - </dependency> - <dependency> - <groupId>\${groupId}</groupId> - <artifactId>${artifactId-api-impl}</artifactId> - <version>\${project.version}</version> - </dependency> - <dependency> - <groupId>\${groupId}</groupId> - <artifactId>${artifactId-webapp}</artifactId> - <version>\${project.version}</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - <version>${spring.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context-support</artifactId> - <version>${spring.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> - <version>${spring.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - <version>${spring.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-asm</artifactId> - <version>${spring.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - <version>${spring.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-expression</artifactId> - <version>${spring.version}</version> - </dependency> - <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>jsr311-api</artifactId> - <version>1.1.1</version> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-bundle-jaxrs</artifactId> - <version>2.5.1</version> - <exclusions> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.tomcat.embed</groupId> - <artifactId>tomcat-embed-core</artifactId> - <version>${tomcat7Version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-juli</artifactId> - <version>${tomcat7Version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.tomcat.embed</groupId> - <artifactId>tomcat-embed-logging-juli</artifactId> - <version>${tomcat7Version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-servlet-api</artifactId> - <version>${tomcat7Version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.10</version> - <scope>test</scope> - </dependency> - </dependencies> - </dependencyManagement> - - <repositories> - <repository> - <id>apache.snapshots</id> - <name>Apache Snapshots</name> - <url>https://repository.apache.org/content/groups/snapshots-group/</url> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - </repositories> - - <pluginRepositories> - <pluginRepository> - <id>apache.snapshots</id> - <name>Apache Snapshots</name> - <url>https://repository.apache.org/content/groups/snapshots-group/</url> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </pluginRepository> - </pluginRepositories> - -</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";> + + <modelVersion>4.0.0</modelVersion> + <groupId>\${groupId}</groupId> + <artifactId>\${artifactId}</artifactId> + <version>\${version}</version> + <packaging>pom</packaging> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <spring.version>3.1.1.RELEASE</spring.version> + </properties> + + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.5.1</version> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.12</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <version>2.2</version> + </plugin> + <plugin> + <groupId>org.apache.tomcat.maven</groupId> + <artifactId>tomcat6-maven-plugin</artifactId> + <version>${tomcatPluginVersion}</version> + </plugin> + <plugin> + <groupId>org.apache.tomcat.maven</groupId> + <artifactId>tomcat7-maven-plugin</artifactId> + <version>${tomcatPluginVersion}</version> + </plugin> + </plugins> + </pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <version>1.0.1</version> + <executions> + <execution> + <id>enforce-java</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireJavaVersion> + <version>1.6.0</version> + </requireJavaVersion> + </rules> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>\${groupId}</groupId> + <artifactId>\${artifactId}-api</artifactId> + <version>\${project.version}</version> + </dependency> + <dependency> + <groupId>\${groupId}</groupId> + <artifactId>\${artifactId}-api-impl</artifactId> + <version>\${project.version}</version> + </dependency> + <dependency> + <groupId>\${groupId}</groupId> + <artifactId>\${artifactId}-webapp</artifactId> + <version>\${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>${spring.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context-support</artifactId> + <version>${spring.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> + <version>${spring.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + <version>${spring.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-asm</artifactId> + <version>${spring.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + <version>${spring.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + <version>${spring.version}</version> + </dependency> + <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>jsr311-api</artifactId> + <version>1.1.1</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-bundle-jaxrs</artifactId> + <version>2.5.1</version> + <exclusions> + <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.tomcat.embed</groupId> + <artifactId>tomcat-embed-core</artifactId> + <version>${tomcat7Version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-juli</artifactId> + <version>${tomcat7Version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.tomcat.embed</groupId> + <artifactId>tomcat-embed-logging-juli</artifactId> + <version>${tomcat7Version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-servlet-api</artifactId> + <version>${tomcat7Version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.10</version> + <scope>test</scope> + </dependency> + </dependencies> + </dependencyManagement> + + <repositories> + <repository> + <id>apache.snapshots</id> + <name>Apache Snapshots</name> + <url>https://repository.apache.org/content/groups/snapshots-group/</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + </repositories> + + <pluginRepositories> + <pluginRepository> + <id>apache.snapshots</id> + <name>Apache Snapshots</name> + <url>https://repository.apache.org/content/groups/snapshots-group/</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + </pluginRepositories> + +</project>
Modified: tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/basic/archetype.properties URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/basic/archetype.properties?rev=1369603&r1=1369602&r2=1369603&view=diff ============================================================================== --- tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/basic/archetype.properties (original) +++ tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/basic/archetype.properties Sun Aug 5 14:30:03 2012 @@ -1,11 +1,4 @@ -package=org.apache -version=0.1-SNAPSHOT -groupId=org.apache.tomcat.maven.archetype.it +groupId=org.apache.tomcat.maven artifactId=basic -artifactId-api=basic-api -artifactId-api-impl=basic-api-impl -artifactId-webapp=basic-webapp -artifactId-webapp-it=basic-webapp-it -artifactId-webapp-exec=basic-webapp-exec -rootArtifactId=basic - +version=0.1-SNAPSHOT +package=org.apache.tomcat.maven Modified: tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/basic/goal.txt URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/basic/goal.txt?rev=1369603&r1=1369602&r2=1369603&view=diff ============================================================================== --- tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/basic/goal.txt (original) +++ tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/basic/goal.txt Sun Aug 5 14:30:03 2012 @@ -1 +1 @@ -${archetypeItGoals} \ No newline at end of file +${archetypeItGoalsBatch} Added: tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/customized/archetype.properties URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/customized/archetype.properties?rev=1369603&view=auto ============================================================================== --- tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/customized/archetype.properties (added) +++ tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/customized/archetype.properties Sun Aug 5 14:30:03 2012 @@ -0,0 +1,5 @@ +groupId=group.id +artifactId=artifact.id +version=0.1-SNAPSHOT +package=fr.mypackage + Added: tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/customized/goal.txt URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/customized/goal.txt?rev=1369603&view=auto ============================================================================== --- tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/customized/goal.txt (added) +++ tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/customized/goal.txt Sun Aug 5 14:30:03 2012 @@ -0,0 +1 @@ +${archetypeItGoals} \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
