Author: dashorst
Date: Wed Nov 16 17:43:05 2011
New Revision: 1202803

URL: http://svn.apache.org/viewvc?rev=1202803&view=rev
Log:
Tidy of the XML pom files

Modified:
    wicket/trunk/archetypes/quickstart/pom.xml
    
wicket/trunk/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
    wicket/trunk/pom.xml
    wicket/trunk/testing/wicket-threadtest/pom.xml
    wicket/trunk/wicket-auth-roles/pom.xml
    wicket/trunk/wicket-core/pom.xml
    wicket/trunk/wicket-datetime/pom.xml
    wicket/trunk/wicket-devutils/pom.xml
    wicket/trunk/wicket-examples/pom.xml
    wicket/trunk/wicket-extensions/pom.xml
    wicket/trunk/wicket-guice/pom.xml
    wicket/trunk/wicket-ioc/pom.xml
    wicket/trunk/wicket-jmx/pom.xml
    wicket/trunk/wicket-objectssizeof-agent/pom.xml
    wicket/trunk/wicket-request/pom.xml
    wicket/trunk/wicket-spring/pom.xml
    wicket/trunk/wicket-util/pom.xml
    wicket/trunk/wicket-velocity/pom.xml
    wicket/trunk/wicket/pom.xml

Modified: wicket/trunk/archetypes/quickstart/pom.xml
URL: 
http://svn.apache.org/viewvc/wicket/trunk/archetypes/quickstart/pom.xml?rev=1202803&r1=1202802&r2=1202803&view=diff
==============================================================================
--- wicket/trunk/archetypes/quickstart/pom.xml (original)
+++ wicket/trunk/archetypes/quickstart/pom.xml Wed Nov 16 17:43:05 2011
@@ -1,16 +1,31 @@
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
+<?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>
                <groupId>org.apache.wicket</groupId>
                <artifactId>wicket-parent</artifactId>
                <version>6.0-SNAPSHOT</version>
                <relativePath>../../pom.xml</relativePath>
-  </parent>
-  
-  <artifactId>wicket-archetype-quickstart</artifactId>
-  <packaging>maven-archetype</packaging>
-  <name>Wicket Quickstart Archetype</name>
-
+       </parent>
+       <artifactId>wicket-archetype-quickstart</artifactId>
+       <packaging>maven-archetype</packaging>
+       <name>Wicket Quickstart Archetype</name>
        <build>
                <resources>
                        <resource>

Modified: 
wicket/trunk/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
URL: 
http://svn.apache.org/viewvc/wicket/trunk/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml?rev=1202803&r1=1202802&r2=1202803&view=diff
==============================================================================
--- 
wicket/trunk/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
 (original)
+++ 
wicket/trunk/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
 Wed Nov 16 17:43:05 2011
@@ -1,11 +1,31 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+<?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>
        <groupId>${groupId}</groupId>
        <artifactId>${artifactId}</artifactId>
        <packaging>war</packaging>
        <version>${version}</version>
-       #literal()<!-- TODO project name  -->
+       #literal()
+       <!-- TODO project name  -->
        <name>quickstart</name>
        <description></description>
        <!--
@@ -24,6 +44,7 @@
        <properties>
                <wicket.version>6.0-SNAPSHOT</wicket.version>
                <jetty.version>7.5.0.v20110901</jetty.version>
+               
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        </properties>
        <dependencies>
                <!--  WICKET DEPENDENCIES -->
@@ -108,10 +129,11 @@
                                <artifactId>maven-compiler-plugin</artifactId>
                                <version>2.3.2</version>
                                <configuration>
-                                       <source>1.5</source>
-                                       <target>1.5</target>
-                                       <optimize>true</optimize>
-                                       <debug>true</debug>
+                                       <source>1.6</source>
+                                       <target>1.6</target>
+                                       <encoding>UTF-8</encoding>
+                                       <showWarnings>true</showWarnings>
+                                       <showDeprecation>true</showDeprecation>
                                </configuration>
                        </plugin>
                        <plugin>
@@ -157,6 +179,5 @@
                        </snapshots>
                </repository>
        </repositories>
-
        #end
 </project>

