Author: mgrigorov
Date: Tue Jan 25 09:26:14 2011
New Revision: 1063179
URL: http://svn.apache.org/viewvc?rev=1063179&view=rev
Log:
WICKET-3365 1.5-RC1 sources seem to be missing in Maven repository
o.a.w:wicket now has type 'pom'.
This way it provides just dependencies to -core, -util and -request.
Due to a bug in Maven dependency management doesn't work for module with type
'pom' and <version> and <type> should be specified for each dependency.
Modified:
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-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-spring/pom.xml
wicket/trunk/wicket-velocity/pom.xml
wicket/trunk/wicket/pom.xml
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=1063179&r1=1063178&r2=1063179&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
Tue Jan 25 09:26:14 2011
@@ -27,8 +27,9 @@
<!-- WICKET DEPENDENCIES -->
<dependency>
<groupId>org.apache.wicket</groupId>
- <artifactId>wicket-core</artifactId>
+ <artifactId>wicket</artifactId>
<version>${wicket.version}</version>
+ <type>pom</type>
</dependency>
<!-- OPTIONAL DEPENDENCY
<dependency>
Modified: wicket/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/pom.xml?rev=1063179&r1=1063178&r2=1063179&view=diff
==============================================================================
--- wicket/trunk/pom.xml (original)
+++ wicket/trunk/pom.xml Tue Jan 25 09:26:14 2011
@@ -261,6 +261,15 @@
<dependencies>
<dependency>
<groupId>org.apache.wicket</groupId>
+ <artifactId>wicket</artifactId>
+ <version>${project.version}</version>
+ <!-- It seems there is a bug in Maven (2.2.1 &
3.0.1) and
+ type 'pom' is not properly inherited. I.e. the
+ dependency management doesn't work -->
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
<version>${project.version}</version>
<type>jar</type>
Modified: wicket/trunk/testing/wicket-threadtest/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/pom.xml?rev=1063179&r1=1063178&r2=1063179&view=diff
==============================================================================
--- wicket/trunk/testing/wicket-threadtest/pom.xml (original)
+++ wicket/trunk/testing/wicket-threadtest/pom.xml Tue Jan 25 09:26:14 2011
@@ -35,7 +35,9 @@
<dependencies>
<dependency>
<groupId>org.apache.wicket</groupId>
- <artifactId>wicket-core</artifactId>
+ <artifactId>wicket</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
Modified: wicket/trunk/wicket-auth-roles/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-auth-roles/pom.xml?rev=1063179&r1=1063178&r2=1063179&view=diff
==============================================================================
--- wicket/trunk/wicket-auth-roles/pom.xml (original)
+++ wicket/trunk/wicket-auth-roles/pom.xml Tue Jan 25 09:26:14 2011
@@ -38,7 +38,9 @@
<dependencies>
<dependency>
<groupId>org.apache.wicket</groupId>
- <artifactId>wicket-core</artifactId>
+ <artifactId>wicket</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
</dependency>
</dependencies>
</project>
Modified: wicket/trunk/wicket-datetime/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/pom.xml?rev=1063179&r1=1063178&r2=1063179&view=diff
==============================================================================
--- wicket/trunk/wicket-datetime/pom.xml (original)
+++ wicket/trunk/wicket-datetime/pom.xml Tue Jan 25 09:26:14 2011
@@ -31,7 +31,9 @@
<dependencies>
<dependency>
<groupId>org.apache.wicket</groupId>
- <artifactId>wicket-core</artifactId>
+ <artifactId>wicket</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>joda-time</groupId>
Modified: wicket/trunk/wicket-devutils/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-devutils/pom.xml?rev=1063179&r1=1063178&r2=1063179&view=diff
==============================================================================
--- wicket/trunk/wicket-devutils/pom.xml (original)
+++ wicket/trunk/wicket-devutils/pom.xml Tue Jan 25 09:26:14 2011
@@ -40,7 +40,9 @@
<dependencies>
<dependency>
<groupId>org.apache.wicket</groupId>
- <artifactId>wicket-core</artifactId>
+ <artifactId>wicket</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
</dependency>
</dependencies>
</project>
Modified: wicket/trunk/wicket-examples/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/pom.xml?rev=1063179&r1=1063178&r2=1063179&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/pom.xml (original)
+++ wicket/trunk/wicket-examples/pom.xml Tue Jan 25 09:26:14 2011
@@ -32,7 +32,9 @@
<dependencies>
<dependency>
<groupId>org.apache.wicket</groupId>
- <artifactId>wicket-core</artifactId>
+ <artifactId>wicket</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
Modified: wicket/trunk/wicket-extensions/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/pom.xml?rev=1063179&r1=1063178&r2=1063179&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/pom.xml (original)
+++ wicket/trunk/wicket-extensions/pom.xml Tue Jan 25 09:26:14 2011
@@ -36,7 +36,9 @@
<dependencies>
<dependency>
<groupId>org.apache.wicket</groupId>
- <artifactId>wicket-core</artifactId>
+ <artifactId>wicket</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
</dependency>
</dependencies>
</project>
Modified: wicket/trunk/wicket-guice/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-guice/pom.xml?rev=1063179&r1=1063178&r2=1063179&view=diff
==============================================================================
--- wicket/trunk/wicket-guice/pom.xml (original)
+++ wicket/trunk/wicket-guice/pom.xml Tue Jan 25 09:26:14 2011
@@ -36,7 +36,9 @@
<dependencies>
<dependency>
<groupId>org.apache.wicket</groupId>
- <artifactId>wicket-core</artifactId>
+ <artifactId>wicket</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
</dependency>
<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=1063179&r1=1063178&r2=1063179&view=diff
==============================================================================
--- wicket/trunk/wicket-ioc/pom.xml (original)
+++ wicket/trunk/wicket-ioc/pom.xml Tue Jan 25 09:26:14 2011
@@ -36,7 +36,9 @@
<dependencies>
<dependency>
<groupId>org.apache.wicket</groupId>
- <artifactId>wicket-core</artifactId>
+ <artifactId>wicket</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>cglib</groupId>
Modified: wicket/trunk/wicket-jmx/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-jmx/pom.xml?rev=1063179&r1=1063178&r2=1063179&view=diff
==============================================================================
--- wicket/trunk/wicket-jmx/pom.xml (original)
+++ wicket/trunk/wicket-jmx/pom.xml Tue Jan 25 09:26:14 2011
@@ -36,7 +36,9 @@
<dependencies>
<dependency>
<groupId>org.apache.wicket</groupId>
- <artifactId>wicket-core</artifactId>
+ <artifactId>wicket</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
</dependency>
</dependencies>
</project>
Modified: wicket/trunk/wicket-objectssizeof-agent/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-objectssizeof-agent/pom.xml?rev=1063179&r1=1063178&r2=1063179&view=diff
==============================================================================
--- wicket/trunk/wicket-objectssizeof-agent/pom.xml (original)
+++ wicket/trunk/wicket-objectssizeof-agent/pom.xml Tue Jan 25 09:26:14 2011
@@ -34,7 +34,9 @@
<dependencies>
<dependency>
<groupId>org.apache.wicket</groupId>
- <artifactId>wicket-core</artifactId>
+ <artifactId>wicket</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
</dependency>
</dependencies>
Modified: wicket/trunk/wicket-spring/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-spring/pom.xml?rev=1063179&r1=1063178&r2=1063179&view=diff
==============================================================================
--- wicket/trunk/wicket-spring/pom.xml (original)
+++ wicket/trunk/wicket-spring/pom.xml Tue Jan 25 09:26:14 2011
@@ -36,7 +36,9 @@
<dependencies>
<dependency>
<groupId>org.apache.wicket</groupId>
- <artifactId>wicket-core</artifactId>
+ <artifactId>wicket</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
Modified: wicket/trunk/wicket-velocity/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-velocity/pom.xml?rev=1063179&r1=1063178&r2=1063179&view=diff
==============================================================================
--- wicket/trunk/wicket-velocity/pom.xml (original)
+++ wicket/trunk/wicket-velocity/pom.xml Tue Jan 25 09:26:14 2011
@@ -39,7 +39,9 @@
<dependencies>
<dependency>
<groupId>org.apache.wicket</groupId>
- <artifactId>wicket-core</artifactId>
+ <artifactId>wicket</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
Modified: wicket/trunk/wicket/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/pom.xml?rev=1063179&r1=1063178&r2=1063179&view=diff
==============================================================================
--- wicket/trunk/wicket/pom.xml (original)
+++ wicket/trunk/wicket/pom.xml Tue Jan 25 09:26:14 2011
@@ -8,95 +8,18 @@
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>wicket</artifactId>
+ <packaging>pom</packaging>
<name>Wicket</name>
<description>
- A module that creates a .jar from the classes in wicket, wicket-util
and wicket-request modules.
- This way all users - Maven and non-Maven ones can depend only on the
artifact produced by this module without
- bothering that Wicket core depends on other modules.
+ 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>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-util</artifactId>
- <version>${project.parent.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-request</artifactId>
- <version>${project.parent.version}</version>
- <scope>provided</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <!--
- How it works:
- I) In 'prepare-package' phase do:
- 1) unpack the dependencies in target/classes so it
looks like
- all files (*.class, *.properties, ...) belong
to this project
- 2) re-generate META-INF/MANIGEST.MF so that it contains
all OSGi
- headers for all packages
-
- II) In 'package' phase maven-jar-plugin collects all that in the
- final artifact
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.1</version>
- <executions>
- <execution>
- <id>unpack-dependencies</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>unpack-dependencies</goal>
- </goals>
- <configuration>
-
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
- <includes>**/*</includes>
- <includeGroupIds>org.apache.wicket</includeGroupIds>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.1.0</version>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- <configuration>
- <instructions>
- <Import-Package>org.apache.wicket*</Import-Package>
- <DynamicImport-Package>*</DynamicImport-Package>
- <_nouses>true</_nouses>
- </instructions>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <configuration>
- <!-- Do not deploy -sources.jar file.
- This project has no .java files
- -->
- <attach>false</attach>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
