[gatein-commits] gatein SVN: r8004 - in epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp: src and 1 other directory.

[do-not-reply at jboss.org]

Author: hfnukal
Date: 2011-11-07 16:02:25 -0500 (Mon, 07 Nov 2011)
New Revision: 8004

Modified:
   epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml
   epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/assemble.xml
Log:
JBEPP-1342 Upgrade JBoss Negotiation to 2.0.4.GA

Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml	2011-11-07 17:57:26 UTC (rev 8003)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml	2011-11-07 21:02:25 UTC (rev 8004)
@@ -57,6 +57,15 @@
             <type>zip</type>
         </dependency>
 
+        <!-- TODO: remove after updateing EAP -->
+        <!-- replacing org.jboss.security:jboss-negotiation:2.0.4.GA:jar -->
+        <dependency>
+            <groupId>org.jboss.security</groupId>
+            <artifactId>jboss-negotiation</artifactId>
+            <version>2.0.4.GA</version>
+            <type>jar</type>
+        </dependency>
+        
         <!-- EAP overlay -->
         <dependency>
             <groupId>${eap.groupId}</groupId>

Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/assemble.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/assemble.xml	2011-11-07 17:57:26 UTC (rev 8003)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/assemble.xml	2011-11-07 21:02:25 UTC (rev 8004)
@@ -93,7 +93,16 @@
             <outputDirectory>${eap.dir}/jboss-as/docs/examples/portal</outputDirectory>
             <unpack>true</unpack>
         </dependencySet>
-        
+
+        <!-- TODO: remove after updateing EAP -->
+        <!-- replacing org.jboss.security:jboss-negotiation:2.0.4.GA:jar -->
+        <dependencySet>
+            <includes>
+                <include>org.jboss.security:jboss-negotiation:jar</include>
+            </includes>
+            <outputDirectory>${eap.dir}/jboss-as/common/lib/</outputDirectory>
+        </dependencySet>
+
         <!-- EAP -->
         <dependencySet>
             <includes>
@@ -101,6 +110,11 @@
             </includes>
             <outputDirectory></outputDirectory>
             <unpack>true</unpack>
+            <unpackOptions>
+                <excludes>
+                    <exclude>**/jboss-as/common/lib/jboss-negotiation.jar</exclude>
+                </excludes>
+            </unpackOptions>
         </dependencySet>
     
     </dependencySets>