[JBWS-3971] Do not generate cxf-rt-*-jandex.jar anymore

jbossws · Jan 11, 2016 · 3197a9e · 3197a9e
1 parent b08961c
commit 3197a9e
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 70 deletions.
diff --git a/modules/dist/pom.xml b/modules/dist/pom.xml
@@ -219,11 +219,6 @@
           <artifactId>jbossws-wildfly900-server-integration</artifactId>
           <scope>provided</scope>
         </dependency>
-        <dependency>
-          <groupId>org.jboss</groupId>
-          <artifactId>jandex</artifactId>
-          <scope>provided</scope>
-        </dependency>
       </dependencies>
     </profile>
 
@@ -246,11 +241,6 @@
           <artifactId>jbossws-wildfly901-server-integration</artifactId>
           <scope>provided</scope>
         </dependency>
-        <dependency>
-          <groupId>org.jboss</groupId>
-          <artifactId>jandex</artifactId>
-          <scope>provided</scope>
-        </dependency>
       </dependencies>
     </profile>
 
@@ -273,11 +263,6 @@
           <artifactId>jbossws-wildfly902-server-integration</artifactId>
           <scope>provided</scope>
         </dependency>
-        <dependency>
-          <groupId>org.jboss</groupId>
-          <artifactId>jandex</artifactId>
-          <scope>provided</scope>
-        </dependency>
       </dependencies>
     </profile>
 
@@ -295,11 +280,6 @@
           <classifier>wildfly1000</classifier>     
           <scope>provided</scope>
         </dependency>
-        <dependency>
-          <groupId>org.jboss</groupId>
-          <artifactId>jandex</artifactId>
-          <scope>provided</scope>
-        </dependency>
       </dependencies>
     </profile>
 

diff --git a/modules/dist/src/main/scripts/build-deploy.xml b/modules/dist/src/main/scripts/build-deploy.xml
@@ -89,16 +89,9 @@
     <path id="jboss.ant.tasks.classpath">
       <fileset dir="${deploy.artifacts.dir}">
         <include name="**/jbossws-common-tools.jar"/>
-        <include name="**/jandex.jar"/>
       </fileset>
     </path>
     <taskdef name="installModules" classname="org.jboss.ws.tools.ant.InstallModulesTask" classpathref="jboss.ant.tasks.classpath"/>
-    <taskdef name="jandex" classname="org.jboss.jandex.JandexAntTask" classpathref="jboss.ant.tasks.classpath"/>
-    <jandex run="true" verbose="false" newJar="true">
-      <fileset dir="${deploy.artifacts.dir}/lib">
-        <include name="cxf*security.jar"/>
-      </fileset>
-    </jandex>
     <antcall target="deploy-jbossws-cxf-modules-as9" inheritall="false">
       <param name="installserver" value="${deploy.structure}/modules/system/layers/base"/>
       <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
@@ -206,16 +199,9 @@
     <path id="jboss.ant.tasks.classpath">
       <fileset dir="${deploy.artifacts.dir}">
         <include name="**/jbossws-common-tools.jar"/>
-        <include name="**/jandex.jar"/>
       </fileset>
     </path>
     <taskdef name="installModules" classname="org.jboss.ws.tools.ant.InstallModulesTask" classpathref="jboss.ant.tasks.classpath"/>
-    <taskdef name="jandex" classname="org.jboss.jandex.JandexAntTask" classpathref="jboss.ant.tasks.classpath"/>
-    <jandex run="true" verbose="false" newJar="true">
-      <fileset dir="${deploy.artifacts.dir}/lib">
-        <include name="cxf*security.jar"/>
-      </fileset>
-    </jandex>
     <antcall target="deploy-jbossws-cxf-modules-as10" inheritall="false">
       <param name="installserver" value="${deploy.structure}/modules/system/layers/base"/>
       <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>

diff --git a/pom.xml b/pom.xml
@@ -1279,15 +1279,6 @@
         <module>modules/dist</module>
         <module>modules/testsuite</module>
       </modules>
-      <dependencyManagement>
-        <dependencies>
-          <dependency>
-	        <groupId>org.jboss</groupId>
-	        <artifactId>jandex</artifactId>
-	        <version>1.1.0.Final</version>
-	      </dependency>
-        </dependencies>
-      </dependencyManagement>
     </profile>
 
     <!--
@@ -1306,15 +1297,6 @@
         <module>modules/dist</module>
         <module>modules/testsuite</module>
       </modules>
-      <dependencyManagement>
-        <dependencies>
-          <dependency>
-	        <groupId>org.jboss</groupId>
-	        <artifactId>jandex</artifactId>
-	        <version>1.1.0.Final</version>
-	      </dependency>
-        </dependencies>
-      </dependencyManagement>
     </profile>
 
     <!--
@@ -1333,15 +1315,6 @@
         <module>modules/dist</module>
         <module>modules/testsuite</module>
       </modules>
-      <dependencyManagement>
-        <dependencies>
-          <dependency>
-	        <groupId>org.jboss</groupId>
-	        <artifactId>jandex</artifactId>
-	        <version>1.1.0.Final</version>
-	      </dependency>
-        </dependencies>
-      </dependencyManagement>
     </profile>
 
     <!--
@@ -1360,15 +1333,6 @@
         <module>modules/dist</module>
         <module>modules/testsuite</module>
       </modules>
-      <dependencyManagement>
-        <dependencies>
-          <dependency>
-	        <groupId>org.jboss</groupId>
-	        <artifactId>jandex</artifactId>
-	        <version>2.0.0.Beta3</version>
-	      </dependency>
-        </dependencies>
-      </dependencyManagement>
     </profile>
 
     <profile>