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/10/03 07:55:10 UTC

svn commit: r1393302 - in /incubator/vxquery/branches/vxquery_0_2_staging: pom.xml vxquery-cli/pom.xml vxquery-cli/src/site/ vxquery-cli/src/site/site.xml vxquery-core/build-xqts.xml vxquery-core/pom.xml vxquery-parent/pom.xml vxquery-xtest/pom.xml

Author: tillw
Date: Wed Oct  3 05:55:10 2012
New Revision: 1393302

URL: http://svn.apache.org/viewvc?rev=1393302&view=rev
Log:
fix site for vxquery-cli
update version number
fix rat reporting
do not automatically download XQTS


Added:
    incubator/vxquery/branches/vxquery_0_2_staging/vxquery-cli/src/site/
    incubator/vxquery/branches/vxquery_0_2_staging/vxquery-cli/src/site/site.xml
Modified:
    incubator/vxquery/branches/vxquery_0_2_staging/pom.xml
    incubator/vxquery/branches/vxquery_0_2_staging/vxquery-cli/pom.xml
    incubator/vxquery/branches/vxquery_0_2_staging/vxquery-core/build-xqts.xml
    incubator/vxquery/branches/vxquery_0_2_staging/vxquery-core/pom.xml
    incubator/vxquery/branches/vxquery_0_2_staging/vxquery-parent/pom.xml
    incubator/vxquery/branches/vxquery_0_2_staging/vxquery-xtest/pom.xml

Modified: incubator/vxquery/branches/vxquery_0_2_staging/pom.xml
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_0_2_staging/pom.xml?rev=1393302&r1=1393301&r2=1393302&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_0_2_staging/pom.xml (original)
+++ incubator/vxquery/branches/vxquery_0_2_staging/pom.xml Wed Oct  3 05:55:10 2012
@@ -20,7 +20,7 @@
   <groupId>org.apache.vxquery</groupId>
   <artifactId>apache-vxquery</artifactId>
   <packaging>pom</packaging>
-  <version>0.1-incubating-SNAPSHOT</version>
+  <version>0.2-incubating-SNAPSHOT</version>
   <name>VXQuery</name>
   <description>A Versatile XQuery Processor</description>
   <url>http://incubator.apache.org/vxquery/</url>
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.vxquery</groupId>
     <artifactId>apache-vxquery-parent</artifactId>
-    <version>0.1-incubating-SNAPSHOT</version>
+    <version>0.2-incubating-SNAPSHOT</version>
     <relativePath>vxquery-parent</relativePath>
   </parent>
 
@@ -103,21 +103,14 @@
             <linkOnly>true</linkOnly>
         </configuration>            
       </plugin>
-      <!--
-      <plugin>
-        <groupId>org.apache.rat</groupId>
-        <artifactId>apache-rat-plugin</artifactId>
-        <version>0.7</version>
-      </plugin>
-      -->
     </plugins>
   </reporting>
 
   <modules>
     <module>vxquery-parent</module>
     <module>vxquery-core</module>
-    <module>vxquery-xtest</module>
     <module>vxquery-cli</module>
+    <module>vxquery-xtest</module>
   </modules>
  
 </project>

Modified: incubator/vxquery/branches/vxquery_0_2_staging/vxquery-cli/pom.xml
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_0_2_staging/vxquery-cli/pom.xml?rev=1393302&r1=1393301&r2=1393302&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_0_2_staging/vxquery-cli/pom.xml (original)
+++ incubator/vxquery/branches/vxquery_0_2_staging/vxquery-cli/pom.xml Wed Oct  3 05:55:10 2012
@@ -20,14 +20,14 @@
   <groupId>org.apache.vxquery</groupId>
   <artifactId>apache-vxquery-cli</artifactId>
   <packaging>jar</packaging>
-  <version>0.1-incubating-SNAPSHOT</version>
+  <version>0.2-incubating-SNAPSHOT</version>
   <name>VXQuery CLI</name>
   <description>Apache Command-Line Utility</description>
 
   <parent>
     <groupId>org.apache.vxquery</groupId>
     <artifactId>apache-vxquery-parent</artifactId>
