You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by da...@apache.org on 2007/04/22 17:59:39 UTC
svn commit: r531216 - in /incubator/wicket/releases/wicket-1.2.6:
wicket-auth-roles-examples/ wicket-auth-roles/ wicket-examples/
wicket-extensions/ wicket-jmx/ wicket-parent/ wicket-portlet-examples/
wicket-quickstart/ wicket-site-skin/ wicket-spring-...
Author: dashorst
Date: Sun Apr 22 08:59:38 2007
New Revision: 531216
URL: http://svn.apache.org/viewvc?view=rev&rev=531216
Log:
Fixed release numbers for 1.2.6
Modified:
incubator/wicket/releases/wicket-1.2.6/wicket-auth-roles-examples/pom.xml
incubator/wicket/releases/wicket-1.2.6/wicket-auth-roles/pom.xml
incubator/wicket/releases/wicket-1.2.6/wicket-examples/pom.xml
incubator/wicket/releases/wicket-1.2.6/wicket-extensions/pom.xml
incubator/wicket/releases/wicket-1.2.6/wicket-jmx/pom.xml
incubator/wicket/releases/wicket-1.2.6/wicket-parent/pom.xml
incubator/wicket/releases/wicket-1.2.6/wicket-portlet-examples/pom.xml
incubator/wicket/releases/wicket-1.2.6/wicket-quickstart/pom.xml
incubator/wicket/releases/wicket-1.2.6/wicket-site-skin/pom.xml
incubator/wicket/releases/wicket-1.2.6/wicket-spring-annot-examples/pom.xml
incubator/wicket/releases/wicket-1.2.6/wicket-spring-annot/pom.xml
incubator/wicket/releases/wicket-1.2.6/wicket-spring-cattr-examples/pom.xml
incubator/wicket/releases/wicket-1.2.6/wicket-spring-cattr/pom.xml
incubator/wicket/releases/wicket-1.2.6/wicket-spring-examples/pom.xml
incubator/wicket/releases/wicket-1.2.6/wicket-spring/pom.xml
incubator/wicket/releases/wicket-1.2.6/wicket-threadtest/pom.xml
incubator/wicket/releases/wicket-1.2.6/wicket/pom.xml
Modified: incubator/wicket/releases/wicket-1.2.6/wicket-auth-roles-examples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wicket/releases/wicket-1.2.6/wicket-auth-roles-examples/pom.xml?view=diff&rev=531216&r1=531215&r2=531216
==============================================================================
--- incubator/wicket/releases/wicket-1.2.6/wicket-auth-roles-examples/pom.xml (original)
+++ incubator/wicket/releases/wicket-1.2.6/wicket-auth-roles-examples/pom.xml Sun Apr 22 08:59:38 2007
@@ -6,7 +6,8 @@
<parent>
<groupId>wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.2.6</version>
+ <relativePath>../wicket-parent/pom.xml</relativePath>
</parent>
<artifactId>wicket-auth-roles-examples</artifactId>
Modified: incubator/wicket/releases/wicket-1.2.6/wicket-auth-roles/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wicket/releases/wicket-1.2.6/wicket-auth-roles/pom.xml?view=diff&rev=531216&r1=531215&r2=531216
==============================================================================
--- incubator/wicket/releases/wicket-1.2.6/wicket-auth-roles/pom.xml (original)
+++ incubator/wicket/releases/wicket-1.2.6/wicket-auth-roles/pom.xml Sun Apr 22 08:59:38 2007
@@ -6,7 +6,8 @@
<parent>
<groupId>wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.2.6</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket-auth-roles</artifactId>
Modified: incubator/wicket/releases/wicket-1.2.6/wicket-examples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wicket/releases/wicket-1.2.6/wicket-examples/pom.xml?view=diff&rev=531216&r1=531215&r2=531216
==============================================================================
--- incubator/wicket/releases/wicket-1.2.6/wicket-examples/pom.xml (original)
+++ incubator/wicket/releases/wicket-1.2.6/wicket-examples/pom.xml Sun Apr 22 08:59:38 2007
@@ -6,8 +6,8 @@
<parent>
<groupId>wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.2-SNAPSHOT</version>
- <relativePath>../wicket-parent</relativePath>
+ <version>1.2.6</version>
+ <relativePath>../wicket-parent/pom.xml</relativePath>
</parent>
<artifactId>wicket-examples</artifactId>
@@ -36,7 +36,7 @@
<!-- dependency>
<groupId>wicket</groupId>
<artifactId>wicket-jmx</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.2.6</version>
</dependency-->
<dependency>
<groupId>dom4j</groupId>
@@ -119,16 +119,19 @@
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<version>6.0.1</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-util</artifactId>
<version>6.0.1</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-management</artifactId>
<version>6.0.1</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
Modified: incubator/wicket/releases/wicket-1.2.6/wicket-extensions/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wicket/releases/wicket-1.2.6/wicket-extensions/pom.xml?view=diff&rev=531216&r1=531215&r2=531216
==============================================================================
--- incubator/wicket/releases/wicket-1.2.6/wicket-extensions/pom.xml (original)
+++ incubator/wicket/releases/wicket-1.2.6/wicket-extensions/pom.xml Sun Apr 22 08:59:38 2007
@@ -6,8 +6,8 @@
<parent>
<groupId>wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.2-SNAPSHOT</version>
- <relativePath>../wicket-parent</relativePath>
+ <version>1.2.6</version>
+ <relativePath>../wicket-parent/pom.xml</relativePath>
</parent>
<artifactId>wicket-extensions</artifactId>
<packaging>jar</packaging>
Modified: incubator/wicket/releases/wicket-1.2.6/wicket-jmx/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wicket/releases/wicket-1.2.6/wicket-jmx/pom.xml?view=diff&rev=531216&r1=531215&r2=531216
==============================================================================
--- incubator/wicket/releases/wicket-1.2.6/wicket-jmx/pom.xml (original)
+++ incubator/wicket/releases/wicket-1.2.6/wicket-jmx/pom.xml Sun Apr 22 08:59:38 2007
@@ -6,8 +6,8 @@
<parent>
<groupId>wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.2-SNAPSHOT</version>
- <relativePath>../wicket-parent</relativePath>
+ <version>1.2.6</version>
+ <relativePath>../wicket-parent/pom.xml</relativePath>
</parent>
<artifactId>wicket-jmx</artifactId>
<packaging>jar</packaging>
Modified: incubator/wicket/releases/wicket-1.2.6/wicket-parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wicket/releases/wicket-1.2.6/wicket-parent/pom.xml?view=diff&rev=531216&r1=531215&r2=531216
==============================================================================
--- incubator/wicket/releases/wicket-1.2.6/wicket-parent/pom.xml (original)
+++ incubator/wicket/releases/wicket-1.2.6/wicket-parent/pom.xml Sun Apr 22 08:59:38 2007
@@ -6,7 +6,7 @@
<groupId>wicket</groupId>
<artifactId>wicket-parent</artifactId>
<packaging>pom</packaging>
- <version>1.2-SNAPSHOT</version>
+ <version>1.2.6</version>
<name>Wicket Parent</name>
<description>Wicket is a Java open source, component based web application framework.</description>
<url>http://wicketframework.org/${project.artifactId}</url>
@@ -342,6 +342,39 @@
</profile>
</profiles>
<build>
+ <resources>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+
+ <testResources>
+ <testResource>
+ <filtering>false</filtering>
+ <directory>src/test/java</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </testResource>
+ </testResources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ </plugin>
+ </plugins>
+
<pluginManagement>
<plugins>
<plugin>
@@ -351,7 +384,7 @@
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
- <descriptor>src/assembly/bin.xml</descriptor>
+ <descriptor>${basedir}/../wicket/src/assembly/bin.xml</descriptor>
</descriptors>
<finalName>${artifactId}-${version}</finalName>
<outputDirectory>target/distributions</outputDirectory>
@@ -360,11 +393,49 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <index>true</index>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ <manifestEntries>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <inherited>true</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
<configuration>
- <templateDirectory>${basedir}/src/site/template/</templateDirectory>
- <template>wicket-site.vm</template>
+ <minmemory>128m</minmemory>
+ <maxmemory>256m</maxmemory>
+ <quiet>true</quiet>
</configuration>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <inherited>true</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -376,9 +447,29 @@
</includes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <configuration>
+ <scanIntervalSeconds>60</scanIntervalSeconds>
+ <webAppSourceDirectory>src/webapp</webAppSourceDirectory>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
<distributionManagement>
<site>
<id>wicket-site</id>
Modified: incubator/wicket/releases/wicket-1.2.6/wicket-portlet-examples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wicket/releases/wicket-1.2.6/wicket-portlet-examples/pom.xml?view=diff&rev=531216&r1=531215&r2=531216
==============================================================================
--- incubator/wicket/releases/wicket-1.2.6/wicket-portlet-examples/pom.xml (original)
+++ incubator/wicket/releases/wicket-1.2.6/wicket-portlet-examples/pom.xml Sun Apr 22 08:59:38 2007
@@ -6,7 +6,8 @@
<parent>
<groupId>wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.2.6</version>
+ <relativePath>../wicket-parent/pom.xml</relativePath>
</parent>
<artifactId>wicket-portlet-examples</artifactId>
Modified: incubator/wicket/releases/wicket-1.2.6/wicket-quickstart/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wicket/releases/wicket-1.2.6/wicket-quickstart/pom.xml?view=diff&rev=531216&r1=531215&r2=531216
==============================================================================
--- incubator/wicket/releases/wicket-1.2.6/wicket-quickstart/pom.xml (original)
+++ incubator/wicket/releases/wicket-1.2.6/wicket-quickstart/pom.xml Sun Apr 22 08:59:38 2007
@@ -6,7 +6,8 @@
<parent>
<groupId>wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.2.6</version>
+ <relativePath>../wicket-parent/pom.xml</relativePath>
</parent>
<artifactId>wicket-quickstart</artifactId>
Modified: incubator/wicket/releases/wicket-1.2.6/wicket-site-skin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wicket/releases/wicket-1.2.6/wicket-site-skin/pom.xml?view=diff&rev=531216&r1=531215&r2=531216
==============================================================================
--- incubator/wicket/releases/wicket-1.2.6/wicket-site-skin/pom.xml (original)
+++ incubator/wicket/releases/wicket-1.2.6/wicket-site-skin/pom.xml Sun Apr 22 08:59:38 2007
@@ -24,9 +24,9 @@
<groupId>wicket</groupId>
<artifactId>wicket-site-skin</artifactId>
<packaging>jar</packaging>
- <version>1.2-SNAPSHOT</version>
+ <version>1.2.6</version>
<name>Wicket Site Skin</name>
<description>This is the maven site skin for the Wicket project.</description>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/wicket/releases/wicket-1.2.6/wicket-spring-annot-examples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wicket/releases/wicket-1.2.6/wicket-spring-annot-examples/pom.xml?view=diff&rev=531216&r1=531215&r2=531216
==============================================================================
--- incubator/wicket/releases/wicket-1.2.6/wicket-spring-annot-examples/pom.xml (original)
+++ incubator/wicket/releases/wicket-1.2.6/wicket-spring-annot-examples/pom.xml Sun Apr 22 08:59:38 2007
@@ -4,7 +4,8 @@
<parent>
<groupId>wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.2.6</version>
+ <relativePath>../wicket-parent/pom.xml</relativePath>
</parent>
<artifactId>wicket-spring-annot-examples</artifactId>
Modified: incubator/wicket/releases/wicket-1.2.6/wicket-spring-annot/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wicket/releases/wicket-1.2.6/wicket-spring-annot/pom.xml?view=diff&rev=531216&r1=531215&r2=531216
==============================================================================
--- incubator/wicket/releases/wicket-1.2.6/wicket-spring-annot/pom.xml (original)
+++ incubator/wicket/releases/wicket-1.2.6/wicket-spring-annot/pom.xml Sun Apr 22 08:59:38 2007
@@ -6,8 +6,8 @@
<parent>
<groupId>wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.2-SNAPSHOT</version>
- <relativePath>../wicket-parent</relativePath>
+ <version>1.2.6</version>
+ <relativePath>../wicket-parent/pom.xml</relativePath>
</parent>
<artifactId>wicket-spring-annot</artifactId>
@@ -21,7 +21,7 @@
<dependency>
<groupId>wicket</groupId>
<artifactId>wicket-spring</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.2.6</version>
</dependency>
</dependencies>
Modified: incubator/wicket/releases/wicket-1.2.6/wicket-spring-cattr-examples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wicket/releases/wicket-1.2.6/wicket-spring-cattr-examples/pom.xml?view=diff&rev=531216&r1=531215&r2=531216
==============================================================================
--- incubator/wicket/releases/wicket-1.2.6/wicket-spring-cattr-examples/pom.xml (original)
+++ incubator/wicket/releases/wicket-1.2.6/wicket-spring-cattr-examples/pom.xml Sun Apr 22 08:59:38 2007
@@ -6,7 +6,7 @@
<groupId>wicket</groupId>
<artifactId>wicket-spring-cattr-examples</artifactId>
<packaging>jar</packaging>
- <version>1.2-SNAPSHOT</version>
+ <version>1.2.6</version>
<name>Examples of Wicket Spring Integration through Commons Attributes</name>
<description>Examples of Spring integration in your Wicket web applications using commons attributes.</description>
<organization>
@@ -77,13 +77,13 @@
<dependency>
<groupId>wicket</groupId>
<artifactId>wicket-extensions</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.2.6</version>
</dependency>
<dependency>
<groupId>wicket</groupId>
<artifactId>wicket-spring-cattr</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.2.6</version>
</dependency>
<dependency>
Modified: incubator/wicket/releases/wicket-1.2.6/wicket-spring-cattr/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wicket/releases/wicket-1.2.6/wicket-spring-cattr/pom.xml?view=diff&rev=531216&r1=531215&r2=531216
==============================================================================
--- incubator/wicket/releases/wicket-1.2.6/wicket-spring-cattr/pom.xml (original)
+++ incubator/wicket/releases/wicket-1.2.6/wicket-spring-cattr/pom.xml Sun Apr 22 08:59:38 2007
@@ -6,7 +6,7 @@
<groupId>wicket</groupId>
<artifactId>wicket-spring-cattr</artifactId>
<packaging>jar</packaging>
- <version>1.2-SNAPSHOT</version>
+ <version>1.2.6</version>
<name>Wicket Spring Integration through Commons Attributes</name>
<description>Spring integration in your Wicket web applications using commons attributes. See the examples project for usecases.</description>
<organization>
@@ -82,7 +82,7 @@
<dependency>
<groupId>wicket</groupId>
<artifactId>wicket-spring</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.2.6</version>
</dependency>
<dependency>
<groupId>commons-attributes</groupId>
Modified: incubator/wicket/releases/wicket-1.2.6/wicket-spring-examples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wicket/releases/wicket-1.2.6/wicket-spring-examples/pom.xml?view=diff&rev=531216&r1=531215&r2=531216
==============================================================================
--- incubator/wicket/releases/wicket-1.2.6/wicket-spring-examples/pom.xml (original)
+++ incubator/wicket/releases/wicket-1.2.6/wicket-spring-examples/pom.xml Sun Apr 22 08:59:38 2007
@@ -5,7 +5,8 @@
<parent>
<groupId>wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.2.6</version>
+ <relativePath>../wicket-parent/pom.xml</relativePath>
</parent>
<artifactId>wicket-spring-examples</artifactId>
Modified: incubator/wicket/releases/wicket-1.2.6/wicket-spring/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wicket/releases/wicket-1.2.6/wicket-spring/pom.xml?view=diff&rev=531216&r1=531215&r2=531216
==============================================================================
--- incubator/wicket/releases/wicket-1.2.6/wicket-spring/pom.xml (original)
+++ incubator/wicket/releases/wicket-1.2.6/wicket-spring/pom.xml Sun Apr 22 08:59:38 2007
@@ -6,8 +6,8 @@
<parent>
<groupId>wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.2-SNAPSHOT</version>
- <relativePath>../wicket-parent</relativePath>
+ <version>1.2.6</version>
+ <relativePath>../wicket-parent/pom.xml</relativePath>
</parent>
<artifactId>wicket-spring</artifactId>
@@ -22,7 +22,7 @@
<dependency>
<groupId>wicket</groupId>
<artifactId>wicket</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.2.6</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Modified: incubator/wicket/releases/wicket-1.2.6/wicket-threadtest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wicket/releases/wicket-1.2.6/wicket-threadtest/pom.xml?view=diff&rev=531216&r1=531215&r2=531216
==============================================================================
--- incubator/wicket/releases/wicket-1.2.6/wicket-threadtest/pom.xml (original)
+++ incubator/wicket/releases/wicket-1.2.6/wicket-threadtest/pom.xml Sun Apr 22 08:59:38 2007
@@ -6,7 +6,7 @@
<parent>
<groupId>wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.2.6</version>
<relativePath>../wicket-parent</relativePath>
</parent>
Modified: incubator/wicket/releases/wicket-1.2.6/wicket/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wicket/releases/wicket-1.2.6/wicket/pom.xml?view=diff&rev=531216&r1=531215&r2=531216
==============================================================================
--- incubator/wicket/releases/wicket-1.2.6/wicket/pom.xml (original)
+++ incubator/wicket/releases/wicket-1.2.6/wicket/pom.xml Sun Apr 22 08:59:38 2007
@@ -6,8 +6,8 @@
<parent>
<groupId>wicket</groupId>
<artifactId>wicket-parent</artifactId>
- <version>1.2-SNAPSHOT</version>
- <relativePath>../wicket-parent</relativePath>
+ <version>1.2.6</version>
+ <relativePath>../wicket-parent/pom.xml</relativePath>
</parent>
<artifactId>wicket</artifactId>