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 2013/09/11 18:35:42 UTC
svn commit: r1521925 - in /incubator/vxquery/branches/vxquery_0_2_staging:
pom.xml vxquery-cli/pom.xml vxquery-core/pom.xml vxquery-parent/pom.xml
vxquery-xtest/pom.xml
Author: tillw
Date: Wed Sep 11 16:35:42 2013
New Revision: 1521925
URL: http://svn.apache.org/r1521925
Log:
cleanup (mostly removing redundant version numbers)
aggregated javadoc
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/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=1521925&r1=1521924&r2=1521925&view=diff
==============================================================================
--- incubator/vxquery/branches/vxquery_0_2_staging/pom.xml (original)
+++ incubator/vxquery/branches/vxquery_0_2_staging/pom.xml Wed Sep 11 16:35:42 2013
@@ -17,21 +17,20 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery-parent</artifactId>
<version>0.2-incubating-SNAPSHOT</version>
<relativePath>vxquery-parent</relativePath>
</parent>
-
+
<artifactId>apache-vxquery</artifactId>
<packaging>pom</packaging>
- <version>0.2-incubating-SNAPSHOT</version>
<name>VXQuery</name>
<description>A Versatile XQuery Processor</description>
<url>http://incubator.apache.org/vxquery/</url>
-
+
<scm>
<connection>scm:svn:https://svn.apache.org/repos/asf/incubator/vxquery</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/vxquery</developerConnection>
@@ -50,16 +49,16 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
<executions>
<execution>
<id>generate-site</id>
<phase>pre-site</phase>
<configuration>
<target>
- <ant antfile="build-site.xml" target="build">
- <property name="build.gen-site.dir" value="${project.build.directory}/generated-site/apt" />
- </ant>
+ <ant antfile="build-site.xml" target="build">
+ <property name="build.gen-site.dir"
+ value="${project.build.directory}/generated-site/apt" />
+ </ant>
</target>
</configuration>
<goals>
@@ -71,7 +70,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/source.xml</descriptor>
@@ -101,8 +99,8 @@
</reportSet>
</reportSets>
<configuration>
- <linkOnly>true</linkOnly>
- </configuration>
+ <linkOnly>true</linkOnly>
+ </configuration>
</plugin>
</plugins>
</reporting>
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=1521925&r1=1521924&r2=1521925&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 Sep 11 16:35:42 2013
@@ -17,14 +17,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery-parent</artifactId>
<version>0.2-incubating-SNAPSHOT</version>
<relativePath>../vxquery-parent</relativePath>
</parent>
-
+
<artifactId>apache-vxquery-cli</artifactId>
<packaging>jar</packaging>
<name>VXQuery CLI</name>
@@ -66,11 +66,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.3</version>
</plugin>
</plugins>
</build>
-
+
<dependencies>
<dependency>
<groupId>org.apache.vxquery</groupId>
@@ -93,7 +92,7 @@
<groupId>edu.uci.ics.hyracks</groupId>
<artifactId>hyracks-algebricks-core</artifactId>
<version>0.2.1</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>edu.uci.ics.hyracks</groupId>
<artifactId>hyracks-control-common</artifactId>
@@ -105,7 +104,7 @@
<version>0.2.1</version>
</dependency>
</dependencies>
-
+
<reporting>
<plugins>
<plugin>
@@ -122,8 +121,8 @@
</reportSet>
</reportSets>
<configuration>
- <linkOnly>true</linkOnly>
- </configuration>
+ <linkOnly>true</linkOnly>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>
@@ -140,5 +139,4 @@
</plugin>
</plugins>
</reporting>
-
</project>
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=1521925&r1=1521924&r2=1521925&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 Sep 11 16:35:42 2013
@@ -27,7 +27,6 @@
<artifactId>apache-vxquery-core</artifactId>
<packaging>jar</packaging>
- <version>0.2-incubating-SNAPSHOT</version>
<name>VXQuery Core</name>
<description>Apache VXQuery Processor</description>
@@ -59,19 +58,19 @@
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
<executions>
<execution>
<id>generate-code</id>
<phase>generate-sources</phase>
<configuration>
<target>
- <ant antfile="build-xslt.xml" target="build">
- <property name="build.gen-src.dir" value="${project.build.directory}/generated-sources/main/java" />
- <property name="src.code.dir" value="${basedir}/src/main/java" />
- <property name="xslt.dir" value="${basedir}/src/main/xslt" />
- <property name="classpath.xslt" refid="maven.compile.classpath" />
- </ant>
+ <ant antfile="build-xslt.xml" target="build">
+ <property name="build.gen-src.dir"
+ value="${project.build.directory}/generated-sources/main/java" />
+ <property name="src.code.dir" value="${basedir}/src/main/java" />
+ <property name="xslt.dir" value="${basedir}/src/main/xslt" />
+ <property name="classpath.xslt" refid="maven.compile.classpath" />
+ </ant>
</target>
</configuration>
<goals>
@@ -83,12 +82,13 @@
<phase>pre-site</phase>
<configuration>
<target>
- <ant antfile="build-site.xml" target="build">
- <property name="build.gen-site.dir" value="${project.build.directory}/generated-site/apt" />
- <property name="src.code.dir" value="${basedir}/src/main/java" />
- <property name="xslt.dir" value="${basedir}/src/main/xslt" />
- <property name="classpath.xslt" refid="maven.compile.classpath" />
- </ant>
+ <ant antfile="build-site.xml" target="build">
+ <property name="build.gen-site.dir"
+ value="${project.build.directory}/generated-site/apt" />
+ <property name="src.code.dir" value="${basedir}/src/main/java" />
+ <property name="xslt.dir" value="${basedir}/src/main/xslt" />
+ <property name="classpath.xslt" refid="maven.compile.classpath" />
+ </ant>
</target>
</configuration>
<goals>
@@ -121,7 +121,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.15</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration>
@@ -129,11 +128,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.3</version>
</plugin>
</plugins>
</build>
-
+
<dependencies>
<dependency>
<groupId>edu.uci.ics.hyracks</groupId>
@@ -144,16 +142,16 @@
<groupId>edu.uci.ics.hyracks</groupId>
<artifactId>hyracks-algebricks-core</artifactId>
<version>0.2.1</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>edu.uci.ics.hyracks</groupId>
<artifactId>hyracks-algebricks-data</artifactId>
<version>0.2.1</version>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.1</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.1</version>
</dependency>
<dependency>
<groupId>edu.uci.ics.hyracks</groupId>
@@ -185,7 +183,7 @@
<artifactId>hyracks-algebricks-rewriter</artifactId>
<version>0.2.1</version>
</dependency>
-
+
<dependency>
<groupId>ant</groupId>
<artifactId>ant-trax</artifactId>
@@ -224,21 +222,21 @@
</dependency>
<dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>1.3.1</version>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <version>1.3.1</version>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.3.2</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.3.2</version>
</dependency>
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.4</version>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.4</version>
</dependency>
<dependency>
@@ -248,7 +246,7 @@
<scope>test</scope>
</dependency>
</dependencies>
-
+
<reporting>
<plugins>
<plugin>
@@ -275,8 +273,8 @@
</reportSet>
</reportSets>
<configuration>
- <linkOnly>true</linkOnly>
- </configuration>
+ <linkOnly>true</linkOnly>
+ </configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
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=1521925&r1=1521924&r2=1521925&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 Sep 11 16:35:42 2013
@@ -1,13 +1,19 @@
-<!-- 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. -->
+<!--
+ 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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -211,82 +217,50 @@
</dependency>
</dependencies>
- <!-- DR -->
- <profiles>
- <profile>
- <id>release-sign-artifacts</id>
- <activation>
- <property>
- <name>performRelease</name>
- <value>true</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.3</version>
- </plugin>
- <plugin>
- <artifactId>maven-install-plugin</artifactId>
- <version>2.4</version>
- <configuration>
- <createChecksum>true</createChecksum>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.4.1</version>
- <configuration>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </configuration>
- </plugin>
- <!--DR <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.4</version>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin> -->
- </plugins>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-install-plugin</artifactId>
+ <configuration>
+ <createChecksum>true</createChecksum>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ </configuration>
+ </plugin>
+ <plugin>
+ <inherited>true</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>aggregate</id>
+ <goals>
+ <goal>aggregate</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <notimestamp>true</notimestamp>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<reporting>
@@ -310,7 +284,6 @@
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9</version>
<configuration>
<notimestamp>true</notimestamp>
</configuration>
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=1521925&r1=1521924&r2=1521925&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 Sep 11 16:35:42 2013
@@ -27,7 +27,6 @@
<artifactId>apache-vxquery-xtest</artifactId>
<packaging>jar</packaging>
- <version>0.2-incubating-SNAPSHOT</version>
<name>VXQuery XTest</name>
<description>Apache VXQuery Test Driver</description>
@@ -67,11 +66,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.3</version>
</plugin>
</plugins>
</build>
-
+
<dependencies>
<dependency>
<groupId>org.apache.vxquery</groupId>
@@ -79,7 +77,7 @@
<version>0.2-incubating-SNAPSHOT</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>edu.uci.ics.hyracks</groupId>
<artifactId>hyracks-api</artifactId>
<version>0.2.1</version>
@@ -119,8 +117,8 @@
</reportSet>
</reportSets>
<configuration>
- <linkOnly>true</linkOnly>
- </configuration>
+ <linkOnly>true</linkOnly>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>