BZ 1069606 - EAP 6.3 won't deploy properly if using the old gnu getop…

…t jar due to a bad manifest in that jar. change to a redhat specific gnu getopt build.
rhq-project · Mar 24, 2014 · ab4d586 · ab4d586
1 parent 9a4897c
commit ab4d586
Show file tree

Hide file tree

Showing 20 changed files with 42 additions and 42 deletions.
diff --git a/.classpath b/.classpath
@@ -231,7 +231,7 @@
 	<classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/man/jboss-metatype/2.1.1.GA/jboss-metatype-2.1.1.GA.jar"/>
 	<classpathentry exported="true" kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-impl/2.2.4/jaxb-impl-2.2.4.jar"/>
 	<classpathentry exported="true" kind="var" path="M2_REPO/i18nlog/i18nlog/1.0.10/i18nlog-1.0.10.jar"/>
-	<classpathentry exported="true" kind="var" path="M2_REPO/gnu-getopt/getopt/1.0.13/getopt-1.0.13.jar"/>
+	<classpathentry exported="true" kind="var" path="M2_REPO/gnu/getopt/java-getopt/1.0.13.redhat-4/java-getopt-1.0.13.redhat-4.jar"/>
 	<classpathentry exported="true" kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar" sourcepath="/M2_REPO/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1-sources.jar"/>
 	<classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/remoting/jboss-remoting/2.5.4.SP5/jboss-remoting-2.5.4.SP5.jar" sourcepath="M2_REPO/org/jboss/remoting/jboss-remoting/2.5.4.SP5/jboss-remoting-2.5.4.SP5-sources.jar"/>
 	<classpathentry exported="true" kind="var" path="M2_REPO/oswego-concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>

diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml
@@ -23,8 +23,8 @@
         </dependency>
 
         <dependency>
-            <groupId>gnu-getopt</groupId>
-            <artifactId>getopt</artifactId>
+            <groupId>gnu.getopt</groupId>
+            <artifactId>java-getopt</artifactId>
             <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
         </dependency>
 

diff --git a/modules/enterprise/agent/ant-run.xml b/modules/enterprise/agent/ant-run.xml
@@ -44,7 +44,7 @@ Ant Script that provides ways to package the Agent.
          <include name="log4j/log4j/${log4j.version}/log4j-${log4j.version}.jar" />
          <include name="jline/jline/${jline.version}/jline-${jline.version}.jar" />
          <include name="commons-logging/commons-logging/1.1.0.jboss/commons-logging-1.1.0.jboss.jar" />
-         <include name="gnu-getopt/getopt/${getopt.version}/getopt-${getopt.version}.jar" />
+         <include name="gnu/getopt/java-getopt/${getopt.version}/java-getopt-${getopt.version}.jar" />
          <include name="commons-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar" />
          <include name="dom4j/dom4j/1.6/dom4j-1.6.jar" />
          <include name="oswego-concurrent/concurrent/${concurrent.version}/concurrent-${concurrent.version}.jar" />

diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml
@@ -68,8 +68,8 @@
     <!-- 3rd Party Deps -->
 
     <dependency>
-      <groupId>gnu-getopt</groupId>
-      <artifactId>getopt</artifactId>
+      <groupId>gnu.getopt</groupId>
+      <artifactId>java-getopt</artifactId>
       <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
     </dependency>
 

diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml
@@ -49,8 +49,8 @@
     </dependency>
 
     <dependency>
-      <groupId>gnu-getopt</groupId>
-      <artifactId>getopt</artifactId>
+      <groupId>gnu.getopt</groupId>
+      <artifactId>java-getopt</artifactId>
       <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
     </dependency>
 
@@ -95,7 +95,7 @@ rhq-agent.latest.build-number=${buildNumber}
                   <include name="log4j/log4j/${log4j.version}/log4j-${log4j.version}.jar" />
                   <include name="commons-logging/commons-logging/${commons-logging.version}/commons-logging-${commons-logging.version}.jar" />
                   -->
-                  <include name="gnu-getopt/getopt/${getopt.version}/getopt-${getopt.version}.jar" />
+                  <include name="gnu/getopt/java-getopt/${getopt.version}/java-getopt-${getopt.version}.jar" />
                   <include name="org/apache/ant/ant/${ant.version}/ant-${ant.version}.jar" />
                   <include name="org/apache/ant/ant-launcher/${ant.version}/ant-launcher-${ant.version}.jar" />
                 </fileset>

diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml
@@ -93,8 +93,8 @@
                     <artifactId>dom4j</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>gnu-getopt</groupId>
-                    <artifactId>getopt</artifactId>
+                    <groupId>gnu.getopt</groupId>
+                    <artifactId>java-getopt</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>jboss</groupId>

diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml
@@ -53,8 +53,8 @@
     </dependency>
 
     <dependency>
-      <groupId>gnu-getopt</groupId>
-      <artifactId>getopt</artifactId>
+      <groupId>gnu.getopt</groupId>
+      <artifactId>java-getopt</artifactId>
       <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
     </dependency>
 

diff --git a/modules/enterprise/remoting/ant-run.xml b/modules/enterprise/remoting/ant-run.xml
@@ -37,7 +37,7 @@ ANT Script that provides ways to package the agent.
       <fileset dir="${settings.localRepository}" id="run.classpath.fileset">
          <include name="i18nlog/i18nlog/1.0.10/i18nlog-1.0.10.jar" />
          <include name="commons-logging/commons-logging/1.1.0.jboss/commons-logging-1.1.0.jboss.jar" />
-         <include name="gnu-getopt/getopt/${getopt.version}/getopt-${getopt.version}.jar" />
+         <include name="gnu/getopt/java-getopt/${getopt.version}/java-getopt-${getopt.version}.jar" />
          <include name="org/opensymphony/quartz/quartz/1.6.5/quartz-1.6.5.jar" />
          <include name="javassist/javassist/${javassist.version}/javassist-${javassist.version}.jar" />
 

diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml
@@ -49,8 +49,8 @@
       </dependency>
 
       <dependency>
-         <groupId>gnu-getopt</groupId>
-         <artifactId>getopt</artifactId>
+         <groupId>gnu.getopt</groupId>
+         <artifactId>java-getopt</artifactId>
       </dependency>
 
       <dependency>

diff --git a/modules/enterprise/remoting/cli/src/main/scripts/rhq-client.build.xml b/modules/enterprise/remoting/cli/src/main/scripts/rhq-client.build.xml
@@ -47,7 +47,7 @@
 
       <echo>*** Populating lib dir...</echo>
       <copy file="${settings.localRepository}/commons-logging/commons-logging/${commons-logging.version}/commons-logging-${commons-logging.version}.jar" tofile="${lib.home}/commons-logging-${commons-logging.version}.jar" verbose="true" />
-      <copy file="${settings.localRepository}/gnu-getopt/getopt/${getopt.version}/getopt-${getopt.version}.jar" tofile="${lib.home}/getopt-${getopt.version}.jar" verbose="true" />
+      <copy file="${settings.localRepository}/gnu/getopt/java-getopt/${getopt.version}/java-getopt-${getopt.version}.jar" tofile="${lib.home}/java-getopt-${getopt.version}.jar" verbose="true" />
       <copy file="${settings.localRepository}/i18nlog/i18nlog/${i18nlog.version}/i18nlog-${i18nlog.version}.jar" tofile="${lib.home}/i18nlog-${i18nlog.version}.jar" verbose="true" />
       <copy file="${settings.localRepository}/jline/jline/${jline.version}/jline-${jline.version}.jar" tofile="${lib.home}/jline-${jline.version}.jar" verbose="true" />
       <copy file="${settings.localRepository}/log4j/log4j/${log4j.version}/log4j-${log4j.version}.jar" tofile="${lib.home}/log4j-${log4j.version}.jar" verbose="true" />

diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml
@@ -26,8 +26,8 @@
               <artifactId>dom4j</artifactId>
             </exclusion>
             <exclusion>
-              <groupId>gnu-getopt</groupId>
-              <artifactId>getopt</artifactId>
+              <groupId>gnu.getopt</groupId>
+              <artifactId>java-getopt</artifactId>
             </exclusion>
             <exclusion>
               <groupId>jboss</groupId>

diff --git a/modules/enterprise/server/installer/pom.xml b/modules/enterprise/server/installer/pom.xml
@@ -62,8 +62,8 @@
       </dependency>
 
         <dependency>
