You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ja...@apache.org on 2011/07/07 18:30:18 UTC
svn commit: r1143909 - in /myfaces/core/branches/2.0.8_shade_prototype:
impl/pom.xml implee6/pom.xml pom.xml
Author: jakobk
Date: Thu Jul 7 16:30:17 2011
New Revision: 1143909
URL: http://svn.apache.org/viewvc?rev=1143909&view=rev
Log:
MYFACES-3205 Create prototype for using shade-plugin to re-package and include shared into core (change groupId of impl-ee6, fix shade-plugin config and fix javadoc generation (needs MJAVADOC-320 to be committed first))
Modified:
myfaces/core/branches/2.0.8_shade_prototype/impl/pom.xml
myfaces/core/branches/2.0.8_shade_prototype/implee6/pom.xml
myfaces/core/branches/2.0.8_shade_prototype/pom.xml
Modified: myfaces/core/branches/2.0.8_shade_prototype/impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/impl/pom.xml?rev=1143909&r1=1143908&r2=1143909&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/impl/pom.xml (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/impl/pom.xml Thu Jul 7 16:30:17 2011
@@ -358,25 +358,49 @@
<createSourcesJar>true</createSourcesJar>
<artifactSet>
<includes>
- <include>org.apache.myfaces.core:myfaces-impl-ee6</include>
+ <include>org.apache.myfaces.core.internal:myfaces-impl-ee6</include>
<include>org.apache.myfaces.shared:myfaces-shared-core</include>
</includes>
</artifactSet>
<filters>
<!-- only include classes and META-INF/services entries -->
<filter>
- <artifact>org.apache.myfaces.core:myfaces-impl-ee6</artifact>
+ <artifact>org.apache.myfaces.core.internal:myfaces-impl-ee6</artifact>
<includes>
- <include>META-INF/services/**</include>
+ <include>META-INF/**</include>
<include>org/apache/myfaces/**</include>
</includes>
+ <excludes>
+ <!-- exclude Apache resource files (otherwise our ones will be overwritten) -->
+ <exclude>META-INF/DEPENDENCIES</exclude>
+ <exclude>META-INF/DEPENDENCIES.txt</exclude>
+ <exclude>META-INF/LICENSE</exclude>
+ <exclude>META-INF/LICENSE.txt</exclude>
+ <exclude>META-INF/NOTICE</exclude>
+ <exclude>META-INF/NOTICE.txt</exclude>
+ <!-- exclude manifest.mf and maven metadata of other project (b/c we have our own) -->
+ <exclude>META-INF/MANIFEST.MF</exclude>
+ <exclude>META-INF/maven/**</exclude>
+ </excludes>
</filter>
<filter>
<artifact>org.apache.myfaces.shared:myfaces-shared-core</artifact>
<includes>
- <include>META-INF/services/**</include>
+ <include>META-INF/**</include>
<include>org/apache/myfaces/shared/**</include>
</includes>
+ <excludes>
+ <!-- exclude Apache resource files (otherwise our ones will be overwritten) -->
+ <exclude>META-INF/DEPENDENCIES</exclude>
+ <exclude>META-INF/DEPENDENCIES.txt</exclude>
+ <exclude>META-INF/LICENSE</exclude>
+ <exclude>META-INF/LICENSE.txt</exclude>
+ <exclude>META-INF/NOTICE</exclude>
+ <exclude>META-INF/NOTICE.txt</exclude>
+ <!-- exclude manifest.mf and maven metadata of other project (b/c we have our own) -->
+ <exclude>META-INF/MANIFEST.MF</exclude>
+ <exclude>META-INF/maven/**</exclude>
+ </excludes>
</filter>
</filters>
<relocations>
@@ -549,27 +573,27 @@
<build>
<plugins>
- <!-- TODO not entirely working yet -->
+ <!-- TODO needs MJAVADOC-320 to be fixed in order to work as expected -->
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.8</version>
- <configuration>
- <!-- switch on dependency-driven aggregation -->
- <includeDependencySources>true</includeDependencySources>
-
- <dependencySourceIncludes>
- <dependencySourceInclude>org.apache.myfaces.core:myfaces-impl-ee6</dependencySourceInclude>
- <dependencySourceInclude>org.apache.myfaces.shared:myfaces-shared-core</dependencySourceInclude>
- </dependencySourceIncludes>
-
- <encoding>UTF-8</encoding>
- </configuration>
+ <version>2.8.1-SNAPSHOT</version>
<executions>
<execution>
<id>attach-javadoc</id>
<goals>
<goal>jar</goal>
</goals>
+ <configuration>
+ <!-- switch on dependency-driven aggregation -->
+ <includeDependencySources>true</includeDependencySources>
+
+ <dependencySourceIncludes>
+ <dependencySourceInclude>org.apache.myfaces.core.internal:myfaces-impl-ee6</dependencySourceInclude>
+ <dependencySourceInclude>org.apache.myfaces.shared:myfaces-shared-core</dependencySourceInclude>
+ </dependencySourceIncludes>
+
+ <encoding>UTF-8</encoding>
+ </configuration>
</execution>
</executions>
</plugin>
@@ -730,7 +754,7 @@
<!-- maven-shade-plugin will exclude this dependency automatically -->
<dependency>
- <groupId>org.apache.myfaces.core</groupId>
+ <groupId>org.apache.myfaces.core.internal</groupId>
<artifactId>myfaces-impl-ee6</artifactId>
<optional>true</optional> <!-- optional does not completely work in dependencyManagement (MNG-1630) -->
</dependency>
Modified: myfaces/core/branches/2.0.8_shade_prototype/implee6/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/implee6/pom.xml?rev=1143909&r1=1143908&r2=1143909&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/implee6/pom.xml (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/implee6/pom.xml Thu Jul 7 16:30:17 2011
@@ -25,7 +25,7 @@
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.myfaces.core</groupId>
+ <groupId>org.apache.myfaces.core.internal</groupId>
<artifactId>myfaces-impl-ee6</artifactId>
<packaging>jar</packaging>
<name>Apache MyFaces JSF-2.0 Core Impl for Java EE 6</name>
Modified: myfaces/core/branches/2.0.8_shade_prototype/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.8_shade_prototype/pom.xml?rev=1143909&r1=1143908&r2=1143909&view=diff
==============================================================================
--- myfaces/core/branches/2.0.8_shade_prototype/pom.xml (original)
+++ myfaces/core/branches/2.0.8_shade_prototype/pom.xml Thu Jul 7 16:30:17 2011
@@ -257,7 +257,7 @@
<!-- myfaces-impl-ee6 (will be packed together with myfaces-impl by shade-plugin) -->
<dependency>
- <groupId>org.apache.myfaces.core</groupId>
+ <groupId>org.apache.myfaces.core.internal</groupId>
<artifactId>myfaces-impl-ee6</artifactId>
<version>${project.version}</version>
<scope>compile</scope>