Author: gk
Date: Fri Aug 14 08:53:01 2020
New Revision: 1880847
URL: http://svn.apache.org/viewvc?rev=1880847&view=rev
Log:
- skip explicitely torque-test site building (TODO javadoc error, probably needs changes in mvn build)
- update status and download info for site.
Modified:
db/torque/torque4/trunk/README.md
db/torque/torque4/trunk/pom.xml
db/torque/torque4/trunk/torque-site/src/site/xdoc/download.xml
db/torque/torque4/trunk/torque-site/src/site/xdoc/status.xml
db/torque/torque4/trunk/torque-test/pom.xml
Modified: db/torque/torque4/trunk/README.md
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/README.md?rev=1880847&r1=1880846&r2=1880847&view=diff
==============================================================================
--- db/torque/torque4/trunk/README.md (original)
+++ db/torque/torque4/trunk/README.md Fri Aug 14 08:53:01 2020
@@ -37,7 +37,7 @@
- torque-maven-plugin
- torque-ant-tasks
- torque-site
- - torque-test
+ - torque-test (internal only)
### Core modules
@@ -115,7 +115,7 @@ You will be asked for your gpg passphras
First test the release locally until the build is successfull, then clean again and run and perform release:
- mvn release:prepare -DdryRun=true -DautoVersionSubmodules=true -Ptest,managers,beans
+ mvn release:prepare -DdryRun=true -DautoVersionSubmodules=true -Pmanagers,beans
mvn release:clean -DautoVersionSubmodules=true
Modified: db/torque/torque4/trunk/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/pom.xml?rev=1880847&r1=1880846&r2=1880847&view=diff
==============================================================================
--- db/torque/torque4/trunk/pom.xml (original)
+++ db/torque/torque4/trunk/pom.xml Fri Aug 14 08:53:01 2020
@@ -653,6 +653,10 @@
</reports>
</reportSet>
</reportSets>
+ <configuration>
+ <!-- test project javadoc is not needed in the main site and javadoc fails during the release build, so skip -->
+ <skipModules>torque-test</skipModules>
+ </configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
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=1880847&r1=1880846&r2=1880847&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 Fri Aug 14 08:53:01 2020
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+ <?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
@@ -56,21 +56,47 @@ The currently released versions of Torqu
<a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-generator-5.0-bin.tar.gz.asc">Sig.</a>
<a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-generator-5.0-bin.tar.gz.sha5121">SHA512</a></td>
- <td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/binaries/torque-templates-4.0.tar.gz">TAR</a>
- <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-templates-4.0.tar.gz.asc">Sig.</a>
- <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-templates-4.0.tar.gz.sha512">SHA512</a></td>
-
- <td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/binaries/torque-ant-tasks-4.0-bin.tar.gz">TAR</a>
- <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-ant-tasks-4.0-bin.tar.gz.asc">Sig.</a>
- <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-ant-tasks-4.0-bin.tar.gz.sha512">SHA512</a></td>
-
- <td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/binaries/torque-maven-plugin-4.0.jar">JAR</a>
- <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-maven-plugin-4.0.jar.asc">Sig.</a>
- <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-maven-plugin-4.0.jar.sha512">SHA512</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="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-site-4.0-site.tar.gz.asc">Sig.</a>
- <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-site-4.0-site.tar.gz.sha512">SHA512</a></td>
+ <td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/binaries/torque-templates-5.0.tar.gz">TAR</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-templates-5.0.tar.gz.asc">Sig.</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-templates-5.0.tar.gz.sha512">SHA512</a></td>
+
+ <td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/binaries/torque-ant-tasks-5.0-bin.tar.gz">TAR</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-ant-tasks-5.0-bin.tar.gz.asc">Sig.</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-ant-tasks-5.0-bin.tar.gz.sha512">SHA512</a></td>
+
+ <td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/binaries/torque-maven-plugin-5.0.jar">JAR</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-maven-plugin-5.0.jar.asc">Sig.</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-maven-plugin-5.0.jar.sha512">SHA512</a></td>
+
+ <td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/binaries/torque-site-5.0-site.tar.gz">TAR</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-site-5.0-site.tar.gz.asc">Sig.</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-site-5.0-site.tar.gz.sha512">SHA512</a></td>
+ </tr>
+
+ <tr>
+ <td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/binaries/torque-runtime-5.0-bin.zip">ZIP</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-runtime-5.0-bin.zip.asc">Sig.</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-runtime-5.0-bin.zip.sha512">SHA512</a></td>
+
+ <td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/binaries/torque-generator-5.0-bin.zip">ZIP</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-generator-5.0-bin.zip.asc">Sig.</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-generator-5.0-bin.zip.sha512">SHA512</a></td>
+
+ <td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/binaries/torque-templates-5.0.zip">ZIP</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-templates-5.0.zip.asc">Sig.</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-templates-5.0.zip.sha512">SHA512</a></td>
+
+ <td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/binaries/torque-ant-tasks-5.0-bin.zip">ZIP</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-ant-tasks-5.0-bin.zip.asc">Sig.</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-ant-tasks-5.0-bin.zip.sha512">SHA512</a></td>
+
+ <td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/binaries/torque-maven-plugin-5.0.pom">POM</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-maven-plugin-5.0.pom.asc">Sig.</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-maven-plugin-5.0.pom.sha512">SHA512</a></td>
+
+ <td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-4.0/binaries/torque-site-5.0-site.zip">ZIP</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-site-5.0-site.zip.asc">Sig.</a>
+ <a href="https://downloads.apache.org/db/torque/torque-4.0/binaries/torque-site-5.0-site.zip.sha512">SHA512</a></td>
</tr>
<tr>
@@ -182,13 +208,13 @@ The currently released versions of Torqu
</p>
<source>
% pgpk -a KEYS
-% pgpv torque-4.0.tar.gz.asc
+% pgpv torque-5.0.tar.gz.asc
or
% pgp -ka KEYS
-% pgp torque-4.0.tar.gz.asc
+% pgp torque-5.0.tar.gz.asc
or
% gpg --import KEYS
-% gpg --verify torque-4.0.tar.gz.asc <br/>
+% gpg --verify torque-5.0.tar.gz.asc <br/>
</source>
</subsection>
@@ -207,7 +233,7 @@ or
<section name="Getting The Development Source From SVN">
<p>
You can check out the latest source from the DB SVN module.<br/>
- Torque 4 resides in the db/torque/torque4 tree.
+ Torque 4 and 5 resides in the db/torque/torque4 tree. Current developer trunk version is 5.1-SNAPSHOT.
<source><![CDATA[svn checkout http://svn.apache.org/repos/asf/db/torque/torque4/trunk]]></source>
@@ -216,4 +242,4 @@ or
</section>
</body>
-</document>
+</document>
\ No newline at end of file
Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/status.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/status.xml?rev=1880847&r1=1880846&r2=1880847&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/src/site/xdoc/status.xml (original)
+++ db/torque/torque4/trunk/torque-site/src/site/xdoc/status.xml Fri Aug 14 08:53:01 2020
@@ -39,7 +39,9 @@
<subsection name="2020 - Torque-5.0 released">
<p>
- This is the second production release of the Torque 4 branch.
+ This is the second production release of the Torque 4 branch.
+ Note: SCM and JIRA version 4.1 entries are included and propagate to version 5.0. It was upgraded later and skipped, that is
+ version 4.1 corresponds now to version 5.0.
</p>
For details, please check the
<a href="jira-report.html">changes list</a>.
Modified: db/torque/torque4/trunk/torque-test/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/pom.xml?rev=1880847&r1=1880846&r2=1880847&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/pom.xml (original)
+++ db/torque/torque4/trunk/torque-test/pom.xml Fri Aug 14 08:53:01 2020
@@ -612,7 +612,9 @@
<artifactId>maven-site-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<configuration>
- <xdocDirectory>target/generated-xdocs</xdocDirectory>
+ <!-- test project site is not needed and site->javadoc fails during the release build, so skip -->
+ <skip>true</skip>
+ <!--xdocDirectory>target/generated-xdocs</xdocDirectory-->
</configuration>
</plugin>
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.