-            <groupId>gnu-getopt</groupId>
-            <artifactId>getopt</artifactId>
+            <groupId>gnu.getopt</groupId>
+            <artifactId>java-getopt</artifactId>
         </dependency>
 
         <!-- rhq-jboss-as-dmr-client has this as provided dep - but we need it too -->

diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
@@ -289,8 +289,8 @@
     </dependency>
 
     <dependency>
-      <groupId>gnu-getopt</groupId>
-      <artifactId>getopt</artifactId>
+      <groupId>gnu.getopt</groupId>
+      <artifactId>java-getopt</artifactId>
     </dependency>
 
     <dependency>

diff --git a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
@@ -73,8 +73,8 @@
                                 </artifactItem>
 
                                 <artifactItem>
-                                    <groupId>gnu-getopt</groupId>
-                                    <artifactId>getopt</artifactId>
+                                    <groupId>gnu.getopt</groupId>
+                                    <artifactId>java-getopt</artifactId>
                                     <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
                                 </artifactItem>
 

diff --git a/modules/helpers/inventory-serializer/pom.xml b/modules/helpers/inventory-serializer/pom.xml
@@ -13,8 +13,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>gnu-getopt</groupId>
-            <artifactId>getopt</artifactId>
+            <groupId>gnu.getopt</groupId>
+            <artifactId>java-getopt</artifactId>
         </dependency>
         <dependency>
             <groupId>jboss</groupId>

diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml
@@ -36,8 +36,8 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>gnu-getopt</groupId>
-            <artifactId>getopt</artifactId>
+            <groupId>gnu.getopt</groupId>
+            <artifactId>java-getopt</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>

diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml
@@ -24,8 +24,8 @@
       </dependency>
 
       <dependency>
-         <groupId>gnu-getopt</groupId>
-         <artifactId>getopt</artifactId>
+         <groupId>gnu.getopt</groupId>
+         <artifactId>java-getopt</artifactId>
       </dependency>
 
    </dependencies>
@@ -52,8 +52,8 @@
                         </artifactItem>
 
                         <artifactItem>
-                           <groupId>gnu-getopt</groupId>
-                           <artifactId>getopt</artifactId>
+                           <groupId>gnu.getopt</groupId>
+                           <artifactId>java-getopt</artifactId>
                         </artifactItem>
 
                      </artifactItems>

diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml
@@ -67,8 +67,8 @@
     </dependency>
 
     <dependency>
-      <groupId>gnu-getopt</groupId>
-      <artifactId>getopt</artifactId>
+      <groupId>gnu.getopt</groupId>
+      <artifactId>java-getopt</artifactId>
       <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
     </dependency>
 

diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml
@@ -51,8 +51,8 @@
       </dependency>
 
       <dependency>
-         <groupId>gnu-getopt</groupId>
-         <artifactId>getopt</artifactId>
+         <groupId>gnu.getopt</groupId>
+         <artifactId>java-getopt</artifactId>
          <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
       </dependency>
 
@@ -105,8 +105,8 @@
                         </artifactItem>
                         -->
                         <artifactItem>
-                           <groupId>gnu-getopt</groupId>
-                           <artifactId>getopt</artifactId>
+                           <groupId>gnu.getopt</groupId>
+                           <artifactId>java-getopt</artifactId>
                         </artifactItem>
                         <artifactItem>
                            <groupId>jdom</groupId>

diff --git a/pom.xml b/pom.xml
@@ -119,7 +119,7 @@
     <el.version>1.0</el.version>
     <ems.version>1.3</ems.version>
 
-    <getopt.version>1.0.13</getopt.version>
+    <getopt.version>1.0.13.redhat-4</getopt.version>
 
     <h2.version>1.2.139</h2.version>
     <hibernate.version>4.2.0.CR1</hibernate.version>
@@ -529,8 +529,8 @@
 
       <!-- GNU GetOpt (any modules that need to do command-line argument parsing should use this) -->
       <dependency>
-        <groupId>gnu-getopt</groupId>
-        <artifactId>getopt</artifactId>
+        <groupId>gnu.getopt</groupId>
+        <artifactId>java-getopt</artifactId>
         <version>${getopt.version}</version>
       </dependency>