You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vxquery.apache.org by ti...@apache.org on 2012/09/26 10:22:37 UTC
svn commit: r1390322 - in /incubator/vxquery/trunk/vxquery: pom.xml src/main/ src/main/assembly/ src/main/assembly/source.xml vxquery-cli/pom.xml vxquery-core/pom.xml vxquery-xtest/pom.xml

Author: tillw
Date: Wed Sep 26 08:22:36 2012
New Revision: 1390322

URL: http://svn.apache.org/viewvc?rev=1390322&view=rev
Log:
use maven-assembly-plugin
move '-incubating' from artifactId to version


Added:
    incubator/vxquery/trunk/vxquery/src/main/
    incubator/vxquery/trunk/vxquery/src/main/assembly/
    incubator/vxquery/trunk/vxquery/src/main/assembly/source.xml
Modified:
    incubator/vxquery/trunk/vxquery/pom.xml
    incubator/vxquery/trunk/vxquery/vxquery-cli/pom.xml
    incubator/vxquery/trunk/vxquery/vxquery-core/pom.xml
    incubator/vxquery/trunk/vxquery/vxquery-xtest/pom.xml

Modified: incubator/vxquery/trunk/vxquery/pom.xml
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/pom.xml?rev=1390322&r1=1390321&r2=1390322&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/pom.xml (original)
+++ incubator/vxquery/trunk/vxquery/pom.xml Wed Sep 26 08:22:36 2012
@@ -18,9 +18,9 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.vxquery</groupId>
-  <artifactId>apache-vxquery-incubating</artifactId>
+  <artifactId>apache-vxquery</artifactId>
   <packaging>pom</packaging>
-  <version>0.1-SNAPSHOT</version>
+  <version>0.1-incubating-SNAPSHOT</version>
   <name>VXQuery</name>
   <description>A Versatile XQuery Processor</description>
   <url>http://incubator.apache.org/vxquery/</url>
@@ -204,6 +204,21 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <descriptors>
+            <descriptor>src/main/assembly/source.xml</descriptor>
+          </descriptors>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-gpg-plugin</artifactId>
+        <version>1.4</version>
+      </plugin>
     </plugins>
   </build>
 

Added: incubator/vxquery/trunk/vxquery/src/main/assembly/source.xml
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/src/main/assembly/source.xml?rev=1390322&view=auto
==============================================================================
--- incubator/vxquery/trunk/vxquery/src/main/assembly/source.xml (added)
+++ incubator/vxquery/trunk/vxquery/src/main/assembly/source.xml Wed Sep 26 08:22:36 2012
@@ -0,0 +1,37 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+  <id>src</id>
+  <formats>
+    <format>dir</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <moduleSets>
+    <moduleSet>
+      <sources>
+        <outputDirectoryMapping>${module.basedir.name}</outputDirectoryMapping>
+        <fileSets>
+          <fileSet>
+            <includes>
+              <include>src/**</include>
+              <include>pom.xml</include>
+              <include>build*.xml</include>
+              <include>findbugs*.xml</include>
+            </includes>
+            <excludes>
+              <exclude>target/**</exclude>
+            </excludes>
+          </fileSet>
+        </fileSets>
+      </sources>
+    </moduleSet>
+  </moduleSets>
+  <fileSets>
+    <fileSet>
+      <includes>
+        <include>src/**</include>
+        <include>pom.xml</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+</assembly>

Modified: incubator/vxquery/trunk/vxquery/vxquery-cli/pom.xml
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-cli/pom.xml?rev=1390322&r1=1390321&r2=1390322&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-cli/pom.xml (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-cli/pom.xml Wed Sep 26 08:22:36 2012
@@ -18,9 +18,9 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.vxquery</groupId>
-  <artifactId>apache-vxquery-cli-incubating</artifactId>
+  <artifactId>apache-vxquery-cli</artifactId>
   <packaging>jar</packaging>
-  <version>0.1-SNAPSHOT</version>
+  <version>0.1-incubating-SNAPSHOT</version>
   <name>VXQuery CLI</name>
   <description>Apache Command-Line Utility</description>
 
@@ -82,8 +82,8 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.vxquery</groupId>
-      <artifactId>apache-vxquery-core-incubating</artifactId>
-      <version>0.1-SNAPSHOT</version>
+      <artifactId>apache-vxquery-core</artifactId>
+      <version>0.1-incubating-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
 

Modified: incubator/vxquery/trunk/vxquery/vxquery-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/pom.xml?rev=1390322&r1=1390321&r2=1390322&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/pom.xml (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/pom.xml Wed Sep 26 08:22:36 2012
@@ -18,9 +18,9 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.vxquery</groupId>
-  <artifactId>apache-vxquery-core-incubating</artifactId>
+  <artifactId>apache-vxquery-core</artifactId>
   <packaging>jar</packaging>
-  <version>0.1-SNAPSHOT</version>
+  <version>0.1-incubating-SNAPSHOT</version>
   <name>VXQuery Core</name>
   <description>Apache VXQuery Processor</description>
 

Modified: incubator/vxquery/trunk/vxquery/vxquery-xtest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-xtest/pom.xml?rev=1390322&r1=1390321&r2=1390322&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-xtest/pom.xml (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-xtest/pom.xml Wed Sep 26 08:22:36 2012
@@ -18,9 +18,9 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.vxquery</groupId>
-  <artifactId>apache-vxquery-xtest-incubating</artifactId>
+  <artifactId>apache-vxquery-xtest</artifactId>
   <packaging>jar</packaging>
-  <version>0.1-SNAPSHOT</version>
+  <version>0.1-incubating-SNAPSHOT</version>
   <name>VXQuery XTest</name>
   <description>Apache VXQuery Test Driver</description>
 
@@ -103,8 +103,8 @@
 
     <dependency>
       <groupId>org.apache.vxquery</groupId>
-      <artifactId>apache-vxquery-core-incubating</artifactId>
-      <version>0.1-SNAPSHOT</version>
+      <artifactId>apache-vxquery-core</artifactId>
+      <version>0.1-incubating-SNAPSHOT</version>
     </dependency>
 
   </dependencies>