You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by nl...@apache.org on 2012/03/17 23:19:32 UTC
svn commit: r1302027 - in /tiles/framework/trunk: ./ tiles-autotag/
tiles-autotag/maven-autotag-plugin/
tiles-autotag/tiles-autotag-core-runtime/ tiles-autotag/tiles-autotag-core/
tiles-autotag/tiles-autotag-freemarker-runtime/ tiles-autotag/tiles-auto...
Author: nlebas
Date: Sat Mar 17 22:19:31 2012
New Revision: 1302027
URL: http://svn.apache.org/viewvc?rev=1302027&view=rev
Log:
cleaning up the poms:
- removed tiles-eval (now out of scope)
- updated the poms to use tiles-master-4-SNAPSHOT
(including reference to snapshot repository)
- Regrouped the reporting plugins into tiles-master
and updated them with current versions
- Moved issue management from tiles master into the projects
- Fixed missing licence headers in the poms
Removed:
tiles/framework/trunk/tiles-eval/pom.xml
tiles/framework/trunk/tiles-eval/src/site/site.xml
tiles/framework/trunk/tiles-eval/tiles-eval-api/pom.xml
tiles/framework/trunk/tiles-eval/tiles-eval-api/src/main/java/org/apache/tiles/eval/BasicEvaluatorRegistry.java
tiles/framework/trunk/tiles-eval/tiles-eval-api/src/main/java/org/apache/tiles/eval/DirectEvaluator.java
tiles/framework/trunk/tiles-eval/tiles-eval-api/src/main/java/org/apache/tiles/eval/Evaluator.java
tiles/framework/trunk/tiles-eval/tiles-eval-api/src/main/java/org/apache/tiles/eval/EvaluatorRegistry.java
tiles/framework/trunk/tiles-eval/tiles-eval-api/src/site/site.xml
Modified:
tiles/framework/trunk/pom.xml
tiles/framework/trunk/tiles-autotag/maven-autotag-plugin/pom.xml
tiles/framework/trunk/tiles-autotag/pom.xml
tiles/framework/trunk/tiles-autotag/tiles-autotag-core-runtime/pom.xml
tiles/framework/trunk/tiles-autotag/tiles-autotag-core/pom.xml
tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/pom.xml
tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker/pom.xml
tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp-runtime/pom.xml
tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp/pom.xml
tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity-runtime/pom.xml
tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity/pom.xml
tiles/framework/trunk/tiles-parent/pom.xml
tiles/framework/trunk/tiles-request/pom.xml
tiles/framework/trunk/tiles-request/tiles-request-api/pom.xml
tiles/framework/trunk/tiles-request/tiles-request-freemarker/pom.xml
tiles/framework/trunk/tiles-request/tiles-request-jsp/pom.xml
tiles/framework/trunk/tiles-request/tiles-request-mustache/pom.xml
tiles/framework/trunk/tiles-request/tiles-request-portlet-wildcard/pom.xml
tiles/framework/trunk/tiles-request/tiles-request-portlet/pom.xml
tiles/framework/trunk/tiles-request/tiles-request-servlet-wildcard/pom.xml
tiles/framework/trunk/tiles-request/tiles-request-servlet/pom.xml
tiles/framework/trunk/tiles-request/tiles-request-velocity/pom.xml
Modified: tiles/framework/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/pom.xml?rev=1302027&r1=1302026&r2=1302027&view=diff
==============================================================================
--- tiles/framework/trunk/pom.xml (original)
+++ tiles/framework/trunk/pom.xml Sat Mar 17 22:19:31 2012
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-master</artifactId>
- <version>3</version>
+ <version>4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -49,7 +49,6 @@
<modules>
<module>tiles-request</module>
<module>tiles-autotag</module>
- <module>tiles-eval</module>
<module>tiles-parent</module>
</modules>
Modified: tiles/framework/trunk/tiles-autotag/maven-autotag-plugin/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-autotag/maven-autotag-plugin/pom.xml?rev=1302027&r1=1302026&r2=1302027&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/maven-autotag-plugin/pom.xml (original)
+++ tiles/framework/trunk/tiles-autotag/maven-autotag-plugin/pom.xml Sat Mar 17 22:19:31 2012
@@ -1,4 +1,24 @@
-<?xml version="1.0"?>
+<?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 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">
<modelVersion>4.0.0</modelVersion>
Modified: tiles/framework/trunk/tiles-autotag/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-autotag/pom.xml?rev=1302027&r1=1302026&r2=1302027&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/pom.xml (original)
+++ tiles/framework/trunk/tiles-autotag/pom.xml Sat Mar 17 22:19:31 2012
@@ -1,10 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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">
+
+<!--
+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">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>tiles-master</artifactId>
<groupId>org.apache.tiles</groupId>
- <version>3</version>
+ <version>4-SNAPSHOT</version>
+ <relativePath/>
</parent>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-autotag</artifactId>
@@ -12,6 +34,25 @@
<packaging>pom</packaging>
<name>Autotags</name>
<description>Automatic generation of tags.</description>
+ <url>http://tiles.apache.org/autotag/</url>
+ <scm>
+ <connection>scm:svn:http://svn.eu.apache.org/repos/asf/tiles/framework/trunk/tiles-autotag/</connection>
+ <developerConnection>scm:svn:https://svn.eu.apache.org/repos/asf/tiles/framework/trunk/tiles-autotag/</developerConnection>
+ <url>http://svn.eu.apache.org/viewvc/tiles/framework/trunk/tiles-autotag/</url>
+ </scm>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>https://issues.apache.org/jira/browse/AUTOTAG</url>
+ </issueManagement>
+ <repositories>
+ <repository>
+ <id>apache.snapshots</id>
+ <url>https://repository.apache.org/snapshots</url>
+ <releases><enabled>false</enabled></releases>
+ <snapshots><enabled>true</enabled></snapshots>
+ </repository>
+ </repositories>
+
<modules>
<module>tiles-autotag-core-runtime</module>
<module>tiles-autotag-core</module>
@@ -23,114 +64,25 @@
<module>tiles-autotag-velocity</module>
<module>maven-autotag-plugin</module>
</modules>
- <url>http://tiles.apache.org/autotag/</url>
- <scm>
- <connection>scm:svn:http://svn.eu.apache.org/repos/asf/tiles/framework/trunk/tiles-autotag/</connection>
- <developerConnection>scm:svn:https://svn.eu.apache.org/repos/asf/tiles/framework/trunk/tiles-autotag/</developerConnection>
- <url>http://svn.eu.apache.org/viewvc/tiles/framework/trunk/tiles-autotag/</url>
- </scm>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
<distributionManagement>
<site>
<id>apache-site</id>
<url>scp://people.apache.org/www/tiles.apache.org/autotag</url>
</site>
</distributionManagement>
-
<reporting>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <configLocation>http://svn.eu.apache.org/repos/asf/tiles/maven/trunk/build/tiles_checks_v5.xml
- </configLocation>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jxr-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
+ <artifactId>maven-linkcheck-plugin</artifactId>
+ <version>1.1</version>
<configuration>
- <targetJdk>1.5</targetJdk>
+ <excludedLinks>
+ <excludedLink>**/index.html</excludedLink>
+ <excludedLink>**/logo.png</excludedLink>
+ </excludedLinks>
+ <forceSite>false</forceSite>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
- <reportSets>
- <reportSet>
- <id>aggregated</id>
- <configuration>
- <excludePackageNames>org.apache.tiles.test</excludePackageNames>
- <links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- <link>http://java.sun.com/j2ee/sdk_1.2.1/techdocs/api</link>
- <link>http://commons.apache.org/chain/apidocs</link>
- <link>http://commons.apache.org/digester/commons-digester-1.6/docs/api</link>
- <link>http://commons.apache.org/logging/commons-logging-1.1/apidocs</link>
- </links>
- <doclet>gr.spinellis.umlgraph.doclet.UmlGraphDoc</doclet>
- <docletArtifact>
- <groupId>gr.spinellis</groupId>
- <artifactId>UmlGraph</artifactId>
- <version>4.6</version>
- </docletArtifact>
- <additionalparam>
- -inferrel -inferdep -quiet -hide java.*
- -collpackages java.util.* -qualify
- -postfixpackage -nodefontsize 9
- -nodefontpackagesize 7
- </additionalparam>
- </configuration>
- <reports>
- <report>aggregate</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
- <configuration>
- <includes>
- <include>pom.xml</include>
- <include>src/**</include>
- </includes>
- <excludes>
- <exclude>**/*LICENSE.txt</exclude>
- <exclude>**/*MANIFEST.MF</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>emma-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
- </plugin>
</plugins>
</reporting>
@@ -173,122 +125,6 @@
</plugins>
</build>
</profile>
- <profile>
- <id>maven-3</id>
- <activation>
- <file>
- <exists>${basedir}</exists>
- </file>
- </activation>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.0-beta-3</version>
- <configuration>
- <reportingPlugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <configLocation>http://svn.eu.apache.org/repos/asf/tiles/maven/trunk/build/tiles_checks_v5.xml
- </configLocation>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jxr-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <targetJdk>1.5</targetJdk>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
- <reports>
- <report>aggregate</report>
- </reports>
- <configuration>
- <excludePackageNames>org.apache.tiles.test</excludePackageNames>
- <links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- <link>http://java.sun.com/j2ee/sdk_1.2.1/techdocs/api</link>
- <link>http://commons.apache.org/chain/apidocs</link>
- <link>http://commons.apache.org/digester/commons-digester-1.6/docs/api</link>
- <link>http://commons.apache.org/logging/commons-logging-1.1/apidocs</link>
- </links>
- <doclet>gr.spinellis.umlgraph.doclet.UmlGraphDoc</doclet>
- <docletArtifact>
- <groupId>gr.spinellis</groupId>
- <artifactId>UmlGraph</artifactId>
- <version>4.6</version>
- </docletArtifact>
- <additionalparam>
- -inferrel
- -inferdep -quiet
- -hide
- java.*
- -collpackages
- java.util.*
- -qualify
- -postfixpackage
- -nodefontsize 9
- -nodefontpackagesize 7
- </additionalparam>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
- <configuration>
- <includes>
- <include>pom.xml</include>
- <include>src/**</include>
- </includes>
- <excludes>
- <exclude>**/*LICENSE.txt</exclude>
- <exclude>**/*MANIFEST.MF</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>emma-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
- </plugin>
- </reportingPlugins>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-descriptor</id>
- <goals>
- <goal>attach-descriptor</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
Modified: tiles/framework/trunk/tiles-autotag/tiles-autotag-core-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-autotag/tiles-autotag-core-runtime/pom.xml?rev=1302027&r1=1302026&r2=1302027&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-core-runtime/pom.xml (original)
+++ tiles/framework/trunk/tiles-autotag/tiles-autotag-core-runtime/pom.xml Sat Mar 17 22:19:31 2012
@@ -1,3 +1,24 @@
+<?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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
Modified: tiles/framework/trunk/tiles-autotag/tiles-autotag-core/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-autotag/tiles-autotag-core/pom.xml?rev=1302027&r1=1302026&r2=1302027&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-core/pom.xml (original)
+++ tiles/framework/trunk/tiles-autotag/tiles-autotag-core/pom.xml Sat Mar 17 22:19:31 2012
@@ -1,3 +1,24 @@
+<?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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
Modified: tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/pom.xml?rev=1302027&r1=1302026&r2=1302027&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/pom.xml (original)
+++ tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker-runtime/pom.xml Sat Mar 17 22:19:31 2012
@@ -1,3 +1,24 @@
+<?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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -45,4 +66,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker/pom.xml?rev=1302027&r1=1302026&r2=1302027&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker/pom.xml (original)
+++ tiles/framework/trunk/tiles-autotag/tiles-autotag-freemarker/pom.xml Sat Mar 17 22:19:31 2012
@@ -1,3 +1,24 @@
+<?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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -35,4 +56,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp-runtime/pom.xml?rev=1302027&r1=1302026&r2=1302027&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp-runtime/pom.xml (original)
+++ tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp-runtime/pom.xml Sat Mar 17 22:19:31 2012
@@ -1,3 +1,24 @@
+<?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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -46,4 +67,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp/pom.xml?rev=1302027&r1=1302026&r2=1302027&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp/pom.xml (original)
+++ tiles/framework/trunk/tiles-autotag/tiles-autotag-jsp/pom.xml Sat Mar 17 22:19:31 2012
@@ -1,3 +1,24 @@
+<?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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
Modified: tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity-runtime/pom.xml?rev=1302027&r1=1302026&r2=1302027&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity-runtime/pom.xml (original)
+++ tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity-runtime/pom.xml Sat Mar 17 22:19:31 2012
@@ -1,3 +1,24 @@
+<?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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -44,4 +65,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity/pom.xml?rev=1302027&r1=1302026&r2=1302027&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity/pom.xml (original)
+++ tiles/framework/trunk/tiles-autotag/tiles-autotag-velocity/pom.xml Sat Mar 17 22:19:31 2012
@@ -1,3 +1,24 @@
+<?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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -35,4 +56,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: tiles/framework/trunk/tiles-parent/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/pom.xml?rev=1302027&r1=1302026&r2=1302027&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/pom.xml (original)
+++ tiles/framework/trunk/tiles-parent/pom.xml Sat Mar 17 22:19:31 2012
@@ -24,9 +24,10 @@
<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-master</artifactId>
- <version>3</version>
+ <groupId>org.apache.tiles</groupId>
+ <version>4-SNAPSHOT</version>
+ <relativePath/>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -45,6 +46,15 @@
<ciManagement />
+ <repositories>
+ <repository>
+ <id>apache.snapshots</id>
+ <url>https://repository.apache.org/snapshots</url>
+ <releases><enabled>false</enabled></releases>
+ <snapshots><enabled>true</enabled></snapshots>
+ </repository>
+ </repositories>
+
<modules>
<module>tiles-api</module>
<module>tiles-core</module>
@@ -61,6 +71,10 @@
<module>assembly</module>
<module>tiles-test-pom</module>
</modules>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>https://issues.apache.org/jira/browse/TILES</url>
+ </issueManagement>
<distributionManagement>
<site>
@@ -73,14 +87,6 @@
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
@@ -97,11 +103,6 @@
<artifactId>maven-bundle-plugin</artifactId>
<inherited>true</inherited>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.0</version>
- </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -151,90 +152,6 @@
<defaultGoal>install</defaultGoal>
</build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <configLocation>http://svn.eu.apache.org/repos/asf/tiles/maven/trunk/build/tiles_checks_v5.xml
- </configLocation>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jxr-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <targetJdk>1.5</targetJdk>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
- <reportSets>
- <reportSet>
- <id>aggregated</id>
- <configuration>
- <excludePackageNames>org.apache.tiles.test</excludePackageNames>
- <links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- <link>http://java.sun.com/j2ee/sdk_1.2.1/techdocs/api</link>
- <link>http://commons.apache.org/chain/apidocs</link>
- <link>http://commons.apache.org/digester/commons-digester-1.6/docs/api</link>
- <link>http://commons.apache.org/logging/commons-logging-1.1/apidocs</link>
- </links>
- <doclet>gr.spinellis.umlgraph.doclet.UmlGraphDoc</doclet>
- <docletArtifact>
- <groupId>gr.spinellis</groupId>
- <artifactId>UmlGraph</artifactId>
- <version>4.6</version>
- </docletArtifact>
- <additionalparam>
- -inferrel -inferdep -quiet -hide java.*
- -collpackages java.util.* -qualify
- -postfixpackage -nodefontsize 9
- -nodefontpackagesize 7
- </additionalparam>
- </configuration>
- <reports>
- <report>aggregate</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
- <configuration>
- <includes>
- <include>pom.xml</include>
- <include>src/**</include>
- </includes>
- <excludes>
- <exclude>**/*LICENSE.txt</exclude>
- <exclude>**/*MANIFEST.MF</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>emma-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
- </plugin>
- </plugins>
- </reporting>
-
<properties>
<tiles.osgi.symbolicName>org.apache.${artifactId}</tiles.osgi.symbolicName>
<tiles.osgi.export>org.apache.tiles.*;version=${pom.version}</tiles.osgi.export>
@@ -246,6 +163,22 @@
</properties>
<dependencies />
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-linkcheck-plugin</artifactId>
+ <version>1.1</version>
+ <configuration>
+ <excludedLinks>
+ <excludedLink>**/index.html</excludedLink>
+ <excludedLink>**/logo.png</excludedLink>
+ <excludedLink>**/tiles-jsp/tagreference.html</excludedLink>
+ </excludedLinks>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+
<profiles>
<profile>
@@ -286,122 +219,6 @@
</plugins>
</build>
</profile>
- <profile>
- <id>maven-3</id>
- <activation>
- <file>
- <exists>${basedir}</exists>
- </file>
- </activation>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.0-beta-3</version>
- <configuration>
- <reportingPlugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <configLocation>http://svn.eu.apache.org/repos/asf/tiles/maven/trunk/build/tiles_checks_v5.xml
- </configLocation>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jxr-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <targetJdk>1.5</targetJdk>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
- <reports>
- <report>aggregate</report>
- </reports>
- <configuration>
- <excludePackageNames>org.apache.tiles.test</excludePackageNames>
- <links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- <link>http://java.sun.com/j2ee/sdk_1.2.1/techdocs/api</link>
- <link>http://commons.apache.org/chain/apidocs</link>
- <link>http://commons.apache.org/digester/commons-digester-1.6/docs/api</link>
- <link>http://commons.apache.org/logging/commons-logging-1.1/apidocs</link>
- </links>
- <doclet>gr.spinellis.umlgraph.doclet.UmlGraphDoc</doclet>
- <docletArtifact>
- <groupId>gr.spinellis</groupId>
- <artifactId>UmlGraph</artifactId>
- <version>4.6</version>
- </docletArtifact>
- <additionalparam>
- -inferrel
- -inferdep -quiet
- -hide
- java.*
- -collpackages
- java.util.*
- -qualify
- -postfixpackage
- -nodefontsize 9
- -nodefontpackagesize 7
- </additionalparam>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
- <configuration>
- <includes>
- <include>pom.xml</include>
- <include>src/**</include>
- </includes>
- <excludes>
- <exclude>**/*LICENSE.txt</exclude>
- <exclude>**/*MANIFEST.MF</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>emma-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
- </plugin>
- </reportingPlugins>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-descriptor</id>
- <goals>
- <goal>attach-descriptor</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
Modified: tiles/framework/trunk/tiles-request/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/pom.xml?rev=1302027&r1=1302026&r2=1302027&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/pom.xml (original)
+++ tiles/framework/trunk/tiles-request/pom.xml Sat Mar 17 22:19:31 2012
@@ -1,140 +1,92 @@
+<?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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>tiles-master</artifactId>
- <groupId>org.apache.tiles</groupId>
- <version>3</version>
- </parent>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-request</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>Tiles Request Framework</name>
- <description>Request abstraction for various request and template technologies</description>
- <url>http://tiles.apache.org/request/</url>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>tiles-master</artifactId>
+ <groupId>org.apache.tiles</groupId>
+ <version>4-SNAPSHOT</version>
+ <relativePath/>
+ </parent>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-request</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>Tiles Request Framework</name>
+ <description>Request abstraction for various request and template technologies</description>
+ <url>http://tiles.apache.org/request/</url>
<scm>
<connection>scm:svn:http://svn.eu.apache.org/repos/asf/tiles/framework/trunk/tiles-request/</connection>
<developerConnection>scm:svn:https://svn.eu.apache.org/repos/asf/tiles/framework/trunk/tiles-request/</developerConnection>
<url>http://svn.eu.apache.org/viewvc/tiles/framework/trunk/tiles-request/</url>
</scm>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>https://issues.apache.org/jira/browse/TREQ</url>
+ </issueManagement>
+ <repositories>
+ <repository>
+ <id>apache.snapshots</id>
+ <url>https://repository.apache.org/snapshots</url>
+ <releases><enabled>false</enabled></releases>
+ <snapshots><enabled>true</enabled></snapshots>
+ </repository>
+ </repositories>
- <modules>
- <module>tiles-request-api</module>
- <module>tiles-request-servlet</module>
- <module>tiles-request-servlet-wildcard</module>
- <module>tiles-request-portlet</module>
- <module>tiles-request-portlet-wildcard</module>
- <module>tiles-request-jsp</module>
- <module>tiles-request-freemarker</module>
- <module>tiles-request-velocity</module>
+ <modules>
+ <module>tiles-request-api</module>
+ <module>tiles-request-servlet</module>
+ <module>tiles-request-servlet-wildcard</module>
+ <module>tiles-request-portlet</module>
+ <module>tiles-request-portlet-wildcard</module>
+ <module>tiles-request-jsp</module>
+ <module>tiles-request-freemarker</module>
+ <module>tiles-request-velocity</module>
<module>tiles-request-mustache</module>
- </modules>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
+ </modules>
<distributionManagement>
<site>
<id>apache-site</id>
<url>scp://people.apache.org/www/tiles.apache.org/request</url>
</site>
</distributionManagement>
-
<reporting>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <configLocation>http://svn.apache.org/repos/asf/tiles/maven/trunk/build/tiles_checks_v5.xml
- </configLocation>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jxr-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <targetJdk>1.5</targetJdk>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
- <reportSets>
- <reportSet>
- <id>aggregated</id>
- <configuration>
- <excludePackageNames>org.apache.tiles.test</excludePackageNames>
- <links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- <link>http://java.sun.com/j2ee/sdk_1.2.1/techdocs/api</link>
- <link>http://commons.apache.org/chain/apidocs</link>
- <link>http://commons.apache.org/digester/commons-digester-1.6/docs/api</link>
- <link>http://commons.apache.org/logging/commons-logging-1.1/apidocs</link>
- </links>
- <doclet>gr.spinellis.umlgraph.doclet.UmlGraphDoc</doclet>
- <docletArtifact>
- <groupId>gr.spinellis</groupId>
- <artifactId>UmlGraph</artifactId>
- <version>4.6</version>
- </docletArtifact>
- <additionalparam>
- -inferrel -inferdep -quiet -hide java.*
- -collpackages java.util.* -qualify
- -postfixpackage -nodefontsize 9
- -nodefontpackagesize 7
- </additionalparam>
- </configuration>
- <reports>
- <report>aggregate</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
+ <artifactId>maven-linkcheck-plugin</artifactId>
+ <version>1.1</version>
<configuration>
- <includes>
- <include>pom.xml</include>
- <include>src/**</include>
- </includes>
- <excludes>
- <exclude>**/*LICENSE.txt</exclude>
- <exclude>**/*MANIFEST.MF</exclude>
- </excludes>
+ <excludedLinks>
+ <excludedLink>**/index.html</excludedLink>
+ <excludedLink>**/logo.png</excludedLink>
+ </excludedLinks>
+ <forceSite>false</forceSite>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>emma-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
- </plugin>
</plugins>
</reporting>
+
<profiles>
<profile>
<id>apache-release</id>
@@ -174,122 +126,6 @@
</plugins>
</build>
</profile>
- <profile>
- <id>maven-3</id>
- <activation>
- <file>
- <exists>${basedir}</exists>
- </file>
- </activation>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.0-beta-3</version>
- <configuration>
- <reportingPlugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <configLocation>http://svn.eu.apache.org/repos/asf/tiles/maven/trunk/build/tiles_checks_v5.xml
- </configLocation>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jxr-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <targetJdk>1.5</targetJdk>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
- <reports>
- <report>aggregate</report>
- </reports>
- <configuration>
- <excludePackageNames>org.apache.tiles.test</excludePackageNames>
- <links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- <link>http://java.sun.com/j2ee/sdk_1.2.1/techdocs/api</link>
- <link>http://commons.apache.org/chain/apidocs</link>
- <link>http://commons.apache.org/digester/commons-digester-1.6/docs/api</link>
- <link>http://commons.apache.org/logging/commons-logging-1.1/apidocs</link>
- </links>
- <doclet>gr.spinellis.umlgraph.doclet.UmlGraphDoc</doclet>
- <docletArtifact>
- <groupId>gr.spinellis</groupId>
- <artifactId>UmlGraph</artifactId>
- <version>4.6</version>
- </docletArtifact>
- <additionalparam>
- -inferrel
- -inferdep -quiet
- -hide
- java.*
- -collpackages
- java.util.*
- -qualify
- -postfixpackage
- -nodefontsize 9
- -nodefontpackagesize 7
- </additionalparam>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
- <configuration>
- <includes>
- <include>pom.xml</include>
- <include>src/**</include>
- </includes>
- <excludes>
- <exclude>**/*LICENSE.txt</exclude>
- <exclude>**/*MANIFEST.MF</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>emma-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
- </plugin>
- </reportingPlugins>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-descriptor</id>
- <goals>
- <goal>attach-descriptor</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
Modified: tiles/framework/trunk/tiles-request/tiles-request-api/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-api/pom.xml?rev=1302027&r1=1302026&r2=1302027&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-api/pom.xml (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-api/pom.xml Sat Mar 17 22:19:31 2012
@@ -1,3 +1,24 @@
+<?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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -31,4 +52,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: tiles/framework/trunk/tiles-request/tiles-request-freemarker/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-freemarker/pom.xml?rev=1302027&r1=1302026&r2=1302027&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-freemarker/pom.xml (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-freemarker/pom.xml Sat Mar 17 22:19:31 2012
@@ -1,3 +1,24 @@
+<?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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -14,7 +35,7 @@
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-request-api</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.freemarker</groupId>
@@ -57,4 +78,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: tiles/framework/trunk/tiles-request/tiles-request-jsp/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-jsp/pom.xml?rev=1302027&r1=1302026&r2=1302027&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-jsp/pom.xml (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-jsp/pom.xml Sat Mar 17 22:19:31 2012
@@ -1,3 +1,24 @@
+<?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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -15,13 +36,13 @@
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-request-api</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-request-servlet</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -67,4 +88,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: tiles/framework/trunk/tiles-request/tiles-request-mustache/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-mustache/pom.xml?rev=1302027&r1=1302026&r2=1302027&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-mustache/pom.xml (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-mustache/pom.xml Sat Mar 17 22:19:31 2012
@@ -1,3 +1,24 @@
+<?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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -14,13 +35,13 @@
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-request-api</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-request-servlet</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -58,12 +79,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <repositories>
- <repository>
- <id>sonatype-nexus</id>
- <name>sonatype-nexus</name>
- <url>https://oss.sonatype.org/content/repositories/releases/</url>
- </repository>
- </repositories>
</project>
Modified: tiles/framework/trunk/tiles-request/tiles-request-portlet-wildcard/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-portlet-wildcard/pom.xml?rev=1302027&r1=1302026&r2=1302027&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-portlet-wildcard/pom.xml (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-portlet-wildcard/pom.xml Sat Mar 17 22:19:31 2012
@@ -85,7 +85,7 @@
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-request-portlet</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: tiles/framework/trunk/tiles-request/tiles-request-portlet/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-portlet/pom.xml?rev=1302027&r1=1302026&r2=1302027&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-portlet/pom.xml (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-portlet/pom.xml Sat Mar 17 22:19:31 2012
@@ -71,29 +71,16 @@
</build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>net.sf.dtddoc</groupId>
- <artifactId>dtddoc-maven-plugin</artifactId>
- <configuration>
- <docTitle>Tiles Definition File</docTitle>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
-
<dependencies>
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-request-api</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-request-servlet</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
Modified: tiles/framework/trunk/tiles-request/tiles-request-servlet-wildcard/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-servlet-wildcard/pom.xml?rev=1302027&r1=1302026&r2=1302027&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-servlet-wildcard/pom.xml (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-servlet-wildcard/pom.xml Sat Mar 17 22:19:31 2012
@@ -74,7 +74,7 @@
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-request-servlet</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
Modified: tiles/framework/trunk/tiles-request/tiles-request-servlet/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-servlet/pom.xml?rev=1302027&r1=1302026&r2=1302027&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-servlet/pom.xml (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-servlet/pom.xml Sat Mar 17 22:19:31 2012
@@ -1,3 +1,24 @@
+<?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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -14,7 +35,7 @@
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-request-api</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -48,4 +69,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: tiles/framework/trunk/tiles-request/tiles-request-velocity/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/tiles-request-velocity/pom.xml?rev=1302027&r1=1302026&r2=1302027&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-velocity/pom.xml (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-velocity/pom.xml Sat Mar 17 22:19:31 2012
@@ -1,3 +1,24 @@
+<?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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -43,7 +64,7 @@
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-request-servlet</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>