Author: tfischer
Date: Sun Dec 16 15:39:29 2012
New Revision: 1422605
URL: http://svn.apache.org/viewvc?rev=1422605&view=rev
Log:
- back to 4.0-SNAPSHOT
- use assembly plugin for site packaging
- adjust download names for assembly name
Added:
db/torque/torque4/trunk/src/main/assembly/site.xml
Modified:
db/torque/torque4/trunk/pom.xml
db/torque/torque4/trunk/torque-ant-tasks/pom.xml
db/torque/torque4/trunk/torque-generator/pom.xml
db/torque/torque4/trunk/torque-maven-plugin/pom.xml
db/torque/torque4/trunk/torque-runtime/pom.xml
db/torque/torque4/trunk/torque-site/pom.xml
db/torque/torque4/trunk/torque-site/src/site/xdoc/download.xml
db/torque/torque4/trunk/torque-templates/pom.xml
db/torque/torque4/trunk/torque-test/pom.xml
Modified: db/torque/torque4/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/pom.xml?rev=1422605&r1=1422604&r2=1422605&view=diff
==============================================================================
--- db/torque/torque4/trunk/pom.xml (original)
+++ db/torque/torque4/trunk/pom.xml Sun Dec 16 15:39:29 2012
@@ -32,7 +32,7 @@
<artifactId>torque</artifactId>
<packaging>pom</packaging>
<name>Torque Maven Parent</name>
- <version>4.1-SNAPSHOT</version>
+ <version>4.0-SNAPSHOT</version>
<description>Torque parent project</description>
<url>http://db.apache.org/torque/releases/torque-4.0</url>
Added: db/torque/torque4/trunk/src/main/assembly/site.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/src/main/assembly/site.xml?rev=1422605&view=auto
==============================================================================
--- db/torque/torque4/trunk/src/main/assembly/site.xml (added)
+++ db/torque/torque4/trunk/src/main/assembly/site.xml Sun Dec 16 15:39:29 2012
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+ <id>site</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <includes>
+ <include>${project.basedir}/README*</include>
+ <include>${project.basedir}/LICENSE*</include>
+ <include>${project.basedir}/NOTICE*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}/site</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <outputDirectory>.</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
Modified: db/torque/torque4/trunk/torque-ant-tasks/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-ant-tasks/pom.xml?rev=1422605&r1=1422604&r2=1422605&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-ant-tasks/pom.xml (original)
+++ db/torque/torque4/trunk/torque-ant-tasks/pom.xml Sun Dec 16 15:39:29 2012
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.torque</groupId>
<artifactId>torque</artifactId>
- <version>4.1-SNAPSHOT</version>
+ <version>4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
Modified: db/torque/torque4/trunk/torque-generator/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/pom.xml?rev=1422605&r1=1422604&r2=1422605&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/pom.xml (original)
+++ db/torque/torque4/trunk/torque-generator/pom.xml Sun Dec 16 15:39:29 2012
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.torque</groupId>
<artifactId>torque</artifactId>
- <version>4.1-SNAPSHOT</version>
+ <version>4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
Modified: db/torque/torque4/trunk/torque-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-maven-plugin/pom.xml?rev=1422605&r1=1422604&r2=1422605&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-maven-plugin/pom.xml (original)
+++ db/torque/torque4/trunk/torque-maven-plugin/pom.xml Sun Dec 16 15:39:29 2012
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.torque</groupId>
<artifactId>torque</artifactId>
- <version>4.1-SNAPSHOT</version>
+ <version>4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
Modified: db/torque/torque4/trunk/torque-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/pom.xml?rev=1422605&r1=1422604&r2=1422605&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/pom.xml (original)
+++ db/torque/torque4/trunk/torque-runtime/pom.xml Sun Dec 16 15:39:29 2012
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.torque</groupId>
<artifactId>torque</artifactId>
- <version>4.1-SNAPSHOT</version>
+ <version>4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
Modified: db/torque/torque4/trunk/torque-site/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/pom.xml?rev=1422605&r1=1422604&r2=1422605&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/pom.xml (original)
+++ db/torque/torque4/trunk/torque-site/pom.xml Sun Dec 16 15:39:29 2012
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.torque</groupId>
<artifactId>torque</artifactId>
- <version>4.1-SNAPSHOT</version>
+ <version>4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -269,14 +269,19 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>../src/main/assembly/site.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
<executions>
<execution>
- <id>jar-site-for-package</id>
+ <id>make-assembly</id>
<phase>package</phase>
<goals>
- <goal>jar</goal>
+ <goal>single</goal>
</goals>
</execution>
</executions>
Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/download.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/download.xml?rev=1422605&r1=1422604&r2=1422605&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/src/site/xdoc/download.xml (original)
+++ db/torque/torque4/trunk/torque-site/src/site/xdoc/download.xml Sun Dec 16
15:39:29 2012
@@ -73,10 +73,10 @@ The currently released versions of Torqu
<a
href="http://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-maven-plugin-4.0.jar.md5";>MD5</a>
<a
href="http://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-maven-plugin-4.0.jar.sha1";>SHA1</a></td>
- <td><a
href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/binaries/torque-site-4.0.tar.gz";>TAR</a>
- <a
href="http://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-site-4.0.tar.gz.asc";>Sig.</a>
- <a
href="http://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-site-4.0.tar.gz.md5";>MD5</a>
- <a
href="http://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-site-4.0.tar.gz.sha1";>SHA1</a></td>
+ <td><a
href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/binaries/torque-site-4.0-site.tar.gz";>TAR</a>
+ <a
href="http://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-site-4.0-site.tar.gz.asc";>Sig.</a>
+ <a
href="http://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-site-4.0-site.tar.gz.md5";>MD5</a>
+ <a
href="http://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-site-4.0-site.tar.gz.sha1";>SHA1</a></td>
</tr>
<tr>
@@ -105,10 +105,10 @@ The currently released versions of Torqu
<a
href="http://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-maven-plugin-4.0.pom.md5";>MD5</a>
<a
href="http://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-maven-plugin-4.0.pom.sha1";>SHA1</a></td>
- <td><a
href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/binaries/torque-site-4.0.zip";>TAR</a>
- <a
href="http://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-site-4.0.zip.asc";>Sig.</a>
- <a
href="http://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-site-4.0.zip.md5";>MD5</a>
- <a
href="http://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-site-4.0.zip.sha1";>SHA1</a></td>
+ <td><a
href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/binaries/torque-site-4.0-site.zip";>TAR</a>
+ <a
href="http://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-site-4.0.zip-site.asc";>Sig.</a>
+ <a
href="http://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-site-4.0.zip-site.md5";>MD5</a>
+ <a
href="http://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-site-4.0.zip-site.sha1";>SHA1</a></td>
</tr>
</table>
</p>
Modified: db/torque/torque4/trunk/torque-templates/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/pom.xml?rev=1422605&r1=1422604&r2=1422605&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/pom.xml (original)
+++ db/torque/torque4/trunk/torque-templates/pom.xml Sun Dec 16 15:39:29 2012
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.torque</groupId>
<artifactId>torque</artifactId>
- <version>4.1-SNAPSHOT</version>
+ <version>4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
Modified: db/torque/torque4/trunk/torque-test/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/pom.xml?rev=1422605&r1=1422604&r2=1422605&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/pom.xml (original)
+++ db/torque/torque4/trunk/torque-test/pom.xml Sun Dec 16 15:39:29 2012
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.torque</groupId>
<artifactId>torque</artifactId>
- <version>4.1-SNAPSHOT</version>
+ <version>4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
