You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2011/10/05 16:17:21 UTC
svn commit: r1179236 - /myfaces/tobago/trunk/tobago-assembly/pom.xml
Author: bommel
Date: Wed Oct 5 14:17:21 2011
New Revision: 1179236
URL: http://svn.apache.org/viewvc?rev=1179236&view=rev
Log:
(TOBAGO-1036)
Assembly: Facelets and FileUpload JARs should in the lib folder
Modified:
myfaces/tobago/trunk/tobago-assembly/pom.xml
Modified: myfaces/tobago/trunk/tobago-assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-assembly/pom.xml?rev=1179236&r1=1179235&r2=1179236&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-assembly/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-assembly/pom.xml Wed Oct 5 14:17:21 2011
@@ -106,6 +106,22 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tobago-facelets</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.facelets</groupId>
+ <artifactId>jsf-facelets</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tobago-fileupload</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
<scope>provided</scope>
@@ -183,21 +199,6 @@
<version>${project.version}</version>
<classifier>jdk14retro</classifier>
</artifactItem>
- </artifactItems>
- <outputDirectory>${project.build.directory}/jdk14retro
- </outputDirectory>
- </configuration>
- </execution>
-
- <execution>
- <id>copy-extension-jdk14retro</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
-
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>tobago-fileupload</artifactId>
@@ -210,13 +211,11 @@
<version>${project.version}</version>
<classifier>jdk14retro</classifier>
</artifactItem>
-
</artifactItems>
- <outputDirectory>${project.build.directory}/extension
+ <outputDirectory>${project.build.directory}/jdk14retro
</outputDirectory>
</configuration>
</execution>
-
</executions>
</plugin>
</plugins>
@@ -353,33 +352,6 @@
</outputDirectory>
</configuration>
</execution>
-
- <execution>
- <id>copy-extension</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
-
- <artifactItem>
- <groupId>${project.groupId}</groupId>
- <artifactId>tobago-facelets</artifactId>
- <version>${project.version}</version>
- </artifactItem>
- <artifactItem>
- <groupId>${project.groupId}</groupId>
- <artifactId>tobago-fileupload</artifactId>
- <version>${project.version}</version>
- </artifactItem>
-
- </artifactItems>
- <outputDirectory>${project.build.directory}/extension
- </outputDirectory>
- </configuration>
- </execution>
-
<execution>
<id>copy-source</id>
<phase>generate-resources</phase>