-    <version>0.1-incubating-SNAPSHOT</version>
+    <version>0.2-incubating-SNAPSHOT</version>
     <relativePath>../vxquery-parent</relativePath>
   </parent>
 
@@ -69,11 +69,6 @@
         <artifactId>maven-site-plugin</artifactId>
         <version>3.0</version>
       </plugin>
-      <plugin>
-        <groupId>org.apache.rat</groupId>
-        <artifactId>apache-rat-plugin</artifactId>
-        <version>0.7</version>
-      </plugin>
     </plugins>
   </build>
   
@@ -81,7 +76,7 @@
     <dependency>
       <groupId>org.apache.vxquery</groupId>
       <artifactId>apache-vxquery-core</artifactId>
-      <version>0.1-incubating-SNAPSHOT</version>
+      <version>0.2-incubating-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
@@ -105,6 +100,11 @@
             <linkOnly>true</linkOnly>
         </configuration>            
       </plugin>
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <version>0.7</version>
+      </plugin>
     </plugins>
   </reporting>
   

Added: incubator/vxquery/branches/vxquery_0_2_staging/vxquery-cli/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_0_2_staging/vxquery-cli/src/site/site.xml?rev=1393302&view=auto
==============================================================================
--- incubator/vxquery/branches/vxquery_0_2_staging/vxquery-cli/src/site/site.xml (added)
+++ incubator/vxquery/branches/vxquery_0_2_staging/vxquery-cli/src/site/site.xml Wed Oct  3 05:55:10 2012
@@ -0,0 +1,34 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<project name="VXQuery">
+    <bannerLeft>
+        <name>VXQuery</name>
+        <src>../images/VXQuery.png</src>
+        <href>../index.html</href>
+    </bannerLeft>
+
+    <bannerRight>
+        <name>Apache Incubator</name>
+        <src>../images/apache-incubator-logo.png</src>
+        <href>http://incubator.apache.org/</href>
+    </bannerRight>
+
+    <body>
+        <menu ref="reports"/>
+    </body>
+</project>
+

Modified: incubator/vxquery/branches/vxquery_0_2_staging/vxquery-core/build-xqts.xml
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_0_2_staging/vxquery-core/build-xqts.xml?rev=1393302&r1=1393301&r2=1393302&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_0_2_staging/vxquery-core/build-xqts.xml (original)
+++ incubator/vxquery/branches/vxquery_0_2_staging/vxquery-core/build-xqts.xml Wed Oct  3 05:55:10 2012
@@ -18,6 +18,12 @@
 
 <project name="vxquery" default="build" basedir=".">
 
+    <property name="xqts.url" value="http://dev.w3.org/2006/xquery-test-suite/PublicPagesStagingArea" />
+    <property name="xqts.zip.file" value="XQTS_1_0_3.zip" />
+    <property name="testsuites.dir" value="${basedir}/testsuites" />
+    <property name="xqts.dir" value="${basedir}/testsuites/XQTS" />
+    <property name="xqts.catalog.file" value="XQTSCatalog.xml" />
+
     <target name="init">
         <available file="${testsuites.dir}/${xqts.zip.file}" property="xqts.zip.present"/>
         <available file="${xqts.dir}/${xqts.catalog.file}" property="xqts.catalog.present"/>

Modified: incubator/vxquery/branches/vxquery_0_2_staging/vxquery-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_0_2_staging/vxquery-core/pom.xml?rev=1393302&r1=1393301&r2=1393302&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_0_2_staging/vxquery-core/pom.xml (original)
+++ incubator/vxquery/branches/vxquery_0_2_staging/vxquery-core/pom.xml Wed Oct  3 05:55:10 2012
@@ -20,14 +20,14 @@
   <groupId>org.apache.vxquery</groupId>
   <artifactId>apache-vxquery-core</artifactId>
   <packaging>jar</packaging>
-  <version>0.1-incubating-SNAPSHOT</version>
+  <version>0.2-incubating-SNAPSHOT</version>
   <name>VXQuery Core</name>
   <description>Apache VXQuery Processor</description>
 
   <parent>
     <groupId>org.apache.vxquery</groupId>
     <artifactId>apache-vxquery-parent</artifactId>
