You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sk...@apache.org on 2008/01/12 20:04:55 UTC
svn commit: r611463 - /myfaces/core/trunk/impl/pom.xml
Author: skitching
Date: Sat Jan 12 11:04:53 2008
New Revision: 611463
URL: http://svn.apache.org/viewvc?rev=611463&view=rev
Log:
* generate -sources jar by default. This takes almost no time, and it's nicer. It's also consistent with core12.
* add missing dependency version info
* add some dependencies previously pulled in by api module
Modified:
myfaces/core/trunk/impl/pom.xml
Modified: myfaces/core/trunk/impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/pom.xml?rev=611463&r1=611462&r2=611463&view=diff
==============================================================================
--- myfaces/core/trunk/impl/pom.xml (original)
+++ myfaces/core/trunk/impl/pom.xml Sat Jan 12 11:04:53 2008
@@ -28,6 +28,19 @@
</resources>
<plugins>
<plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.0.4</version>
+ <executions>
+ <execution>
+ <id>attach-source</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xslt-maven-plugin</artifactId>
<version>1.0</version>
@@ -46,8 +59,14 @@
</configuration>
</plugin>
<plugin>
+ <!--
+ - The shared-impl project generates a modified version of the "shared" module
+ - source and classes. The result is a jar full of files in the "shared_impl"
+ - package that we can merge into the jar for this project.
+ -->
<groupId>org.codehaus.mojo</groupId>
<artifactId>dependency-maven-plugin</artifactId>
+ <version>1.0</version>
<executions>
<execution>
<id>unpack-shared-impl</id>
@@ -87,25 +106,29 @@
</execution>
</executions>
</plugin>
- <!-- the following will add the unpacked shared sources directory as source directory into the pom,
- so also the shared sources are automaticaly included by the attach source plugin -->
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>process-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${project.build.directory}/shared_sources</source>
- </sources>
- </configuration>
- </execution>
- </executions>
+ <!--
+ - Add the unpacked shared sources directory as source directory into the pom datastructure,
+ - so that the -source jar includes them too; every .class file in the jar should have its
+ - source in the -source jar.
+ -->
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${project.build.directory}/shared_sources</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
@@ -169,6 +192,13 @@
</profile>
<profile>
+ <!--
+ - Whenever files are deployed to a snapshot or release repository,
+ - mvn -Pgenerate-assembly deploy
+ - should be used. This will create additional artifacts that are
+ - useful but too time-consuming to create when just doing a local
+ - "mvn install" operation.
+ -->
<id>generate-assembly</id>
<activation>
<property>
@@ -211,6 +241,7 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.3</version>
<executions>
<execution>
<id>attach-javadoc</id>
@@ -223,6 +254,7 @@
<plugin>
<groupId>net.sourceforge.maven-taglib</groupId>
<artifactId>maven-taglib-plugin</artifactId>
+ <version>2.3.1</version>
<executions>
<execution>
<id>attach-tlddoc</id>
@@ -236,17 +268,6 @@
<tldDocDir>${basedir}/target/tlddoc</tldDocDir>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-source</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</profile>
@@ -261,7 +282,7 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -271,6 +292,12 @@
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.1</version>
@@ -307,9 +334,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>1.8</version>
<scope>compile</scope>
</dependency>
<dependency>