jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r1171595 - in /incubator/jena/Jena2/ARQ/trunk: assembly.xml pom.xml src-dev/dev/DevARQ.java
Date Fri, 16 Sep 2011 14:42:07 GMT
Author: andy
Date: Fri Sep 16 14:42:07 2011
New Revision: 1171595

URL: http://svn.apache.org/viewvc?rev=1171595&view=rev
Log:
Ensure the style of the distribution name is not changed from all the previous releases.

Modified:
    incubator/jena/Jena2/ARQ/trunk/assembly.xml
    incubator/jena/Jena2/ARQ/trunk/pom.xml
    incubator/jena/Jena2/ARQ/trunk/src-dev/dev/DevARQ.java

Modified: incubator/jena/Jena2/ARQ/trunk/assembly.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/assembly.xml?rev=1171595&r1=1171594&r2=1171595&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/assembly.xml (original)
+++ incubator/jena/Jena2/ARQ/trunk/assembly.xml Fri Sep 16 14:42:07 2011
@@ -5,6 +5,7 @@
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="xmlns=http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1
http://maven.apache.org/xsd/assembly-1.1.1.xsd">
+  <id>dist</id>
   <baseDirectory>${project.name}-${project.version}</baseDirectory>
   <formats>
     <!--

Modified: incubator/jena/Jena2/ARQ/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/pom.xml?rev=1171595&r1=1171594&r2=1171595&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/pom.xml (original)
+++ incubator/jena/Jena2/ARQ/trunk/pom.xml Fri Sep 16 14:42:07 2011
@@ -368,22 +368,43 @@ build.time.txt=${build.time.txt}
         <!-- This must be the last plug-in attached to the package phase 
              because it replies on the packaging of the jar to happen first.
         -->
+        <!-- We want one with appendAssemblyId=false and one with it defaulting to true.
+        hence two executions configured -->
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
+        <!--  But we want one with appendAssemblyId=false and one with it defaulting to
true.
         <configuration>
           <descriptors>
             <descriptor>assembly.xml</descriptor>
             <descriptor>assembly-testing.xml</descriptor>
           </descriptors>
         </configuration>
+        -->
         <executions>
           <execution>
             <id>create-assembly</id>
-            <!-- Must be last plugin attached to "package" -->
             <phase>package</phase>
             <goals>
               <goal>single</goal>
             </goals>
+	        <configuration>
+	 		  <appendAssemblyId>false</appendAssemblyId>
+    	      <descriptors>
+        	    <descriptor>assembly.xml</descriptor>
+          	  </descriptors>
+            </configuration>
+          </execution>
+          <execution>
+            <id>create-assembly-test</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+	        <configuration>
+    	      <descriptors>
+        	    <descriptor>assembly-testing.xml</descriptor>
+          	  </descriptors>
+            </configuration>
           </execution>
         </executions>
       </plugin>

Modified: incubator/jena/Jena2/ARQ/trunk/src-dev/dev/DevARQ.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src-dev/dev/DevARQ.java?rev=1171595&r1=1171594&r2=1171595&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src-dev/dev/DevARQ.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src-dev/dev/DevARQ.java Fri Sep 16 14:42:07 2011
@@ -5,6 +5,7 @@ public class DevARQ
 {
     // BIO: RS = vars list and the bindings.
     
+    // Assembly configuration: <appendAssemblyId>false</appendAssemblyId>
     
     // FILTER(?x=?y) optimization - at least FILTER(sameTerm(?x,?y))
     // FILTER(?x=<x> && ...) does not push down on the ?x=<x>



Mime
View raw message