[maven-scm] copy for tag tiles-parent-2.0.0
git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/tags/tiles-parent-2.0.0@504277 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index cd4e5fc..da3ac4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,31 +1,4 @@
-<?xml version="1.0"?>
-<!--
-/*
- * $Id$
- *
- * 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/maven-v4_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/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.tiles</groupId>
@@ -36,18 +9,18 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-parent</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<packaging>pom</packaging>
<name>Tiles 2</name>
<description>Tiles 2</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/tiles/framework/trunk/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tiles/framework/trunk/</developerConnection>
- <url>http://svn.apache.org/viewvc/tiles/framework/trunk/</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/tiles/framework/tags/tiles-parent-2.0.0</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tiles/framework/tags/tiles-parent-2.0.0</developerConnection>
+ <url>http://svn.apache.org/viewvc/tiles/framework/tags/tiles-parent-2.0.0</url>
</scm>
- <ciManagement/>
+ <ciManagement />
<modules>
<module>tiles-api</module>
@@ -158,7 +131,7 @@
</plugins>
</reporting>
- <dependencies/>
+ <dependencies />
<!-- Needs to be commented out for releases -->
<repositories>
@@ -195,4 +168,4 @@
</releases>
</pluginRepository>
</pluginRepositories>
-</project>
+</project>
\ No newline at end of file
diff --git a/tiles-api/pom.xml b/tiles-api/pom.xml
index 44f5457..052cefd 100644
--- a/tiles-api/pom.xml
+++ b/tiles-api/pom.xml
@@ -22,13 +22,12 @@
*
*/
-->
-<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/maven-v4_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/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-parent</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/tiles-core/pom.xml b/tiles-core/pom.xml
index 7539aa7..a616bf4 100644
--- a/tiles-core/pom.xml
+++ b/tiles-core/pom.xml
@@ -22,13 +22,12 @@
*
*/
-->
-<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/maven-v4_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/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-parent</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/tiles-test/pom.xml b/tiles-test/pom.xml
index 5190128..53ad24b 100644
--- a/tiles-test/pom.xml
+++ b/tiles-test/pom.xml
@@ -1,35 +1,9 @@
-<?xml version="1.0"?>
-<!--
-/*
- * $Id$
- *
- * 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/maven-v4_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/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-parent</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -74,7 +48,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.0.2-SNAPSHOT</version>
+ <version>2.0.2</version>
<configuration>
<webResources>
<resource>
@@ -149,10 +123,10 @@
<configuration>
<tasks>
<copy todir="${project.build.directory}/${artifactId}/selenium/core">
- <fileset dir="${project.build.directory}/selenium/core"/>
+ <fileset dir="${project.build.directory}/selenium/core" />
</copy>
<copy todir="${project.build.directory}/${artifactId}/selenium/tests">
- <fileset dir="src/test/selenium"/>
+ <fileset dir="src/test/selenium" />
</copy>
</tasks>
</configuration>
@@ -215,20 +189,11 @@
</goals>
<configuration>
<tasks>
- <taskdef resource="hostedqatasks" classpathref="maven.plugin.classpath"/>
- <upload file="${project.build.directory}/${project.build.finalName}.war"
- account="tiles"
- email="${tiles.hostedqa.email}"
- password="${tiles.hostedqa.password}"
- resourceId="${hostedqa.resourceId}"/>
+ <taskdef resource="hostedqatasks" classpathref="maven.plugin.classpath" />
+ <upload file="${project.build.directory}/${project.build.finalName}.war" account="tiles" email="${tiles.hostedqa.email}" password="${tiles.hostedqa.password}" resourceId="${hostedqa.resourceId}" />
- <playsuite clientConfigs="${hostedqa.clientConfigs}"
- appConfigs="${hostedqa.appConfigs}"
- account="tiles"
- email="${tiles.hostedqa.email}"
- password="${tiles.hostedqa.password}">
- <fileSet dir="${basedir}/src/test/selenium"
- excludes="TestSuite.html"/>
+ <playsuite clientConfigs="${hostedqa.clientConfigs}" appConfigs="${hostedqa.appConfigs}" account="tiles" email="${tiles.hostedqa.email}" password="${tiles.hostedqa.password}">
+ <fileSet dir="${basedir}/src/test/selenium" excludes="TestSuite.html" />
</playsuite>
</tasks>
</configuration>
@@ -254,4 +219,4 @@
</profiles>
-</project>
+</project>
\ No newline at end of file
diff --git a/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml b/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml
index 759af9f..0444638 100644
--- a/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml
+++ b/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml
@@ -36,14 +36,6 @@
<!-- ======================================================= -->
<!-- Doc index page description -->
- <definition name="doc.mainLayout" template="/layout/classicLayout.jsp">
- <put name="title" value="Tiles Library Documentation" />
- <put name="header" value="/common/header.jsp" />
- <put name="menu" value="doc.menu.main" />
- <put name="footer" value="/common/footer.jsp" />
- <put name="body" value="doc.portal.body" />
- </definition>
-
<definition name="test.inner.definition" template="/layout.jsp">
<put name="title" value="This is a configured inner definition."/>
<put name="header" value="/header.jsp"/>