Modified: wicket/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/wicket/trunk/pom.xml?rev=1202803&r1=1202802&r2=1202803&view=diff
==============================================================================
--- wicket/trunk/pom.xml (original)
+++ wicket/trunk/pom.xml Wed Nov 16 17:43:05 2011
@@ -1,28 +1,27 @@
 <?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
+   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
+   the License.  You may obtain a copy of the License at
 
-               http://www.apache.org/licenses/LICENSE-2.0
+        http://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
---><project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
        <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-                       <groupId>org.apache</groupId>
-            <artifactId>apache</artifactId>
-            <version>10</version>      
+       <parent>
+               <groupId>org.apache</groupId>
+               <artifactId>apache</artifactId>
+               <version>10</version>
        </parent>
-
        <groupId>org.apache.wicket</groupId>
        <artifactId>wicket-parent</artifactId>
        <version>6.0-SNAPSHOT</version>
@@ -34,7 +33,6 @@
                <jetty.version>7.4.2.v20110526</jetty.version>
                <spring.version>3.0.5.RELEASE</spring.version>
        </properties>
-       
        <profiles>
                <profile>
                        <id>release</id>
@@ -50,9 +48,9 @@
                        <modules>
                                <module>wicket</module>
                                <module>wicket-core</module>
-                <module>wicket-util</module>
+                               <module>wicket-util</module>
                                <module>wicket-datetime</module>
-                <module>wicket-request</module>
+                               <module>wicket-request</module>
                                <module>wicket-devutils</module>
                                <module>wicket-extensions</module>
                                <module>wicket-ioc</module>
@@ -106,7 +104,6 @@
                                        </plugin>
                                </plugins>
                        </build>
-
                        <distributionManagement>
                                <site>
                                        <id>local</id>
@@ -122,9 +119,9 @@
                        <modules>
                                <module>wicket</module>
                                <module>wicket-core</module>
-                <module>wicket-util</module>
+                               <module>wicket-util</module>
                                <module>wicket-datetime</module>
-                <module>wicket-request</module>
+                               <module>wicket-request</module>
                                <module>wicket-devutils</module>
                                <module>wicket-extensions</module>
                                <module>wicket-ioc</module>
@@ -170,7 +167,6 @@
                                        </plugin>
                                </plugins>
                        </build>
-
                        <!-- distribution management is inherited from the 
parent pom -->
                </profile>
                <profile>
@@ -181,9 +177,9 @@
                        <modules>
                                <module>wicket</module>
                                <module>wicket-core</module>
-                <module>wicket-util</module>
+                               <module>wicket-util</module>
                                <module>wicket-datetime</module>
-                <module>wicket-request</module>
+                               <module>wicket-request</module>
                                <module>wicket-devutils</module>
                                <module>wicket-extensions</module>
                                <module>wicket-ioc</module>
@@ -197,8 +193,6 @@
                                <module>archetypes/quickstart</module>
                                <module>testing/wicket-threadtest</module>
                        </modules>
-
-
                        <!-- distribution management is inherited from the 
parent pom -->
                </profile>
        </profiles>
@@ -280,24 +274,24 @@
                                <version>${project.version}</version>
                                <type>jar</type>
                        </dependency>
-           <dependency>
-                <groupId>org.apache.wicket</groupId>
-                <artifactId>wicket-request</artifactId>
-                <version>${project.version}</version>
-                <type>jar</type>
-            </dependency>
+                       <dependency>
+                               <groupId>org.apache.wicket</groupId>
+                               <artifactId>wicket-request</artifactId>
+                               <version>${project.version}</version>
+                               <type>jar</type>
+                       </dependency>
                        <dependency>
                                <groupId>org.apache.wicket</groupId>
                                <artifactId>wicket-extensions</artifactId>
                                <version>${project.version}</version>
                                <type>jar</type>
                        </dependency>
-            <dependency>
-                <groupId>org.apache.wicket</groupId>
-                <artifactId>wicket-util</artifactId>
-                <version>${project.version}</version>
-                <type>jar</type>
-            </dependency>
+                       <dependency>
+                               <groupId>org.apache.wicket</groupId>
+                               <artifactId>wicket-util</artifactId>
+                               <version>${project.version}</version>
+                               <type>jar</type>
+                       </dependency>
                        <dependency>
                                <groupId>org.apache.wicket</groupId>
                                <artifactId>wicket-guice</artifactId>

