You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2011/08/23 00:42:29 UTC
svn commit: r1160479 - in /myfaces/core/branches/2.0.x: assembly/pom.xml
implee6/pom.xml pom.xml
Author: lu4242
Date: Mon Aug 22 22:42:29 2011
New Revision: 1160479
URL: http://svn.apache.org/viewvc?rev=1160479&view=rev
Log:
remove shared reference and update assembly configuration
Modified:
myfaces/core/branches/2.0.x/assembly/pom.xml
myfaces/core/branches/2.0.x/implee6/pom.xml
myfaces/core/branches/2.0.x/pom.xml
Modified: myfaces/core/branches/2.0.x/assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/assembly/pom.xml?rev=1160479&r1=1160478&r2=1160479&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/assembly/pom.xml (original)
+++ myfaces/core/branches/2.0.x/assembly/pom.xml Mon Aug 22 22:42:29 2011
@@ -59,6 +59,12 @@
<classifier>javadoc</classifier>
</artifactItem>
<artifactItem>
+ <groupId>org.apache.myfaces.core.internal</groupId>
+ <artifactId>myfaces-impl-shared</artifactId>
+ <version>${project.version}</version>
+ <classifier>javadoc</classifier>
+ </artifactItem>
+ <artifactItem>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
<version>${project.version}</version>
@@ -115,19 +121,18 @@
<classifier>sources</classifier>
</artifactItem>
<artifactItem>
+ <groupId>org.apache.myfaces.core.internal</groupId>
+ <artifactId>myfaces-impl-shared</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </artifactItem>
+ <artifactItem>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-core-project</artifactId>
<version>${project.version}</version>
<type>zip</type>
<classifier>source-release</classifier>
</artifactItem>
- <artifactItem>
- <groupId>org.apache.myfaces.shared</groupId>
- <artifactId>myfaces-shared-project</artifactId>
- <version>${myfaces-shared.version}</version>
- <type>zip</type>
- <classifier>source-release</classifier>
- </artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/src</outputDirectory>
</configuration>
Modified: myfaces/core/branches/2.0.x/implee6/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/implee6/pom.xml?rev=1160479&r1=1160478&r2=1160479&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/implee6/pom.xml (original)
+++ myfaces/core/branches/2.0.x/implee6/pom.xml Mon Aug 22 22:42:29 2011
@@ -51,8 +51,8 @@
<!-- we can use myfaces-shared-impl, but we cannot use myfaces-impl (cyclic dependency) -->
<dependency>
- <groupId>org.apache.myfaces.shared</groupId>
- <artifactId>myfaces-shared-impl</artifactId>
+ <groupId>org.apache.myfaces.core.internal</groupId>
+ <artifactId>myfaces-impl-shared</artifactId>
</dependency>
<!-- in this module we need Servlet 3.0 (instead of 2.5) -->
Modified: myfaces/core/branches/2.0.x/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/pom.xml?rev=1160479&r1=1160478&r2=1160479&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/pom.xml (original)
+++ myfaces/core/branches/2.0.x/pom.xml Mon Aug 22 22:42:29 2011
@@ -55,11 +55,6 @@
<module>bundle</module>
</modules>
- <properties>
- <!-- MyFaces shared-impl version to use -->
- <myfaces-shared.version>4.0.9-SNAPSHOT</myfaces-shared.version>
- </properties>
-
<build>
<!-- Since Maven 3.0, this is required to add scpexe as protocol for deploy. -->
@@ -298,14 +293,6 @@
<version>${project.version}</version>
</dependency>
- <!-- myfaces-shared-impl (will be packed together with myfaces-impl) -->
- <dependency>
- <groupId>org.apache.myfaces.shared</groupId>
- <artifactId>myfaces-shared-impl</artifactId>
- <version>${myfaces-shared.version}</version>
- <scope>provided</scope>
- </dependency>
-
<!-- myfaces-impl-ee6 (will be packed together with myfaces-impl by shade-plugin) -->
<dependency>
<groupId>org.apache.myfaces.core.internal</groupId>