You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2009/01/27 14:48:51 UTC

svn commit: r738091 - in /tiles/framework/trunk: ./ assembly/ tiles-api/ tiles-compat/ tiles-core/ tiles-jsp/ tiles-portlet/ tiles-servlet/ tiles-test/ tiles-test/src/etc/db/project/

Author: apetrelli
Date: Tue Jan 27 13:48:50 2009
New Revision: 738091

URL: http://svn.apache.org/viewvc?rev=738091&view=rev
Log:
TILES-356
Libraries updated, along with a pom cleanup.

Modified:
    tiles/framework/trunk/assembly/pom.xml
    tiles/framework/trunk/pom.xml
    tiles/framework/trunk/tiles-api/pom.xml
    tiles/framework/trunk/tiles-compat/pom.xml
    tiles/framework/trunk/tiles-core/pom.xml
    tiles/framework/trunk/tiles-jsp/pom.xml
    tiles/framework/trunk/tiles-portlet/pom.xml
    tiles/framework/trunk/tiles-servlet/pom.xml
    tiles/framework/trunk/tiles-test/pom.xml
    tiles/framework/trunk/tiles-test/src/etc/db/project/tiles.architect

Modified: tiles/framework/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/assembly/pom.xml?rev=738091&r1=738090&r2=738091&view=diff
==============================================================================
--- tiles/framework/trunk/assembly/pom.xml (original)
+++ tiles/framework/trunk/assembly/pom.xml Tue Jan 27 13:48:50 2009
@@ -184,14 +184,7 @@
     <dependency>
       <groupId>net.sf.retrotranslator</groupId>
       <artifactId>retrotranslator-runtime</artifactId>
-      <version>1.2.1</version>
-      <scope>runtime</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>backport-util-concurrent</groupId>
-      <artifactId>backport-util-concurrent</artifactId>
-      <version>3.0</version>
+      <version>1.2.7</version>
       <scope>runtime</scope>
     </dependency>
 
@@ -207,7 +200,7 @@
     <dependency>
         <groupId>org.apache.tomcat</groupId>
         <artifactId>jasper-el</artifactId>
-        <version>6.0.16</version>
+        <version>6.0.18</version>
         <scope>runtime</scope>
         <optional>true</optional>
         <exclusions>
@@ -221,14 +214,14 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
-      <version>2.5.5</version>
+      <version>2.5.6</version>
       <optional>true</optional>
     </dependency>
 
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc-portlet</artifactId>
-      <version>2.5.5</version>
+      <version>2.5.6</version>
       <optional>true</optional>
       <exclusions>
         <exclusion>

Modified: tiles/framework/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/pom.xml?rev=738091&r1=738090&r2=738091&view=diff
==============================================================================
--- tiles/framework/trunk/pom.xml (original)
+++ tiles/framework/trunk/pom.xml Tue Jan 27 13:48:50 2009
@@ -95,7 +95,7 @@
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
-                    <version>1.4.0</version>
+                    <version>1.4.3</version>
                     <inherited>true</inherited>
                 </plugin>
                 <plugin>
@@ -109,6 +109,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>1.4.3</version>
                 <configuration>
                     <excludeDependencies>true</excludeDependencies>
                     <manifestLocation>target/osgi</manifestLocation>
@@ -205,6 +206,9 @@
                         <include>pom.xml</include>
                         <include>src/**</include>
                     </includes>
+                    <excludes>
+                        <exclude>**/*LICENSE.txt</exclude>
+                    </excludes>
                 </configuration>
             </plugin>
         </plugins>
@@ -224,6 +228,30 @@
     
     <profiles>
         <profile>
+            <id>j4</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>retrotranslator-maven-plugin</artifactId>
+                        <version>1.0-alpha-2</version>
+                        <executions>
+                            <execution>
+                                <id>retrotranslate</id>
+                                <goals>
+                                    <goal>translate-project</goal>
+                                </goals>
+                                <configuration>
+                                    <classifier>j4</classifier>
+                                    <attach>true</attach>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
             <id>release</id>
             <activation>
                 <property>