Modified: wicket/trunk/testing/wicket-threadtest/pom.xml
URL: 
http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/pom.xml?rev=1202803&r1=1202802&r2=1202803&view=diff
==============================================================================
--- wicket/trunk/testing/wicket-threadtest/pom.xml (original)
+++ wicket/trunk/testing/wicket-threadtest/pom.xml Wed Nov 16 17:43:05 2011
@@ -15,10 +15,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
-
+<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.apache.wicket</groupId>
@@ -26,12 +23,10 @@
                <version>6.0-SNAPSHOT</version>
                <relativePath>../../pom.xml</relativePath>
        </parent>
-
        <artifactId>wicket-threadtest</artifactId>
        <packaging>jar</packaging>
        <name>Wicket Thread Test</name>
        <description>Test project</description>
-
        <dependencies>
                <dependency>
                        <groupId>org.apache.wicket</groupId>
@@ -52,17 +47,14 @@
                        <groupId>org.eclipse.jetty.aggregate</groupId>
                        <artifactId>jetty-all-server</artifactId>
                </dependency>
-
                <dependency>
                        <groupId>httpunit</groupId>
                        <artifactId>httpunit</artifactId>
                </dependency>
-               
                <dependency>
                        <groupId>commons-httpclient</groupId>
                        <artifactId>commons-httpclient</artifactId>
                </dependency>
-
                <dependency>
                        <groupId>org.slf4j</groupId>
                        <artifactId>slf4j-log4j12</artifactId>

Modified: wicket/trunk/wicket-auth-roles/pom.xml
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-auth-roles/pom.xml?rev=1202803&r1=1202802&r2=1202803&view=diff
==============================================================================
--- wicket/trunk/wicket-auth-roles/pom.xml (original)
+++ wicket/trunk/wicket-auth-roles/pom.xml Wed Nov 16 17:43:05 2011
@@ -15,10 +15,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
-
+<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.apache.wicket</groupId>
@@ -26,15 +23,13 @@
                <version>6.0-SNAPSHOT</version>
                <relativePath>../pom.xml</relativePath>
        </parent>
-
        <artifactId>wicket-auth-roles</artifactId>
        <packaging>jar</packaging>
-
        <name>Wicket Auth Roles</name>
        <description>
-               Wicket Authorization Integration Based on roles, metadata and 
annotations. This project requires Java 5.
+               Wicket Authorization Integration Based on roles, metadata and
+               annotations.
        </description>
-
        <dependencies>
                <dependency>
                        <groupId>org.apache.wicket</groupId>

Modified: wicket/trunk/wicket-core/pom.xml
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/pom.xml?rev=1202803&r1=1202802&r2=1202803&view=diff
==============================================================================
--- wicket/trunk/wicket-core/pom.xml (original)
+++ wicket/trunk/wicket-core/pom.xml Wed Nov 16 17:43:05 2011
@@ -15,9 +15,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
-
+<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.apache.wicket</groupId>
@@ -25,7 +23,6 @@
                <version>6.0-SNAPSHOT</version>
                <relativePath>../pom.xml</relativePath>
        </parent>
-
        <artifactId>wicket-core</artifactId>
        <packaging>jar</packaging>
        <name>Wicket Core</name>
@@ -39,30 +36,32 @@
                persisted using your favorite technology. 
        </description>
        <dependencies>
-        <dependency>
-            <groupId>org.apache.wicket</groupId>
-            <artifactId>wicket-util</artifactId>
-        </dependency>
-        <dependency>
+               <dependency>
+                       <groupId>org.apache.wicket</groupId>
+                       <artifactId>wicket-util</artifactId>
+               </dependency>
+               <dependency>
                        <groupId>org.apache.wicket</groupId>
                        <artifactId>wicket-util</artifactId>
                        <classifier>tests</classifier>
                        <scope>test</scope>
                        <version>${project.version}</version>
                </dependency>
-        <dependency>
-            <groupId>org.apache.wicket</groupId>
-            <artifactId>wicket-request</artifactId>
-        </dependency>
+               <dependency>
+                       <groupId>org.apache.wicket</groupId>
+                       <artifactId>wicket-request</artifactId>
+               </dependency>
                <dependency>
                        <groupId>junit</groupId>
                        <artifactId>junit</artifactId>