-    <version>0.1-incubating-SNAPSHOT</version>
+    <version>0.2-incubating-SNAPSHOT</version>
     <relativePath>../vxquery-parent</relativePath>
   </parent>
 
@@ -84,24 +84,6 @@
             </goals>
           </execution>
           <execution>
-            <id>get-xqts</id>
-            <phase>generate-test-resources</phase>
-            <configuration>
-              <target>
-                  <ant antfile="build-xqts.xml" target="build">
-                      <property name="xqts.url" value="http://dev.w3.org/2006/xquery-test-suite/PublicPagesStagingArea" />
-                      <property name="xqts.zip.file" value="XQTS_1_0_3.zip" />
-                      <property name="testsuites.dir" value="${basedir}/../../testsuites" />
-                      <property name="xqts.dir" value="${basedir}/../../testsuites/XQTS" />
-                      <property name="xqts.catalog.file" value="XQTSCatalog.xml" />
-                  </ant>
-              </target>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-          <execution>
             <id>generate-site</id>
             <phase>pre-site</phase>
             <configuration>
@@ -154,11 +136,6 @@
         <artifactId>maven-site-plugin</artifactId>
         <version>3.0</version>
       </plugin>
-      <plugin>
-        <groupId>org.apache.rat</groupId>
-        <artifactId>apache-rat-plugin</artifactId>
-        <version>0.7</version>
-      </plugin>
     </plugins>
     <pluginManagement>
     	<plugins>

Modified: incubator/vxquery/branches/vxquery_0_2_staging/vxquery-parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_0_2_staging/vxquery-parent/pom.xml?rev=1393302&r1=1393301&r2=1393302&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_0_2_staging/vxquery-parent/pom.xml (original)
+++ incubator/vxquery/branches/vxquery_0_2_staging/vxquery-parent/pom.xml Wed Oct  3 05:55:10 2012
@@ -20,7 +20,7 @@
   <groupId>org.apache.vxquery</groupId>
   <artifactId>apache-vxquery-parent</artifactId>
   <packaging>pom</packaging>
-  <version>0.1-incubating-SNAPSHOT</version>
+  <version>0.2-incubating-SNAPSHOT</version>
   <name>VXQuery Parent</name>
   <url>http://incubator.apache.org/vxquery/</url>
 
@@ -227,6 +227,21 @@
       </plugin>
     </plugins>
   </build>
+  
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <version>2.4</version>
+        <reportSets>
+          <reportSet>
+            <reports/>
+          </reportSet>
+        </reportSets>
+      </plugin>
+    </plugins>
+  </reporting>  
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

Modified: incubator/vxquery/branches/vxquery_0_2_staging/vxquery-xtest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/vxquery/branches/vxquery_0_2_staging/vxquery-xtest/pom.xml?rev=1393302&r1=1393301&r2=1393302&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_0_2_staging/vxquery-xtest/pom.xml (original)
+++ incubator/vxquery/branches/vxquery_0_2_staging/vxquery-xtest/pom.xml Wed Oct  3 05:55:10 2012
@@ -20,14 +20,14 @@
   <groupId>org.apache.vxquery</groupId>
   <artifactId>apache-vxquery-xtest</artifactId>
   <packaging>jar</packaging>
-  <version>0.1-incubating-SNAPSHOT</version>
+  <version>0.2-incubating-SNAPSHOT</version>
   <name>VXQuery XTest</name>
   <description>Apache VXQuery Test Driver</description>
 
   <parent>
     <groupId>org.apache.vxquery</groupId>
     <artifactId>apache-vxquery-parent</artifactId>
-    <version>0.1-incubating-SNAPSHOT</version>
+    <version>0.2-incubating-SNAPSHOT</version>
     <relativePath>../vxquery-parent</relativePath>
   </parent>
 
@@ -76,7 +76,7 @@
     <dependency>
       <groupId>org.apache.vxquery</groupId>
       <artifactId>apache-vxquery-core</artifactId>
-      <version>0.1-incubating-SNAPSHOT</version>
+      <version>0.2-incubating-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -106,6 +106,11 @@
             <linkOnly>true</linkOnly>
         </configuration>            
       </plugin>
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <version>0.7</version>
+      </plugin>
     </plugins>
   </reporting>
 </project>