@@ -233,8 +261,9 @@
             <build>
                 <plugins>
                     <plugin>
+                    	<groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.0-alpha-3</version>
+                        <version>1.0-alpha-4</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>
@@ -269,12 +298,10 @@
                             </execution>
                         </executions>
                     </plugin>
-                    <!-- This configuration will be useful when the RAT plugin
-                    will be able to fail when a license header is missing
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>rat-maven-plugin</artifactId>
-                        <version>1.0-alpha-1</version>
+                        <version>1.0-alpha-3</version>
                         <executions>
                             <execution>
                                 <phase>verify</phase>
@@ -283,16 +310,19 @@
                                 </goals>
                                 <configuration>
                                     <addDefaultLicenseMatchers>false</addDefaultLicenseMatchers>
-                                        <licenseMatchers>
+                                    <licenseMatchers>
                                         <classNames>
-                                            <className>rat.license.standard.ApacheSoftwareLicense20</className>
+                                            <className>rat.analysis.license.ApacheSoftwareLicense20</className>
                                         </classNames>
                                     </licenseMatchers>
+                                    <includes>
+                                        <include>pom.xml</include>
+                                        <include>src/**</include>
+                                    </includes>
                                 </configuration>
                             </execution>
                         </executions>
                     </plugin>
-                     -->                    
                 </plugins>
             </build>
         </profile>

Modified: tiles/framework/trunk/tiles-api/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/pom.xml?rev=738091&r1=738090&r2=738091&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-api/pom.xml (original)
+++ tiles/framework/trunk/tiles-api/pom.xml Tue Jan 27 13:48:50 2009
@@ -72,33 +72,6 @@
 
     </build>
 
-    <profiles>
-        <profile>
-            <id>j4</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>retrotranslator-maven-plugin</artifactId>
-                        <version>1.0-alpha-2</version>
-                        <executions>
-                            <execution>
-                                <id>retrotranslate</id>
-                                <goals>
-                                    <goal>translate-project</goal>
-                                </goals>
-                                <configuration>
-                                    <classifier>j4</classifier>
-                                    <attach>true</attach>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
     <dependencies>
 
         <dependency>
@@ -124,7 +97,7 @@
           <dependency>
               <groupId>org.easymock</groupId>
               <artifactId>easymock</artifactId>
-              <version>2.3</version>
+              <version>2.4</version>
               <scope>test</scope>
           </dependency>
     </dependencies>

Modified: tiles/framework/trunk/tiles-compat/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-compat/pom.xml?rev=738091&r1=738090&r2=738091&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-compat/pom.xml (original)
+++ tiles/framework/trunk/tiles-compat/pom.xml Tue Jan 27 13:48:50 2009
@@ -68,48 +68,9 @@
         </includes>
       </testResource>
     </testResources>
-    <plugins>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-            <manifest>
-            </manifest>
-          </archive>
-        </configuration>
-      </plugin>
-    </plugins>
 
   </build>
 
-  <profiles>
-
-    <profile>
-      <id>j4</id>
-      <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>retrotranslator-maven-plugin</artifactId>
-                <version>1.0-alpha-2</version>
-                <executions>
-                    <execution>
-                        <id>retrotranslate</id>
-                        <goals>
-                            <goal>translate-project</goal>
-                        </goals>
-                        <configuration>
-                            <classifier>j4</classifier>
-                            <attach>true</attach>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
   <reporting>
     <plugins>
       <plugin>
@@ -153,14 +114,14 @@
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>org.apache.shale</groupId>
       <artifactId>shale-test</artifactId>
-      <version>1.0.4</version>
+      <version>1.0.5</version>
       <scope>test</scope>
     </dependency>
 

Modified: tiles/framework/trunk/tiles-core/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/pom.xml?rev=738091&r1=738090&r2=738091&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/pom.xml (original)
+++ tiles/framework/trunk/tiles-core/pom.xml Tue Jan 27 13:48:50 2009
@@ -68,48 +68,9 @@
         </includes>
       </testResource>
     </testResources>
-    <plugins>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-            <manifest>
-            </manifest>
-          </archive>
-        </configuration>
-      </plugin>
-    </plugins>
 
   </build>
 
-  <profiles>
-
-    <profile>
-      <id>j4</id>
-      <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>retrotranslator-maven-plugin</artifactId>
-                <version>1.0-alpha-2</version>
-                <executions>
-                    <execution>
-                        <id>retrotranslate</id>
-                        <goals>
-                            <goal>translate-project</goal>
-                        </goals>
-                        <configuration>
-                            <classifier>j4</classifier>
-                            <attach>true</attach>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
   <reporting>
     <plugins>
       <plugin>
@@ -133,7 +94,7 @@
     <dependency>
       <groupId>commons-digester</groupId>
       <artifactId>commons-digester</artifactId>
-      <version>1.8</version>
+      <version>1.8.1</version>
       <exclusions>
         <exclusion>
           <groupId>commons-logging</groupId>
@@ -158,7 +119,7 @@
     <dependency>
         <groupId>org.apache.tomcat</groupId>
         <artifactId>jasper-el</artifactId>
-        <version>6.0.16</version>
+        <version>6.0.18</version>
         <scope>compile</scope>
         <optional>true</optional>
         <exclusions>
@@ -179,14 +140,14 @@
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>org.apache.shale</groupId>
       <artifactId>shale-test</artifactId>
-      <version>1.0.4</version>
+      <version>1.0.5</version>
       <scope>test</scope>
     </dependency>
 

Modified: tiles/framework/trunk/tiles-jsp/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/pom.xml?rev=738091&r1=738090&r2=738091&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-jsp/pom.xml (original)
+++ tiles/framework/trunk/tiles-jsp/pom.xml Tue Jan 27 13:48:50 2009
@@ -82,34 +82,6 @@
 
   </build>
 
-  <profiles>
-
-        <profile>
-            <id>j4</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>retrotranslator-maven-plugin</artifactId>
-                        <version>1.0-alpha-2</version>
-                        <executions>
-                            <execution>
-                                <id>retrotranslate</id>
-                                <goals>
-                                    <goal>translate-project</goal>
-                                </goals>
-                                <configuration>
-                                    <classifier>j4</classifier>
-                                    <attach>true</attach>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-  </profiles>
-
   <reporting>
     <plugins>
       <plugin>
@@ -131,58 +103,35 @@
     </dependency>
 
     <dependency>
-      <groupId>commons-digester</groupId>
-      <artifactId>commons-digester</artifactId>
-      <version>1.8</version>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging-api</artifactId>
-      <version>1.1</version>
-    </dependency>
-
-    <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
       <version>2.5</version>
       <scope>provided</scope>
     </dependency>
-
     <dependency>
       <groupId>javax.servlet.jsp</groupId>
       <artifactId>jsp-api</artifactId>
       <version>2.1</version>
       <scope>provided</scope>
     </dependency>
-
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.0</version>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
       <version>2.3</version>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymockclassextension</artifactId>
       <version>2.3</version>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>org.apache.shale</groupId>
       <artifactId>shale-test</artifactId>

Modified: tiles/framework/trunk/tiles-portlet/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-portlet/pom.xml?rev=738091&r1=738090&r2=738091&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-portlet/pom.xml (original)
+++ tiles/framework/trunk/tiles-portlet/pom.xml Tue Jan 27 13:48:50 2009
@@ -68,48 +68,9 @@
         </includes>
       </testResource>
     </testResources>
-    <plugins>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-            <manifest>
-            </manifest>
-          </archive>
-        </configuration>
-      </plugin>
-    </plugins>
 
   </build>
 
-  <profiles>
-
-    <profile>
-      <id>j4</id>
-      <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>retrotranslator-maven-plugin</artifactId>
-                <version>1.0-alpha-2</version>
-                <executions>
-                    <execution>
-                        <id>retrotranslate</id>
-                        <goals>
-                            <goal>translate-project</goal>
-                        </goals>
-                        <configuration>
-                            <classifier>j4</classifier>
-                            <attach>true</attach>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
   <reporting>
     <plugins>
       <plugin>
@@ -133,14 +94,14 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
-      <version>2.5.5</version>
+      <version>2.5.6</version>
       <optional>true</optional>
     </dependency>
 
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc-portlet</artifactId>
-      <version>2.5.5</version>
+      <version>2.5.6</version>
       <optional>true</optional>
       <exclusions>
         <exclusion>
@@ -167,35 +128,17 @@
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>org.apache.shale</groupId>
       <artifactId>shale-test</artifactId>
-      <version>1.0.4</version>
+      <version>1.0.5</version>
       <scope>test</scope>
     </dependency>
 
   </dependencies>
 
-  <repositories>
-    <repository>
-      <id>dtddoc</id>
-      <url>http://dtddoc.sf.net/maven2</url>
-    </repository>
-    <repository>
-      <id>java_net</id>
-      <url>http://download.java.net/maven/1/</url>
-      <layout>legacy</layout>
-    </repository>
-  </repositories>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>dtddoc</id>
-      <url>http://dtddoc.sf.net/maven2</url>
-    </pluginRepository>
-  </pluginRepositories>
-
 </project>

Modified: tiles/framework/trunk/tiles-servlet/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-servlet/pom.xml?rev=738091&r1=738090&r2=738091&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-servlet/pom.xml (original)
+++ tiles/framework/trunk/tiles-servlet/pom.xml Tue Jan 27 13:48:50 2009
@@ -82,34 +82,6 @@
 
   </build>
 
-  <profiles>
-
-    <profile>
-      <id>j4</id>
-      <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>retrotranslator-maven-plugin</artifactId>
-                <version>1.0-alpha-2</version>
-                <executions>
-                    <execution>
-                        <id>retrotranslate</id>
-                        <goals>
-                            <goal>translate-project</goal>
-                        </goals>
-                        <configuration>
-                            <classifier>j4</classifier>
-                            <attach>true</attach>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
   <reporting>
     <plugins>
       <plugin>
@@ -131,71 +103,42 @@
     </dependency>
 
     <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging-api</artifactId>
-      <version>1.1</version>
-    </dependency>
-
-    <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
-      <version>2.5.5</version>
+      <version>2.5.6</version>
       <optional>true</optional>
     </dependency>
-
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
       <version>2.5</version>
       <scope>provided</scope>
     </dependency>
-
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.0</version>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymockclassextension</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>org.apache.shale</groupId>
       <artifactId>shale-test</artifactId>
-      <version>1.0.4</version>
+      <version>1.0.5</version>
       <scope>test</scope>
     </dependency>
 
   </dependencies>
 
-  <repositories>
-    <repository>
-      <id>dtddoc</id>
-      <url>http://dtddoc.sf.net/maven2</url>
-    </repository>
-    <repository>
-      <id>java_net</id>
-      <url>http://download.java.net/maven/1/</url>
-      <layout>legacy</layout>
-    </repository>
-  </repositories>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>dtddoc</id>
-      <url>http://dtddoc.sf.net/maven2</url>
-    </pluginRepository>
-  </pluginRepositories>
-
 </project>

Modified: tiles/framework/trunk/tiles-test/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/pom.xml?rev=738091&r1=738090&r2=738091&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/pom.xml (original)
+++ tiles/framework/trunk/tiles-test/pom.xml Tue Jan 27 13:48:50 2009
@@ -62,7 +62,7 @@
       <dependency>
         <groupId>org.apache.tomcat</groupId>
         <artifactId>jasper-el</artifactId>
-        <version>6.0.16</version>
+        <version>6.0.18</version>
         <scope>provided</scope>
         <exclusions>
           <exclusion>
@@ -80,7 +80,7 @@
       <dependency>
         <groupId>org.freemarker</groupId>
         <artifactId>freemarker</artifactId>
-        <version>2.3.10</version>
+        <version>2.3.15</version>
       </dependency>
       <dependency>
         <groupId>hsqldb</groupId>
@@ -95,12 +95,12 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-jdbc</artifactId>
-        <version>2.5.5</version>
+        <version>2.5.6</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-web</artifactId>
-        <version>2.5.5</version>
+        <version>2.5.6</version>
       </dependency>
    </dependencies>
    
@@ -126,7 +126,7 @@
            <plugin>
                <groupId>org.codehaus.cargo</groupId>
                <artifactId>cargo-maven2-plugin</artifactId>
-               <version>1.0-beta-1</version>
+               <version>1.0-beta-2</version>
                <configuration>
                    <container>
                        <containerId>tomcat6x</containerId>
@@ -168,7 +168,7 @@
                                         <artifactItem>
                                             <groupId>org.openqa.selenium.core</groupId>
                                             <artifactId>selenium-core</artifactId>
-                                            <version>0.8.2</version>
+                                            <version>1.0-beta-1</version>
                                         </artifactItem>
                                     </artifactItems>
                                     <outputDirectory>${project.build.directory}/selenium</outputDirectory>
@@ -203,7 +203,7 @@
             <repositories>
                 <repository>
                     <id>OpenQA</id>
-                    <url>http://maven.openqa.org</url>
+                    <url>http://nexus.openqa.org/content/repositories/releases/</url>
                 </repository>
             </repositories>
         </profile>
@@ -308,6 +308,47 @@
         </profile>
 
         <profile>
+            <id>release</id>
+            <activation>
+                <property>
+                    <name>release</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>rat-maven-plugin</artifactId>
+                        <version>1.0-alpha-3</version>
+                        <executions>
+                            <execution>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>check</goal>
+                                </goals>
+                                <configuration>
+                                    <addDefaultLicenseMatchers>false</addDefaultLicenseMatchers>
+                                    <licenseMatchers>
+                                        <classNames>
+                                            <className>rat.analysis.license.ApacheSoftwareLicense20</className>
+                                        </classNames>
+                                    </licenseMatchers>
+                                    <includes>
+                                        <include>pom.xml</include>
+                                        <include>src/**</include>
+                                    </includes>
+                                    <excludes>
+                                        <exclude>**/*.sql</exclude>
+                                    </excludes>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
             <id>tomcat5</id>
             <dependencies>
                 <dependency>