-                       <scope>provided</scope> <!-- provided because of the 
-test jar we build? -->
+                       <scope>provided</scope>
+                       <!-- provided because of the -test jar we build? -->
                </dependency>
                <dependency>
                        <groupId>org.mockito</groupId>
                        <artifactId>mockito-all</artifactId>
-                       <scope>provided</scope> <!-- provided because of the 
-test jar we build? -->
+                       <scope>provided</scope>
+                       <!-- provided because of the -test jar we build? -->
                </dependency>
                <dependency>
                        <groupId>org.hamcrest</groupId>

Modified: wicket/trunk/wicket-datetime/pom.xml
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/pom.xml?rev=1202803&r1=1202802&r2=1202803&view=diff
==============================================================================
--- wicket/trunk/wicket-datetime/pom.xml (original)
+++ wicket/trunk/wicket-datetime/pom.xml Wed Nov 16 17:43:05 2011
@@ -15,8 +15,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.apache.wicket</groupId>

Modified: wicket/trunk/wicket-devutils/pom.xml
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-devutils/pom.xml?rev=1202803&r1=1202802&r2=1202803&view=diff
==============================================================================
--- wicket/trunk/wicket-devutils/pom.xml (original)
+++ wicket/trunk/wicket-devutils/pom.xml Wed Nov 16 17:43:05 2011
@@ -15,10 +15,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
-
+<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.apache.wicket</groupId>
@@ -26,17 +23,14 @@
                <version>6.0-SNAPSHOT</version>
                <relativePath>../pom.xml</relativePath>
        </parent>
-
        <artifactId>wicket-devutils</artifactId>
        <packaging>jar</packaging>
-
        <name>Wicket Development Utilities</name>
        <description>
                Wicket development utilities provide helpful features that 
                are typically used during development only, but may be 
                turned on for additional production debugging.
        </description>
-
        <dependencies>
                <dependency>
                        <groupId>org.apache.wicket</groupId>

Modified: wicket/trunk/wicket-examples/pom.xml
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/pom.xml?rev=1202803&r1=1202802&r2=1202803&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/pom.xml (original)
+++ wicket/trunk/wicket-examples/pom.xml Wed Nov 16 17:43:05 2011
@@ -15,8 +15,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.apache.wicket</groupId>
@@ -27,8 +26,10 @@
        <artifactId>wicket-examples</artifactId>
        <packaging>war</packaging>
        <name>Wicket Examples</name>
-       <description>Examples displaying a component reference and
-               several components in action.</description>
+       <description>
+               Examples displaying a component reference and several 
components in
+               action.
+       </description>
        <dependencies>
                <dependency>
                        <groupId>org.apache.wicket</groupId>
@@ -109,11 +110,11 @@
                </dependency>
        </dependencies>
        <build>
-               <resources> 
+               <resources>
                        <!-- include all these to be able to view their source 
-->
-                       <resource> 
-                               <filtering>false</filtering> 
-                               <directory>${basedir}/src/main/java</directory> 
+                       <resource>
+                               <filtering>false</filtering>
+                               <directory>${basedir}/src/main/java</directory>
                                <includes>
                                        <include>**/*.java</include>
                                        <include>**/*.html</include>
@@ -125,7 +126,7 @@
                                        <include>**/*.txt</include>
                                        <include>**/*.xml</include>
                                        <include>**/*.properties</include>
-                               </includes> 
+                               </includes>
                        </resource>
                        <resource>
                                <filtering>false</filtering>
@@ -144,13 +145,12 @@
                                        <include>**/*.tmpl</include>
                                </includes>
                        </resource>
-               </resources> 
+               </resources>
                <plugins>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-war-plugin</artifactId>
                                <configuration>
-
                                        <!--  include the manifest entries so 
that we can emit the version of the examples. -->
                                        <archive>
                                                <manifest>
@@ -158,7 +158,6 @@
                                                        
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
                                                </manifest>
                                        </archive>
-                       
                                </configuration>
                        </plugin>
                        <plugin>

