Author: dashorst
Date: Thu Mar 22 17:04:12 2007
New Revision: 521539
URL: http://svn.apache.org/viewvc?view=rev&rev=521539
Log:
Assembly and pom improvements for a release
Modified:
incubator/wicket/releases/wicket-1.3.0-incubating-alpha/pom.xml
incubator/wicket/releases/wicket-1.3.0-incubating-alpha/wicket-assembly-all.xml
Modified: incubator/wicket/releases/wicket-1.3.0-incubating-alpha/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/wicket/releases/wicket-1.3.0-incubating-alpha/pom.xml?view=diff&rev=521539&r1=521538&r2=521539
==============================================================================
--- incubator/wicket/releases/wicket-1.3.0-incubating-alpha/pom.xml (original)
+++ incubator/wicket/releases/wicket-1.3.0-incubating-alpha/pom.xml Thu Mar 22
17:04:12 2007
@@ -1,13 +1,13 @@
<?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,
@@ -50,6 +50,66 @@
</modules>
</profile>
<profile>
+ <id>release</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <modules>
+ <module>jdk-1.4/wicket</module>
+ <module>jdk-1.4/wicket-datetime</module>
+ <module>jdk-1.4/wicket-extensions</module>
+ <module>jdk-1.4/wicket-spring</module>
+ <module>jdk-1.5/wicket-spring-annot</module>
+ <module>jdk-1.5/wicket-auth-roles</module>
+ <module>jdk-1.5/wicket-jmx</module>
+
<module>jdk-1.5/wicket-objectssizeof-agent</module>
+ <module>jdk-1.5/wicket-examples</module>
+ </modules>
+ <build>
+ <plugins>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-gpg-plugin</artifactId>
+ <inherited>true</inherited>
+ </plugin>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-assembly-plugin</artifactId>
+ <inherited>true</inherited>
+ </plugin>
+ <plugin>
+
<artifactId>maven-remote-resources-plugin</artifactId>
+ <inherited>true</inherited>
+ </plugin>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-javadoc-plugin</artifactId>
+ <inherited>true</inherited>
+ </plugin>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-source-plugin</artifactId>
+ <inherited>true</inherited>
+ </plugin>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-surefire-plugin</artifactId>
+ <inherited>true</inherited>
+ </plugin>
+ </plugins>
+ </build>
+ <distributionManagement>
+ <site>
+ <id>local</id>
+
<url>file://Users/dashorst/Sites/org.apache.wicket/sites/${project.version}</url>
+ </site>
+ <repository>
+ <id>local</id>
+
<url>file://Users/dashorst/Sites/org.apache.wicket/repository/${project.version}</url>
+ </repository>
+ </distributionManagement>
+ </profile>
+ <profile>
<id>all</id>
<activation>
<activeByDefault>true</activeByDefault>
@@ -79,7 +139,7 @@
</licenses>
<issueManagement>
- <system>jira</system>
+ <system>jira</system>
<url>http://issues.apache.org/jira/browse/WICKET</url>
</issueManagement>
@@ -198,7 +258,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
- <version>2.0</version>
+ <version>2.0</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
@@ -332,77 +392,39 @@
<plugins>
<plugin>
- <inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <inherited>true</inherited>
</plugin>
<plugin>
- <inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
- <configuration>
- <downloadSources>true</downloadSources>
- </configuration>
+ <inherited>true</inherited>
</plugin>
<plugin>
- <inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <inherited>true</inherited>
</plugin>
<plugin>
- <inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
+ <inherited>true</inherited>
</plugin>
<plugin>
- <inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
+ <inherited>true</inherited>
</plugin>
<plugin>
- <inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <inherited>true</inherited>
</plugin>
<plugin>
- <inherited>true</inherited>
<groupId>org.codehaus.mojo</groupId>
<artifactId>surefire-report-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <inherited>true</inherited>
-
<artifactId>maven-remote-resources-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>bundle</goal>
- </goals>
- <configuration>
- <resourceBundles>
-
<resourceBundle>org.apache:apache-jar-resource-bundle:1.2</resourceBundle>
-
<resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.1</resourceBundle>
- </resourceBundles>
- </configuration>
- </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>
<inherited>true</inherited>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
</plugin>
</plugins>
@@ -422,6 +444,13 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+
<downloadSources>true</downloadSources>
+ </configuration>
+ </plugin>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<executions>
<execution>
@@ -434,8 +463,8 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-war-plugin</artifactId>
<configuration>
<warName>${pom.artifactId}</warName>
</configuration>
@@ -461,6 +490,19 @@
<artifactId>maven-site-plugin</artifactId>
</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>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
@@ -477,6 +519,23 @@
<webAppSourceDirectory>src/main/webapp</webAppSourceDirectory>
</configuration>
</plugin>
+ <plugin>
+
<artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+
<goal>process</goal>
+ </goals>
+ <configuration>
+
<resourceBundles>
+
<resourceBundle>org.apache:apache-jar-resource-bundle:1.2</resourceBundle>
+
<resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.1</resourceBundle>
+
</resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ <inherited>true</inherited>
+ </plugin>
</plugins>
</pluginManagement>
</build>
@@ -533,6 +592,6 @@
<id>people.apache.org</id>
<url>scpexe://people.apache.org/home/dashorst/public_html/${project.groupId}/repository/snapshots</url>
<uniqueVersion>false</uniqueVersion>
- </snapshotRepository>
+ </snapshotRepository>
</distributionManagement>
</project>
Modified:
incubator/wicket/releases/wicket-1.3.0-incubating-alpha/wicket-assembly-all.xml
URL:
http://svn.apache.org/viewvc/incubator/wicket/releases/wicket-1.3.0-incubating-alpha/wicket-assembly-all.xml?view=diff&rev=521539&r1=521538&r2=521539
==============================================================================
---
incubator/wicket/releases/wicket-1.3.0-incubating-alpha/wicket-assembly-all.xml
(original)
+++
incubator/wicket/releases/wicket-1.3.0-incubating-alpha/wicket-assembly-all.xml
Thu Mar 22 17:04:12 2007
@@ -12,7 +12,8 @@
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<exclude>**/wicket-sandbox/**</exclude>
- <exclude>**/target/**</exclude>
+ <exclude>**/wicket/target/**</exclude>
+ <exclude>**/wicket-*/target/**</exclude>
</excludes>
</fileSet>
<fileSet>
@@ -35,7 +36,7 @@
<include>org.apache.wicket:wicket-examples</include>
<include>org.apache.wicket:wicket-extensions</include>
<include>org.apache.wicket:wicket-jmx</include>
-
<include>org.apache.wicket:wicket-objectssizeof-agent</include>
+
<include>org.apache.wicket:wicket-objectsizeof-agent</include>
<include>org.apache.wicket:wicket-spring</include>
<include>org.apache.wicket:wicket-spring-annot</include>
</includes>