@@ -365,6 +406,7 @@
                     <plugin>
                          <groupId>org.codehaus.cargo</groupId>
                          <artifactId>cargo-maven2-plugin</artifactId>
+                         <version>1.0-beta-2</version>
                          <configuration>
                              <container>
                                  <containerId>tomcat5x</containerId>
@@ -383,27 +425,23 @@
     </profiles>
     <repositories>
         <repository>
-            <id>dtddoc</id>
-            <url>http://dtddoc.sf.net/maven2</url>
-        </repository>
-        <repository>
-            <id>java_net</id>
-            <url>http://download.java.net/maven/1/</url>
-            <layout>legacy</layout>
+            <id>codehaus</id>
+            <name>codehaus</name>
+            <url>http://repository.codehaus.org</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
         </repository>
     </repositories>
     <pluginRepositories>
         <pluginRepository>
-            <id>codehaus.snapshots</id>
-            <url>http://snapshots.repository.codehaus.org/</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
+            <id>codehaus</id>
+            <name>codehaus</name>
+            <url>http://repository.codehaus.org</url>
             <releases>
                 <enabled>true</enabled>
             </releases>
         </pluginRepository>
-    </pluginRepositories>
-
+    </pluginRepositories> -->
 
 </project>
\ No newline at end of file

Modified: tiles/framework/trunk/tiles-test/src/etc/db/project/tiles.architect
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/etc/db/project/tiles.architect?rev=738091&r1=738090&r2=738091&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/src/etc/db/project/tiles.architect (original)
+++ tiles/framework/trunk/tiles-test/src/etc/db/project/tiles.architect Tue Jan 27 13:48:50 2009
@@ -1,4 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * $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.
+ */
+-->
 <architect-project version="1.0" appversion="0.9.10">
  <project-name>tiles</project-name>
  <project-data-sources>