Modified: wicket/trunk/wicket-extensions/pom.xml
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/pom.xml?rev=1202803&r1=1202802&r2=1202803&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/pom.xml (original)
+++ wicket/trunk/wicket-extensions/pom.xml Wed Nov 16 17:43:05 2011
@@ -15,10 +15,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
-
+<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.apache.wicket</groupId>
@@ -26,13 +23,10 @@
                <version>6.0-SNAPSHOT</version>
                <relativePath>../pom.xml</relativePath>
        </parent>
-
        <artifactId>wicket-extensions</artifactId>
        <packaging>jar</packaging>
-
        <name>Wicket Extensions</name>
        <description>Wicket Extensions is a rich component library for the 
Wicket framework.</description>
-
        <dependencies>
                <dependency>
                        <groupId>org.apache.wicket</groupId>

Modified: wicket/trunk/wicket-guice/pom.xml
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-guice/pom.xml?rev=1202803&r1=1202802&r2=1202803&view=diff
==============================================================================
--- wicket/trunk/wicket-guice/pom.xml (original)
+++ wicket/trunk/wicket-guice/pom.xml Wed Nov 16 17:43:05 2011
@@ -15,10 +15,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
-
+<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.apache.wicket</groupId>
@@ -26,13 +23,13 @@
                <version>6.0-SNAPSHOT</version>
                <relativePath>../pom.xml</relativePath>
        </parent>
-
        <artifactId>wicket-guice</artifactId>
        <packaging>jar</packaging>
-
        <name>Wicket Guice Integration</name>
-       <description>Google Guice integration in your Wicket web applications. 
Requires Java 5. See the examples project for usecases.</description>
-
+       <description>
+               Google Guice integration in your Wicket web applications. See 
the
+               examples project for usecases.
+       </description>
        <dependencies>
                <dependency>
                        <groupId>org.apache.wicket</groupId>

Modified: wicket/trunk/wicket-ioc/pom.xml
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-ioc/pom.xml?rev=1202803&r1=1202802&r2=1202803&view=diff
==============================================================================
--- wicket/trunk/wicket-ioc/pom.xml (original)
+++ wicket/trunk/wicket-ioc/pom.xml Wed Nov 16 17:43:05 2011
@@ -15,10 +15,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
-
+<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.apache.wicket</groupId>
@@ -26,13 +23,13 @@
                <version>6.0-SNAPSHOT</version>
                <relativePath>../pom.xml</relativePath>
        </parent>
-
        <artifactId>wicket-ioc</artifactId>
        <packaging>jar</packaging>
-
        <name>Wicket IoC common code</name>
-       <description>Wicket IoC common dependencies for injection and proxying. 
Used by Spring, Guice, etc.</description>
-
+       <description>
+               Wicket IoC common dependencies for injection and proxying. Used 
by
+               Spring, Guice, etc.
+       </description>
        <dependencies>
                <dependency>
                        <groupId>org.apache.wicket</groupId>

Modified: wicket/trunk/wicket-jmx/pom.xml
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-jmx/pom.xml?rev=1202803&r1=1202802&r2=1202803&view=diff
==============================================================================
--- wicket/trunk/wicket-jmx/pom.xml (original)
+++ wicket/trunk/wicket-jmx/pom.xml Wed Nov 16 17:43:05 2011
@@ -15,10 +15,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
-
+<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.apache.wicket</groupId>
@@ -26,13 +23,10 @@
                <version>6.0-SNAPSHOT</version>
                <relativePath>../pom.xml</relativePath>
        </parent>
-
        <artifactId>wicket-jmx</artifactId>
        <packaging>jar</packaging>
-
        <name>Wicket JMX</name>
        <description>Wicket Java Management Extensions</description>
-
        <dependencies>
                <dependency>
                        <groupId>org.apache.wicket</groupId>

Modified: wicket/trunk/wicket-objectssizeof-agent/pom.xml
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-objectssizeof-agent/pom.xml?rev=1202803&r1=1202802&r2=1202803&view=diff
==============================================================================
--- wicket/trunk/wicket-objectssizeof-agent/pom.xml (original)
+++ wicket/trunk/wicket-objectssizeof-agent/pom.xml Wed Nov 16 17:43:05 2011
@@ -16,7 +16,6 @@
    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>
                <groupId>org.apache.wicket</groupId>
