Return-Path: 
 <torque-dev-return-12261-apmail-db-torque-dev-archive=db.apache.org@db.apache.org>
X-Original-To: apmail-db-torque-dev-archive@www.apache.org
Delivered-To: apmail-db-torque-dev-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id A830FDB06
	for <apmail-db-torque-dev-archive@www.apache.org>;
 Sun, 16 Dec 2012 15:40:05 +0000 (UTC)
Received: (qmail 6432 invoked by uid 500); 16 Dec 2012 15:40:05 -0000
Delivered-To: apmail-db-torque-dev-archive@db.apache.org
Received: (qmail 6249 invoked by uid 500); 16 Dec 2012 15:40:00 -0000
Mailing-List: contact torque-dev-help@db.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:torque-dev-unsubscribe@db.apache.org>
List-Help: <mailto:torque-dev-help@db.apache.org>
List-Post: <mailto:torque-dev@db.apache.org>
List-Id: "Apache Torque Developers List" <torque-dev.db.apache.org>
Reply-To: "Apache Torque Developers List" <torque-dev@db.apache.org>
Delivered-To: mailing list torque-dev@db.apache.org
Received: (qmail 6195 invoked by uid 500); 16 Dec 2012 15:39:58 -0000
Received: (qmail 6185 invoked by uid 99); 16 Dec 2012 15:39:58 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 16 Dec 2012 15:39:58 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 16 Dec 2012 15:39:54 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 8BBAE23889B8;
	Sun, 16 Dec 2012 15:39:32 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1422605 - in /db/torque/torque4/trunk: ./
 src/main/assembly/
 torque-ant-tasks/ torque-generator/ torque-maven-plugin/ torque-runtime/
 torque-site/ torque-site/src/site/xdoc/ torque-templates/ torque-test/
Date: Sun, 16 Dec 2012 15:39:31 -0000
To: torque-commits@db.apache.org
From: tfischer@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20121216153932.8BBAE23889B8@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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>&nbsp;
           <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>&nbsp;
-          <a href="http://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-site-4.0.tar.gz.asc">Sig.</a>&nbsp;
-          <a href="http://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-site-4.0.tar.gz.md5">MD5</a>&nbsp;
-          <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>&nbsp;
+          <a href="http://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-site-4.0-site.tar.gz.asc">Sig.</a>&nbsp;
+          <a href="http://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-site-4.0-site.tar.gz.md5">MD5</a>&nbsp;
+          <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>&nbsp;
           <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>&nbsp;
-          <a href="http://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-site-4.0.zip.asc">Sig.</a>&nbsp;
-          <a href="http://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-site-4.0.zip.md5">MD5</a>&nbsp;
-          <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>&nbsp;
+          <a href="http://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-site-4.0.zip-site.asc">Sig.</a>&nbsp;
+          <a href="http://www.apache.org/dist/db/torque/torque-4.0/binaries/torque-site-4.0.zip-site.md5">MD5</a>&nbsp;
+          <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: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org