[jboss-cvs] JBossAS SVN: r112276 - in projects/security/security-negotiation/trunk: assembly and 2 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: darran.lofthouse at jboss.com
Date: 2011-09-30 08:58:00 -0400 (Fri, 30 Sep 2011)
New Revision: 112276

Modified:
   projects/security/security-negotiation/trunk/assembly/pom.xml
   projects/security/security-negotiation/trunk/assembly/src/assembly/bin.xml
   projects/security/security-negotiation/trunk/assembly/src/assembly/sources.xml
   projects/security/security-negotiation/trunk/parent/pom.xml
   projects/security/security-negotiation/trunk/pom.xml
Log:
[SECURITY-626] Upgrade to assembly plug in 2.2.1 and adjust assembly IDs and configuration to retain
current naming of jboss-negotiation.jar and jboss-neogotiation-sources.jar.

Modified: projects/security/security-negotiation/trunk/assembly/pom.xml
===================================================================
--- projects/security/security-negotiation/trunk/assembly/pom.xml	2011-09-29 17:38:03 UTC (rev 112275)
+++ projects/security/security-negotiation/trunk/assembly/pom.xml	2011-09-30 12:58:00 UTC (rev 112276)
@@ -28,7 +28,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.1</version>
+        <version>${version.maven-assembly-plugin}</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -38,6 +38,8 @@
           </execution>
         </executions>
         <configuration>
+          <finalName>jboss</finalName>
+          <appendAssemblyId>true</appendAssemblyId>
           <archive>
             <manifestEntries>
               <Specification-Title>JBoss Security Implementation for the JBAS</Specification-Title>

Modified: projects/security/security-negotiation/trunk/assembly/src/assembly/bin.xml
===================================================================
--- projects/security/security-negotiation/trunk/assembly/src/assembly/bin.xml	2011-09-29 17:38:03 UTC (rev 112275)
+++ projects/security/security-negotiation/trunk/assembly/src/assembly/bin.xml	2011-09-30 12:58:00 UTC (rev 112276)
@@ -1,4 +1,5 @@
 <assembly>
+  <id>negotiation</id>
   <formats>
     <format>jar</format>
   </formats>

Modified: projects/security/security-negotiation/trunk/assembly/src/assembly/sources.xml
===================================================================
--- projects/security/security-negotiation/trunk/assembly/src/assembly/sources.xml	2011-09-29 17:38:03 UTC (rev 112275)
+++ projects/security/security-negotiation/trunk/assembly/src/assembly/sources.xml	2011-09-30 12:58:00 UTC (rev 112276)
@@ -1,5 +1,5 @@
 <assembly>
-  <id>sources</id>
+  <id>negotiation-sources</id>
   <formats>
     <format>jar</format>
   </formats>

Modified: projects/security/security-negotiation/trunk/parent/pom.xml
===================================================================
--- projects/security/security-negotiation/trunk/parent/pom.xml	2011-09-29 17:38:03 UTC (rev 112275)
+++ projects/security/security-negotiation/trunk/parent/pom.xml	2011-09-30 12:58:00 UTC (rev 112276)
@@ -21,6 +21,7 @@
   </scm>
   <properties>
     <version.junit>4.8.2</version.junit>
+    <version.maven-assembly-plugin>2.2.1</version.maven-assembly-plugin>
     <version.org.jboss.logging.jboss-logging>3.0.0.Beta5</version.org.jboss.logging.jboss-logging>
     <version.org.jboss.spec.javax.servlet.jboss-servlet-api_3.0_spec>1.0.0.Final</version.org.jboss.spec.javax.servlet.jboss-servlet-api_3.0_spec>
     <version.org.jboss.web>7.0.0.CR2</version.org.jboss.web>

Modified: projects/security/security-negotiation/trunk/pom.xml
===================================================================
--- projects/security/security-negotiation/trunk/pom.xml	2011-09-29 17:38:03 UTC (rev 112275)
+++ projects/security/security-negotiation/trunk/pom.xml	2011-09-30 12:58:00 UTC (rev 112276)
@@ -4,7 +4,7 @@
       <groupId>org.jboss.security</groupId>
       <artifactId>jboss-negotiation-project</artifactId>
       <version>2.2.0.SNAPSHOT</version>
-
+      <relativePath>parent/pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.jboss.security</groupId>