@@ -24,13 +23,10 @@
                <version>6.0-SNAPSHOT</version>
                <relativePath>../pom.xml</relativePath>
        </parent>
-
        <artifactId>wicket-objectsizeof-agent</artifactId>
        <packaging>jar</packaging>
-
        <name>Wicket Objects Sizeof Agent</name>
        <description>Agent for pluggin in object size measurements using 
instrumentation</description>
-
        <dependencies>
                <dependency>
                        <groupId>org.apache.wicket</groupId>
@@ -38,7 +34,6 @@
                        <version>${project.version}</version>
                </dependency>
        </dependencies>
-
        <build>
                <plugins>
                        <plugin>

Modified: wicket/trunk/wicket-request/pom.xml
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-request/pom.xml?rev=1202803&r1=1202802&r2=1202803&view=diff
==============================================================================
--- wicket/trunk/wicket-request/pom.xml (original)
+++ wicket/trunk/wicket-request/pom.xml Wed Nov 16 17:43:05 2011
@@ -15,28 +15,27 @@
    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>
-  <parent>
-    <artifactId>wicket-parent</artifactId>
-    <groupId>org.apache.wicket</groupId>
-       <version>6.0-SNAPSHOT</version>
-       <relativePath>../pom.xml</relativePath>
-  </parent>
-  <artifactId>wicket-request</artifactId>
-  <name>Wicket Request</name>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.wicket</groupId>
-      <artifactId>wicket-util</artifactId>
-    </dependency>
-    <dependency>
-         <groupId>org.apache.wicket</groupId>
-         <artifactId>wicket-util</artifactId>
-         <classifier>tests</classifier>
-         <scope>test</scope>
-         <version>${project.version}</version>
-       </dependency>
-  </dependencies>
+<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>wicket-parent</artifactId>
+               <groupId>org.apache.wicket</groupId>
+               <version>6.0-SNAPSHOT</version>
+               <relativePath>../pom.xml</relativePath>
+       </parent>
+       <artifactId>wicket-request</artifactId>
+       <name>Wicket Request</name>
+       <dependencies>
+               <dependency>
+                       <groupId>org.apache.wicket</groupId>
+                       <artifactId>wicket-util</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.wicket</groupId>
+                       <artifactId>wicket-util</artifactId>
+                       <classifier>tests</classifier>
+                       <scope>test</scope>
+                       <version>${project.version}</version>
+               </dependency>
+       </dependencies>
 </project>

Modified: wicket/trunk/wicket-spring/pom.xml
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-spring/pom.xml?rev=1202803&r1=1202802&r2=1202803&view=diff
==============================================================================
--- wicket/trunk/wicket-spring/pom.xml (original)
+++ wicket/trunk/wicket-spring/pom.xml Wed Nov 16 17:43:05 2011
@@ -15,10 +15,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
-
+<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.apache.wicket</groupId>
@@ -26,13 +23,10 @@
                <version>6.0-SNAPSHOT</version>
                <relativePath>../pom.xml</relativePath>
        </parent>
-
        <artifactId>wicket-spring</artifactId>
        <packaging>jar</packaging>
-
        <name>Wicket Spring Integration</name>
        <description>Integration project to use Spring injection in your Wicket 
applications. See the wicket-spring-examples for integration 
patterns.</description>
-
        <dependencies>
                <dependency>
                        <groupId>org.apache.wicket</groupId>

Modified: wicket/trunk/wicket-util/pom.xml
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-util/pom.xml?rev=1202803&r1=1202802&r2=1202803&view=diff
==============================================================================
--- wicket/trunk/wicket-util/pom.xml (original)
+++ wicket/trunk/wicket-util/pom.xml Wed Nov 16 17:43:05 2011
@@ -15,15 +15,14 @@
    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>
-  <parent>
-       <groupId>org.apache.wicket</groupId>
-    <artifactId>wicket-parent</artifactId>
-       <version>6.0-SNAPSHOT</version>
-       <relativePath>../pom.xml</relativePath>
-  </parent>
-  <artifactId>wicket-util</artifactId>
-  <name>Wicket Util</name>
+<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>
+               <groupId>org.apache.wicket</groupId>
+               <artifactId>wicket-parent</artifactId>
+               <version>6.0-SNAPSHOT</version>
+               <relativePath>../pom.xml</relativePath>
+       </parent>
+       <artifactId>wicket-util</artifactId>
+       <name>Wicket Util</name>
 </project>

