JBTM-1755 Updated to remove warnings when various artifacts are not a…

…vailable due to community vs product build or orb choice
jbosstm · Jun 10, 2013 · 375037d · 375037d
1 parent 8ec2ab2
commit 375037d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 36 deletions.
diff --git a/narayana-full/pom.xml b/narayana-full/pom.xml
@@ -24,10 +24,6 @@
   <name>Narayana: narayana-full</name>
   <description>Narayana: narayana-full</description>
 
-  <properties>
-    <skip.from.idlj>**</skip.from.idlj>
-  </properties>
-
   <build>
     <plugins>
       <plugin>
@@ -196,11 +192,7 @@
           <value>true</value>
         </property>
       </activation>
-
+
-      <properties>
-        <skip.from.idlj></skip.from.idlj>
-      </properties>
-
       <dependencies>
         <dependency>
           <groupId>org.jboss.narayana.jts</groupId>

diff --git a/narayana-full/src/main/assembly/bin.xml b/narayana-full/src/main/assembly/bin.xml
@@ -60,11 +60,8 @@
 		<dependencySet>
 			<useProjectArtifact>false</useProjectArtifact>
 			<includes>
-				<include>org.jboss.narayana.rts:restat-api</include>
+				<include>org.jboss.narayana.rts:restat-api:jar</include>
 			</includes>
-			<excludes>
-				<exclude>*:javadoc</exclude>
-			</excludes>
 			<outputDirectory>lib/rts</outputDirectory>
 			<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}
 			</outputFileNameMapping>
@@ -117,25 +114,8 @@
 		<dependencySet>
 			<useProjectArtifact>false</useProjectArtifact>
 			<includes>
-				<include>org.jboss.narayana.jts:narayana-jts-jacorb</include>
+				<include>org.jboss.narayana.jts:narayana-jts-*:jar</include>
 			</includes>
-			<excludes>
-				<exclude>*:javadoc</exclude>
-			</excludes>
-			<outputDirectory>lib/jts</outputDirectory>
-			<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}
-			</outputFileNameMapping>
-			<unpack>false</unpack>
-		</dependencySet>
-		<dependencySet>
-			<useProjectArtifact>false</useProjectArtifact>
-			<includes>
-				<include>org.jboss.narayana.jts:narayana-jts-idlj</include>
-			</includes>
-			<excludes>
-				<exclude>*:javadoc</exclude>
-                <exclude>${skip.from.idlj}</exclude>
-			</excludes>
 			<outputDirectory>lib/jts</outputDirectory>
 			<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}
 			</outputFileNameMapping>
@@ -163,11 +143,8 @@
 		<dependencySet>
 			<useProjectArtifact>false</useProjectArtifact>
 			<includes>
-				<include>org.jboss.narayana.jta:narayana-jta</include>
+				<include>org.jboss.narayana.jta:narayana-jta:jar</include>
 			</includes>
-			<excludes>
-				<exclude>*:javadoc</exclude>
-			</excludes>
 			<outputDirectory>lib/jta</outputDirectory>
 			<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}
 			</outputFileNameMapping>
@@ -196,7 +173,7 @@
 		<dependencySet>
 			<useProjectArtifact>false</useProjectArtifact>
 			<includes>
-				<include>org.jboss.narayana.arjunacore:arjunacore-services</include>
+				<include>org.jboss.narayana.arjunacore:*arjunacore-services*</include>
 			</includes>
 			<outputDirectory>services/lib</outputDirectory>
 			<unpack>false</unpack>