Author: nlebas
Date: Wed Mar 28 22:53:04 2012
New Revision: 1306630
URL: http://svn.apache.org/viewvc?rev=1306630&view=rev
Log:
fixes:
- replaced deprecated pom.version with project.version everywhere
- fixed some syntax errors in the docs
- fixed the missing tld docs
Modified:
tiles/framework/trunk/pom.xml
tiles/framework/trunk/tiles-autotag/pom.xml
tiles/framework/trunk/tiles-autotag/src/site/apt/dev/release.apt
tiles/framework/trunk/tiles-autotag/src/site/apt/plugin.apt
tiles/framework/trunk/tiles-autotag/src/site/apt/taglib.apt
tiles/framework/trunk/tiles-parent/assembly/pom.xml
tiles/framework/trunk/tiles-parent/pom.xml
tiles/framework/trunk/tiles-parent/src/site/apt/dev/release.apt
tiles/framework/trunk/tiles-parent/tiles-compat/pom.xml
tiles/framework/trunk/tiles-parent/tiles-core/pom.xml
tiles/framework/trunk/tiles-parent/tiles-el/pom.xml
tiles/framework/trunk/tiles-parent/tiles-extras/pom.xml
tiles/framework/trunk/tiles-parent/tiles-freemarker/pom.xml
tiles/framework/trunk/tiles-parent/tiles-jsp/pom.xml
tiles/framework/trunk/tiles-parent/tiles-mvel/pom.xml
tiles/framework/trunk/tiles-parent/tiles-ognl/pom.xml
tiles/framework/trunk/tiles-parent/tiles-servlet/pom.xml
tiles/framework/trunk/tiles-parent/tiles-template/pom.xml
tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test-alt/pom.xml
tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test-common/pom.xml
tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test-db/pom.xml
tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test/pom.xml
tiles/framework/trunk/tiles-parent/tiles-velocity/pom.xml
tiles/framework/trunk/tiles-request/pom.xml
tiles/framework/trunk/tiles-request/src/site/apt/dev/release.apt
tiles/framework/trunk/tiles-request/tiles-request-freemarker/pom.xml
tiles/framework/trunk/tiles-request/tiles-request-jsp/pom.xml
Modified: tiles/framework/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/pom.xml?rev=1306630&r1=1306629&r2=1306630&view=diff
==============================================================================
--- tiles/framework/trunk/pom.xml (original)
+++ tiles/framework/trunk/pom.xml Wed Mar 28 22:53:04 2012
@@ -182,7 +182,7 @@
<properties>
<tiles.osgi.symbolicName>org.apache.${artifactId}</tiles.osgi.symbolicName>
-
<tiles.osgi.export>org.apache.tiles.*;version=${pom.version}</tiles.osgi.export>
+
<tiles.osgi.export>org.apache.tiles.*;version=${project.version}</tiles.osgi.export>
<tiles.osgi.import>*</tiles.osgi.import>
<tiles.osgi.dynamicImport />
<tiles.osgi.private />
Modified: tiles/framework/trunk/tiles-autotag/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-autotag/pom.xml?rev=1306630&r1=1306629&r2=1306630&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/pom.xml (original)
+++ tiles/framework/trunk/tiles-autotag/pom.xml Wed Mar 28 22:53:04 2012
@@ -67,21 +67,6 @@ under the License.
<url>scp://people.apache.org/www/tiles.apache.org/tiles-autotag</url>
</site>
</distributionManagement>
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-linkcheck-plugin</artifactId>
- <version>1.1</version>
- <configuration>
- <excludedLinks>
- <excludedLink>**/index.html</excludedLink>
- <excludedLink>**/logo.png</excludedLink>
- </excludedLinks>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
<profiles>
<profile>
<id>apache-release</id>
@@ -121,6 +106,24 @@ under the License.
</plugins>
</build>
</profile>
+ <profile>
+ <id>linkcheck</id>
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-linkcheck-plugin</artifactId>
+ <version>1.1</version>
+ <configuration>
+ <excludedLinks>
+ <excludedLink>**/index.html</excludedLink>
+ <excludedLink>**/logo.png</excludedLink>
+ </excludedLinks>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+ </profile>
+
</profiles>
</project>
Modified: tiles/framework/trunk/tiles-autotag/src/site/apt/dev/release.apt
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-autotag/src/site/apt/dev/release.apt?rev=1306630&r1=1306629&r2=1306630&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/src/site/apt/dev/release.apt (original)
+++ tiles/framework/trunk/tiles-autotag/src/site/apt/dev/release.apt Wed Mar 28
22:53:04 2012
@@ -149,7 +149,7 @@ mvn release:perform
* Close the staging repository
- Login to {{{https://repository.apache.org using} Nexus repository}} your
Apache LDAP credentials.
+ Login to {{{https://repository.apache.org} Nexus repository}} using your
Apache LDAP credentials.
Click on "Staging". Then click on "tiles" in the list of repositories.
In the panel below you should see an open repository that is linked to your
username and ip.
Right click on this repository and select "Close".
Modified: tiles/framework/trunk/tiles-autotag/src/site/apt/plugin.apt
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-autotag/src/site/apt/plugin.apt?rev=1306630&r1=1306629&r2=1306630&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/src/site/apt/plugin.apt (original)
+++ tiles/framework/trunk/tiles-autotag/src/site/apt/plugin.apt Wed Mar 28
22:53:04 2012
@@ -23,7 +23,7 @@
Building a tag library for Freemarker, JSP or Velocity
- Once you have {{{taglib.html}created a generic tag library}},
+ Once you have {{{./taglib.html}created a generic tag library}},
Autotag will automatically generate the corresponding library
for Freemarker, JSP, or Velocity. You just create a maven project
and include in <<<pom.xml>>>:
Modified: tiles/framework/trunk/tiles-autotag/src/site/apt/taglib.apt
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-autotag/src/site/apt/taglib.apt?rev=1306630&r1=1306629&r2=1306630&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-autotag/src/site/apt/taglib.apt (original)
+++ tiles/framework/trunk/tiles-autotag/src/site/apt/taglib.apt Wed Mar 28
22:53:04 2012
@@ -53,6 +53,7 @@ Creating a generic tag library
at runtime it will contain the contents of the tag in the template.
For instance:
+
----------------
public class MyTagModel {
Modified: tiles/framework/trunk/tiles-parent/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/assembly/pom.xml?rev=1306630&r1=1306629&r2=1306630&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/assembly/pom.xml (original)
+++ tiles/framework/trunk/tiles-parent/assembly/pom.xml Wed Mar 28 22:53:04 2012
@@ -108,10 +108,10 @@
<mkdir dir="${project.build.directory}/assemblies" />
<echo message="Here I am!" />
<copy todir="${project.build.directory}/assemblies">
- <fileset
dir="${settings.localRepository}/org/apache/tiles/tiles-assembly/${pom.version}">
- <include name="tiles-assembly-${pom.version}-*.zip*" />
- <include
name="tiles-assembly-${pom.version}-*.tar.gz*" />
- <exclude
name="tiles-assembly-${pom.version}-source-release.*"/>
+ <fileset
dir="${settings.localRepository}/org/apache/tiles/tiles-assembly/${project.version}">
+ <include
name="tiles-assembly-${project.version}-*.zip*" />
+ <include
name="tiles-assembly-${project.version}-*.tar.gz*" />
+ <exclude
name="tiles-assembly-${project.version}-source-release.*"/>
</fileset>
<mapper type="glob" from="tiles-assembly-*"
to="tiles-*"/>
</copy>
@@ -132,7 +132,7 @@
<configuration>
<fromDir>${project.build.directory}/assemblies</fromDir>
<includes>**</includes>
- <toDir>${pom.version}</toDir>
+ <toDir>${project.version}</toDir>
<serverId>tiles.build</serverId>
<url>scp://people.apache.org/www/people.apache.org/builds/tiles</url>
</configuration>
@@ -150,44 +150,44 @@
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-api</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-servlet</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-jsp</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-compat</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-test</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-extras</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
<type>jar</type>
</dependency>
Modified: tiles/framework/trunk/tiles-parent/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/pom.xml?rev=1306630&r1=1306629&r2=1306630&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/pom.xml (original)
+++ tiles/framework/trunk/tiles-parent/pom.xml Wed Mar 28 22:53:04 2012
@@ -101,6 +101,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <version>2.3.7</version>
<inherited>true</inherited>
</plugin>
</plugins>
@@ -154,7 +155,7 @@
<properties>
<tiles.osgi.symbolicName>org.apache.${artifactId}</tiles.osgi.symbolicName>
-
<tiles.osgi.export>org.apache.tiles.*;version=${pom.version}</tiles.osgi.export>
+
<tiles.osgi.export>org.apache.tiles.*;version=${project.version}</tiles.osgi.export>
<tiles.osgi.import>*</tiles.osgi.import>
<tiles.osgi.dynamicImport />
<tiles.osgi.private />
@@ -163,22 +164,6 @@
</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>
@@ -219,6 +204,25 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>linkcheck</id>
+ <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>
+ </profile>
+
</profiles>
</project>
Modified: tiles/framework/trunk/tiles-parent/src/site/apt/dev/release.apt
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/src/site/apt/dev/release.apt?rev=1306630&r1=1306629&r2=1306630&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/src/site/apt/dev/release.apt (original)
+++ tiles/framework/trunk/tiles-parent/src/site/apt/dev/release.apt Wed Mar 28
22:53:04 2012
@@ -151,7 +151,7 @@ mvn release:perform
* Close the staging repository
- Login to {{{https://repository.apache.org using} Nexus repository}} your
Apache LDAP credentials.
+ Login to {{{https://repository.apache.org} Nexus repository}} using your
Apache LDAP credentials.
Click on "Staging". Then click on "tiles" in the list of repositories.
In the panel below you should see an open repository that is linked to your
username and ip.
Right click on this repository and select "Close".
Modified: tiles/framework/trunk/tiles-parent/tiles-compat/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-compat/pom.xml?rev=1306630&r1=1306629&r2=1306630&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-compat/pom.xml (original)
+++ tiles/framework/trunk/tiles-parent/tiles-compat/pom.xml Wed Mar 28 22:53:04
2012
@@ -88,13 +88,13 @@
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-jsp</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
Modified: tiles/framework/trunk/tiles-parent/tiles-core/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-core/pom.xml?rev=1306630&r1=1306629&r2=1306630&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-core/pom.xml (original)
+++ tiles/framework/trunk/tiles-parent/tiles-core/pom.xml Wed Mar 28 22:53:04
2012
@@ -88,7 +88,7 @@
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-api</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
Modified: tiles/framework/trunk/tiles-parent/tiles-el/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-el/pom.xml?rev=1306630&r1=1306629&r2=1306630&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-el/pom.xml (original)
+++ tiles/framework/trunk/tiles-parent/tiles-el/pom.xml Wed Mar 28 22:53:04 2012
@@ -90,7 +90,7 @@
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
Modified: tiles/framework/trunk/tiles-parent/tiles-extras/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-extras/pom.xml?rev=1306630&r1=1306629&r2=1306630&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-extras/pom.xml (original)
+++ tiles/framework/trunk/tiles-parent/tiles-extras/pom.xml Wed Mar 28 22:53:04
2012
@@ -64,7 +64,7 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>tiles-core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
@@ -74,37 +74,37 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>tiles-jsp</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>tiles-freemarker</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>tiles-velocity</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>tiles-el</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>tiles-mvel</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>tiles-ognl</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>tiles-compat</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
Modified: tiles/framework/trunk/tiles-parent/tiles-freemarker/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-freemarker/pom.xml?rev=1306630&r1=1306629&r2=1306630&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-freemarker/pom.xml (original)
+++ tiles/framework/trunk/tiles-parent/tiles-freemarker/pom.xml Wed Mar 28
22:53:04 2012
@@ -56,12 +56,12 @@
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-servlet</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-template</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.freemarker</groupId>
Modified: tiles/framework/trunk/tiles-parent/tiles-jsp/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-jsp/pom.xml?rev=1306630&r1=1306629&r2=1306630&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-jsp/pom.xml (original)
+++ tiles/framework/trunk/tiles-parent/tiles-jsp/pom.xml Wed Mar 28 22:53:04
2012
@@ -95,6 +95,15 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>net.sourceforge.maven-taglib</groupId>
+ <artifactId>maven-taglib-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <parseHtml>true</parseHtml>
+ <srcDir>${project.build.outputDirectory}/META-INF/tld</srcDir>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -104,8 +113,10 @@
<plugin>
<groupId>net.sourceforge.maven-taglib</groupId>
<artifactId>maven-taglib-plugin</artifactId>
+ <version>2.4</version>
<configuration>
<parseHtml>true</parseHtml>
+ <srcDir>${project.build.outputDirectory}/META-INF/tld</srcDir>
</configuration>
</plugin>
</plugins>
@@ -116,12 +127,12 @@
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-servlet</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-template</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
Modified: tiles/framework/trunk/tiles-parent/tiles-mvel/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-mvel/pom.xml?rev=1306630&r1=1306629&r2=1306630&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-mvel/pom.xml (original)
+++ tiles/framework/trunk/tiles-parent/tiles-mvel/pom.xml Wed Mar 28 22:53:04
2012
@@ -85,7 +85,7 @@
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
Modified: tiles/framework/trunk/tiles-parent/tiles-ognl/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-ognl/pom.xml?rev=1306630&r1=1306629&r2=1306630&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-ognl/pom.xml (original)
+++ tiles/framework/trunk/tiles-parent/tiles-ognl/pom.xml Wed Mar 28 22:53:04
2012
@@ -85,7 +85,7 @@
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
Modified: tiles/framework/trunk/tiles-parent/tiles-servlet/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-servlet/pom.xml?rev=1306630&r1=1306629&r2=1306630&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-servlet/pom.xml (original)
+++ tiles/framework/trunk/tiles-parent/tiles-servlet/pom.xml Wed Mar 28
22:53:04 2012
@@ -99,7 +99,7 @@
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
Modified: tiles/framework/trunk/tiles-parent/tiles-template/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-template/pom.xml?rev=1306630&r1=1306629&r2=1306630&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-template/pom.xml (original)
+++ tiles/framework/trunk/tiles-parent/tiles-template/pom.xml Wed Mar 28
22:53:04 2012
@@ -55,7 +55,7 @@
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-api</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
Modified:
tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test-alt/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test-alt/pom.xml?rev=1306630&r1=1306629&r2=1306630&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test-alt/pom.xml
(original)
+++ tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test-alt/pom.xml
Wed Mar 28 22:53:04 2012
@@ -56,7 +56,7 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>tiles-test-common</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified:
tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test-common/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test-common/pom.xml?rev=1306630&r1=1306629&r2=1306630&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test-common/pom.xml
(original)
+++ tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test-common/pom.xml
Wed Mar 28 22:53:04 2012
@@ -37,7 +37,7 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>tiles-extras</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified:
tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test-db/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test-db/pom.xml?rev=1306630&r1=1306629&r2=1306630&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test-db/pom.xml
(original)
+++ tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test-db/pom.xml Wed
Mar 28 22:53:04 2012
@@ -35,7 +35,7 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>tiles-test-common</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Modified: tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test/pom.xml?rev=1306630&r1=1306629&r2=1306630&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test/pom.xml
(original)
+++ tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test/pom.xml Wed
Mar 28 22:53:04 2012
@@ -40,22 +40,22 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>tiles-test-common</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>tiles-test-alt</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>tiles-test-db</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>tiles-extras</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
@@ -421,9 +421,9 @@
<goal>upload</goal>
</goals>
<configuration>
-
<fromDir>${settings.localRepository}/org/apache/tiles/tiles-test/${pom.version}</fromDir>
-
<includes>tiles-test-${pom.version}.war*</includes>
- <toDir>${pom.version}</toDir>
+
<fromDir>${settings.localRepository}/org/apache/tiles/tiles-test/${project.version}</fromDir>
+
<includes>tiles-test-${project.version}.war*</includes>
+ <toDir>${project.version}</toDir>
<serverId>tiles.build</serverId>
<url>scp://people.apache.org/www/people.apache.org/builds/tiles</url>
</configuration>
Modified: tiles/framework/trunk/tiles-parent/tiles-velocity/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-velocity/pom.xml?rev=1306630&r1=1306629&r2=1306630&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-velocity/pom.xml (original)
+++ tiles/framework/trunk/tiles-parent/tiles-velocity/pom.xml Wed Mar 28
22:53:04 2012
@@ -57,12 +57,12 @@
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-servlet</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-template</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
Modified: tiles/framework/trunk/tiles-request/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/pom.xml?rev=1306630&r1=1306629&r2=1306630&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/pom.xml (original)
+++ tiles/framework/trunk/tiles-request/pom.xml Wed Mar 28 22:53:04 2012
@@ -70,21 +70,6 @@ under the License.
<url>scp://people.apache.org/www/tiles.apache.org/tiles-request</url>
</site>
</distributionManagement>
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-linkcheck-plugin</artifactId>
- <version>1.1</version>
- <configuration>
- <excludedLinks>
- <excludedLink>**/index.html</excludedLink>
- <excludedLink>**/logo.png</excludedLink>
- </excludedLinks>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
<profiles>
<profile>
@@ -125,6 +110,24 @@ under the License.
</plugins>
</build>
</profile>
+ <profile>
+ <id>linkcheck</id>
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-linkcheck-plugin</artifactId>
+ <version>1.1</version>
+ <configuration>
+ <excludedLinks>
+ <excludedLink>**/index.html</excludedLink>
+ <excludedLink>**/logo.png</excludedLink>
+ </excludedLinks>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ </profile>
</profiles>
</project>
Modified: tiles/framework/trunk/tiles-request/src/site/apt/dev/release.apt
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-request/src/site/apt/dev/release.apt?rev=1306630&r1=1306629&r2=1306630&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/src/site/apt/dev/release.apt (original)
+++ tiles/framework/trunk/tiles-request/src/site/apt/dev/release.apt Wed Mar 28
22:53:04 2012
@@ -149,7 +149,7 @@ mvn release:perform
* Close the staging repository
- Login to {{{https://repository.apache.org using} Nexus repository}} your
Apache LDAP credentials.
+ Login to {{{https://repository.apache.org} Nexus repository}} using your
Apache LDAP credentials.
Click on "Staging". Then click on "tiles" in the list of repositories.
In the panel below you should see an open repository that is linked to your
username and ip.
Right click on this repository and select "Close".
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=1306630&r1=1306629&r2=1306630&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-freemarker/pom.xml
(original)
+++ tiles/framework/trunk/tiles-request/tiles-request-freemarker/pom.xml Wed
Mar 28 22:53:04 2012
@@ -68,7 +68,7 @@ under the License.
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>2.5.2</version>
+ <version>3.0</version>
<scope>test</scope>
</dependency>
<dependency>
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=1306630&r1=1306629&r2=1306630&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-request/tiles-request-jsp/pom.xml (original)
+++ tiles/framework/trunk/tiles-request/tiles-request-jsp/pom.xml Wed Mar 28
22:53:04 2012
@@ -72,7 +72,7 @@ under the License.
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>2.5.1</version>
+ <version>3.0</version>
<scope>test</scope>
</dependency>
<dependency>