Modified: wicket/trunk/wicket-velocity/pom.xml
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-velocity/pom.xml?rev=1202803&r1=1202802&r2=1202803&view=diff
==============================================================================
--- wicket/trunk/wicket-velocity/pom.xml (original)
+++ wicket/trunk/wicket-velocity/pom.xml Wed Nov 16 17:43:05 2011
@@ -15,10 +15,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
-
+<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.apache.wicket</groupId>
@@ -26,16 +23,14 @@
                <version>6.0-SNAPSHOT</version>
                <relativePath>../pom.xml</relativePath>
        </parent>
-
        <artifactId>wicket-velocity</artifactId>
        <packaging>jar</packaging>
-
        <name>Wicket Velocity</name>
        <description>
-               Provides a specialized panel and some related utilities that 
enables users 
-               to work with Velocity and Wicket. Particularly useful for 
simple CMS like applications
+               Provides a specialized panel and some related utilities that 
enables
+               users to work with Velocity and Wicket. Particularly useful for
+               simple CMS like applications.
        </description>
-
        <dependencies>
                <dependency>
                        <groupId>org.apache.wicket</groupId>

Modified: wicket/trunk/wicket/pom.xml
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/pom.xml?rev=1202803&r1=1202802&r2=1202803&view=diff
==============================================================================
--- wicket/trunk/wicket/pom.xml (original)
+++ wicket/trunk/wicket/pom.xml Wed Nov 16 17:43:05 2011
@@ -1,60 +1,61 @@
-<?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
+   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
+   the License.  You may obtain a copy of the License at
 
-               http://www.apache.org/licenses/LICENSE-2.0
+        http://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
---><project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.wicket</groupId>
-    <artifactId>wicket-parent</artifactId>
-       <version>6.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-  <artifactId>wicket</artifactId>
-  <packaging>pom</packaging>
-  <name>Wicket</name>
-  <description>
-       A module that provides dependencies to all core submodules
-       needed to run Wicket application. This way Maven users can
-       depend only on this module without bothering that Wicket core depends 
on several modules.
-  </description>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.wicket</groupId>
-      <artifactId>wicket-core</artifactId>
-      <version>${project.parent.version}</version>
-    </dependency>
-  </dependencies>
-  <build>
-       <plugins>
-               <plugin>
-                       <!-- Do not create (and deploy) -tests.jar for this 
project -->
-                       <groupId>org.apache.maven.plugins</groupId>
-                       <artifactId>maven-jar-plugin</artifactId>
-                       <version>2.3.1</version>
-                       <executions>
-                               <execution>
-                                       <goals>
-                                               <goal>test-jar</goal>
-                                       </goals>
-                                       <configuration>
-                                               <skip>true</skip>
-                                       </configuration>
-                               </execution>
-                       </executions>
-               </plugin>
-       </plugins>
-  </build>
+-->
+<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>
+               <groupId>org.apache.wicket</groupId>
+               <artifactId>wicket-parent</artifactId>
+               <version>6.0-SNAPSHOT</version>
+               <relativePath>../pom.xml</relativePath>
+       </parent>
+       <artifactId>wicket</artifactId>
+       <packaging>pom</packaging>
+       <name>Wicket</name>
+       <description>
+               A module that provides dependencies to all core submodules 
needed to
+               run Wicket application. This way Maven users can depend only on 
this
+               module without bothering that Wicket core depends on several 
modules.
+       </description>
+       <dependencies>
+               <dependency>
+                       <groupId>org.apache.wicket</groupId>
+                       <artifactId>wicket-core</artifactId>
+                       <version>${project.parent.version}</version>
+               </dependency>
+       </dependencies>
+       <build>
+               <plugins>
+                       <plugin>
+                               <!-- Do not create (and deploy) -tests.jar for 
this project -->
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-jar-plugin</artifactId>
+                               <version>2.3.1</version>
+                               <executions>
+                                       <execution>
+                                               <goals>
+                                                       <goal>test-jar</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <skip>true</skip>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
+               </plugins>
+       </build>
 </project>


Reply via email to