svn commit: r1896698 - in /db/torque/trunk: ./ torque-generator/src/changes/ torque-runtime/src/changes/ torque-site/src/ant/ torque-site/src/site/ torque-site/src/site/xdoc/ torque-site/src/site/xdoc/documentation/codegen-reference/ torque-site/src/si...

[email protected]
Newsgroups gmane.comp.jakarta.turbine.torque.devel
Message-ID <[email protected]>
Author: gk
Date: Wed Jan  5 08:43:13 2022
New Revision: 1896698

URL: http://svn.apache.org/viewvc?rev=1896698&view=rev
Log:
- use jacoco instead of coverage (java 8 bug) for coverage (updated jenkins)
- fix changes
- add changes info into modules documentation (generator, templates and runtime)
- update / prepare version 5.1 

Added:
    db/torque/trunk/torque-site/src/site/xdoc/documentation/modules/generator/reports/changes-report.xml
    db/torque/trunk/torque-site/src/site/xdoc/documentation/modules/runtime/reports/changes-report.xml
    db/torque/trunk/torque-site/src/site/xdoc/documentation/modules/templates/reports/changes-report.xml
Modified:
    db/torque/trunk/README.md
    db/torque/trunk/pom.xml
    db/torque/trunk/torque-generator/src/changes/changes.xml
    db/torque/trunk/torque-runtime/src/changes/changes.xml
    db/torque/trunk/torque-site/src/ant/build.xml
    db/torque/trunk/torque-site/src/site/site.xml
    db/torque/trunk/torque-site/src/site/xdoc/documentation/codegen-reference/logging-debugging.xml
    db/torque/trunk/torque-site/src/site/xdoc/documentation/orm-reference/index.xml
    db/torque/trunk/torque-site/src/site/xdoc/download.xml
    db/torque/trunk/torque-site/src/site/xdoc/index.xml
    db/torque/trunk/torque-site/src/site/xslt/body-content.xsl
    db/torque/trunk/torque-templates/src/changes/changes.xml

Modified: db/torque/trunk/README.md
URL: http://svn.apache.org/viewvc/db/torque/trunk/README.md?rev=1896698&r1=1896697&r2=1896698&view=diff
==============================================================================
--- db/torque/trunk/README.md (original)
+++ db/torque/trunk/README.md Wed Jan  5 08:43:13 2022
@@ -84,6 +84,7 @@ You need the ant tool installed.
     mvn site post-site
 
 N.B. This has to be run from root folder, as torque-site expects existing target/site folders for each module (torque-test is not included).
+Required minimal memory 1GB, set Maven_OPTS=2G.
 
 The ant build tool does not (yet) include pmd/xref reports in the final site building, 
 although they are build for inspection in each sub module (except test). 
@@ -142,7 +143,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 (from the parent root):
 
-    mvn release:prepare -DdryRun=true -DautoVersionSubmodules=true -Ptest,managers,beans, apache-release,derbyEmbedded-jenkins
+    mvn release:prepare -DdryRun=true -DautoVersionSubmodules=true -Ptest,managers,beans,apache-release,derbyEmbedded-jenkins
 
     mvn release:clean ..
     

Modified: db/torque/trunk/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/pom.xml?rev=1896698&r1=1896697&r2=1896698&view=diff
==============================================================================
--- db/torque/trunk/pom.xml (original)
+++ db/torque/trunk/pom.xml Wed Jan  5 08:43:13 2022
@@ -35,14 +35,10 @@
     <name>Torque Maven Parent</name>
     <version>5.1-SNAPSHOT</version>
     <description>Torque parent project</description>
-    <url>http://db.apache.org/torque/releases/torque-5.0</url>
+    <url>https://db.apache.org/torque/</url>
 
     <modules>
-        <module>torque-runtime</module>
-        <module>torque-generator</module>
-        <module>torque-templates</module>
-        <module>torque-maven-plugin</module>
-        <module>torque-ant-tasks</module>
+
         <module>torque-site</module>
     </modules>
 
@@ -631,7 +627,7 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
+            <!-- plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>cobertura-maven-plugin</artifactId>
                 <version>2.7</version>
@@ -642,6 +638,31 @@
                     </formats>
                     <check/>
                 </configuration>
+            </plugin-->
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.8.7</version>
+                <configuration>
+                    <excludes>
+                        <exclude>*/*Test*</exclude>
+                    </excludes>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>default-prepare-agent</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>report</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -776,6 +797,18 @@
                     </reportSet>
                 </reportSets>
             </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <!-- select non-aggregate reports -->
+                            <report>report</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
         </plugins>
     </reporting>
 
@@ -832,6 +865,7 @@
                             </algorithms>
                             <!-- generate only sha for binaries and source zip/tar files from assembly -->
                             <excludeMainArtifact>true</excludeMainArtifact>
+                            <excludeClassifiers>sha512</excludeClassifiers>
                         </configuration>
                         <executions>
                             <execution>

Modified: db/torque/trunk/torque-generator/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/src/changes/changes.xml?rev=1896698&r1=1896697&r2=1896698&view=diff
==============================================================================
--- db/torque/trunk/torque-generator/src/changes/changes.xml (original)
+++ db/torque/trunk/torque-generator/src/changes/changes.xml Wed Jan  5 08:43:13 2022
@@ -27,7 +27,7 @@
            dependencies: eclipse-jgit 5.13.0.202109080827, velocity 2.3, groovy-all 3.0.7, xerces 2.12.1, xmlunit-core 2.8.3
         </action>
   </release>
-  <release version="5.0-SNAPSHOT" date="2020-09-22">
+  <release version="5.0" date="2020-09-22">
     <action type="update" dev="gk">
     - update to groovy 3.0.4 (requires Java 8)
     - update to velocity 2.0

Modified: db/torque/trunk/torque-runtime/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-runtime/src/changes/changes.xml?rev=1896698&r1=1896697&r2=1896698&view=diff
==============================================================================
--- db/torque/trunk/torque-runtime/src/changes/changes.xml (original)
+++ db/torque/trunk/torque-runtime/src/changes/changes.xml Wed Jan  5 08:43:13 2022
@@ -23,8 +23,10 @@
   </properties>
   <body>
    <release version="5.1-SNAPSHOT" date="in SVN">
+   <action type="change" dev="painter">Adding AvgHelper which works similarly to the CountHelper util for providing extra criteria to the Avg function
+    </action>
    </release>
-   <release version="5.0-SNAPSHOT" date="2020-09-22">
+   <release version="5.0" date="2020-09-22">
     <action type="update" dev="gk">
        Use Commons Configuration, which allows for overriding, Update Beanutils 1.9.4
     </action>

Modified: db/torque/trunk/torque-site/src/ant/build.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-site/src/ant/build.xml?rev=1896698&r1=1896697&r2=1896698&view=diff
==============================================================================
--- db/torque/trunk/torque-site/src/ant/build.xml (original)
+++ db/torque/trunk/torque-site/src/ant/build.xml Wed Jan  5 08:43:13 2022
@@ -108,6 +108,10 @@
     <replace value="${runtime.taglist}" file="${project.reporting.outputDirectory}/documentation/modules/runtime/reports/taglist.html">
       <replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
     </replace>
+    <loadfile property="runtime.changes" srcFile="${basedir}/target/runtime-site-content/changes-report.xml" />
+    <replace value="${runtime.changes}" file="${project.reporting.outputDirectory}/documentation/modules/runtime/reports/changes-report.html">
+        <replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
+    </replace>
     <!-- generator reports -->
     <loadfile property="generator.dependencies" srcFile="${basedir}/target/generator-site-content/dependencies.xml" />
     <replace value="${generator.dependencies}" file="${project.reporting.outputDirectory}/documentation/modules/generator/dependencies.html">
@@ -121,6 +125,10 @@
     <replace value="${generator.taglist}" file="${project.reporting.outputDirectory}/documentation/modules/generator/reports/taglist.html">
       <replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
     </replace>
+    <loadfile property="generator.changes" srcFile="${basedir}/target/generator-site-content/changes-report.xml" />
+    <replace value="${generator.changes}" file="${project.reporting.outputDirectory}/documentation/modules/generator/reports/changes-report.html">
+        <replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
+    </replace>
     <!-- templates reports -->
     <loadfile property="templates.dependencies" srcFile="${basedir}/target/templates-site-content/dependencies.xml" />
     <replace value="${templates.dependencies}" file="${project.reporting.outputDirectory}/documentation/modules/templates/dependencies.html">
@@ -134,6 +142,10 @@
     <replace value="${templates.taglist}" file="${project.reporting.outputDirectory}/documentation/modules/templates/reports/taglist.html">
       <replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
     </replace>
+    <loadfile property="templates.changes" srcFile="${basedir}/target/templates-site-content/changes-report.xml" />
+    <replace value="${templates.changes}" file="${project.reporting.outputDirectory}/documentation/modules/templates/reports/changes-report.html">
+        <replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
+    </replace>
     <!-- maven 2 plugin reports -->
     <loadfile property="maven-plugin.dependencies" srcFile="${basedir}/target/maven-plugin-site-content/dependencies.xml" />
     <replace value="${maven-plugin.dependencies}" file="${project.reporting.outputDirectory}/documentation/modules/maven-plugin/dependencies.html">
@@ -164,6 +176,7 @@
     <replace value="${ant-tasks.taglist}" file="${project.reporting.outputDirectory}/documentation/modules/ant-tasks/reports/taglist.html">
       <replacetoken>@MERGEPOINT_BODY_CONTENT@</replacetoken>
     </replace>
+    
     <!-- runtime extra report pages -->
     <copy todir="${project.reporting.outputDirectory}/documentation/modules/runtime/reports/apidocs">
       <fileset dir="${basedir}/../torque-runtime/target/site/apidocs" />
@@ -210,6 +223,23 @@
       <fileset dir="${basedir}/../torque-ant-tasks/target/site/testapidocs" />
     </copy>
     
+    <!-- change reports -->    
+    <!--copy todir="${project.reporting.outputDirectory}/documentation/modules/runtime/reports/jacoco">
+      <fileset dir="${basedir}/../torque-runtime/target/site/jacoco" />
+    </copy>
+     <copy todir="${project.reporting.outputDirectory}/documentation/modules/generator/reports/jacoco">
+      <fileset dir="${basedir}/../torque-generator/target/site/jacoco" />
+    </copy>
+      <copy todir="${project.reporting.outputDirectory}/documentation/modules/templates/reports/jacoco">
+      <fileset dir="${basedir}/../torque-templates/target/site/jacoco" />
+    </copy>
+      <copy todir="${project.reporting.outputDirectory}/documentation/modules/maven-plugin/reports/jacoco">
+      <fileset dir="${basedir}/../torque-maven-plugin/target/site/jacoco" />
+    </copy>
+      <copy todir="${project.reporting.outputDirectory}/documentation/modules/ant-tasks/reports/jacoco">
+      <fileset dir="${basedir}/../torque-ant-tasks/target/site/jacoco" />
+    </copy-->
+    
     <!-- runtime images -->
     <copy todir="${project.reporting.outputDirectory}/documentation/modules/runtime/images">
       <fileset dir="${basedir}/../torque-runtime/target/site/images" />
@@ -217,6 +247,7 @@
     <copy todir="${project.reporting.outputDirectory}/documentation/modules/runtime/reports/images">
       <fileset dir="${basedir}/../torque-runtime/target/site/images" />
     </copy>
+
     <!-- generator images-->
     <copy todir="${project.reporting.outputDirectory}/documentation/modules/generator/images">
       <fileset dir="${basedir}/../torque-generator/target/site/images" />

Modified: db/torque/trunk/torque-site/src/site/site.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-site/src/site/site.xml?rev=1896698&r1=1896697&r2=1896698&view=diff
==============================================================================
--- db/torque/trunk/torque-site/src/site/site.xml (original)
+++ db/torque/trunk/torque-site/src/site/site.xml Wed Jan  5 08:43:13 2022
@@ -101,6 +101,7 @@
             <item name="JavaDocs"        href="/documentation/modules/generator/reports/apidocs/index.html" target="_blank" />
             <item name="Test JavaDocs"   href="/documentation/modules/generator/reports/testapidocs/index.html" target="_blank" />
             <item name="Tag List"        href="/documentation/modules/generator/reports/taglist.html"/>
+            <item name="Changes Report"         href="/documentation/modules/generator/reports/changes-report.html"/>
           </item>
         </item>
         <item name="Templates"           href="/documentation/modules/templates/index.html" collapse="true">
@@ -110,6 +111,7 @@
             <item name="JavaDocs"        href="/documentation/modules/templates/reports/apidocs/index.html" target="_blank" />
             <item name="Test JavaDocs"   href="/documentation/modules/templates/reports/testapidocs/index.html" target="_blank" />
             <item name="Tag List"        href="/documentation/modules/templates/reports/taglist.html"/>
+            <item name="Changes Report"         href="/documentation/modules/templates/reports/changes-report.html"/>
           </item>
         </item>
         <item name="Maven Plugin"        href="/documentation/modules/maven-plugin/index.html" collapse="true">
@@ -144,12 +146,15 @@
             <item name="JavaDocs"        href="/documentation/modules/runtime/reports/apidocs/index.html" target="_blank" />
             <item name="Test JavaDocs"   href="/documentation/modules/runtime/reports/testapidocs/index.html" target="_blank" />
             <item name="Tag List"        href="/documentation/modules/runtime/reports/taglist.html"/>
+            <item name="Changes Report"  href="/documentation/modules/runtime/reports/changes-report.html"/>
+            <!--item name="Coverage Report"  href="/documentation/modules/runtime/reports/jacoco/index.html"/-->
           </item>
         </item>
       </item>
     </menu>
 
     <menu name="Previous releases">
+      <item name="Torque 5.0"          href="../torque-5.0/index.html" target="_blank"/>
       <item name="Torque 4.0"          href="../torque-4.0/index.html" target="_blank"/>
       <item name="Torque 3.3"          href="../torque-3.3/index.html" target="_blank"/>
     </menu>

Modified: db/torque/trunk/torque-site/src/site/xdoc/documentation/codegen-reference/logging-debugging.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-site/src/site/xdoc/documentation/codegen-reference/logging-debugging.xml?rev=1896698&r1=1896697&r2=1896698&view=diff
==============================================================================
--- db/torque/trunk/torque-site/src/site/xdoc/documentation/codegen-reference/logging-debugging.xml (original)
+++ db/torque/trunk/torque-site/src/site/xdoc/documentation/codegen-reference/logging-debugging.xml Wed Jan  5 08:43:13 2022
@@ -141,7 +141,8 @@
       The adapter can be changed at runtime by calling the static method
       <code>setLoggingAdapter(LoggingAdapter)</code> of the class
       <code>org.apache.torque.generator.configuration.controller.Loglevel</code>.
-      By default, the <code>Log4jLoggingAdapter</code> is used in Torque 5.0 and <code>Log4j2LoggingAdapter</code> in Torque 5.1-SNAPSHOT.
+      By default, the <code>Log4jLoggingAdapter</code> is used in Torque 5.0 and
+      <code>Log4j2LoggingAdapter</code> in Torque 5.1.
     </p>
   </section>
  </body>

Added: db/torque/trunk/torque-site/src/site/xdoc/documentation/modules/generator/reports/changes-report.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-site/src/site/xdoc/documentation/modules/generator/reports/changes-report.xml?rev=1896698&view=auto
==============================================================================
--- db/torque/trunk/torque-site/src/site/xdoc/documentation/modules/generator/reports/changes-report.xml (added)
+++ db/torque/trunk/torque-site/src/site/xdoc/documentation/modules/generator/reports/changes-report.xml Wed Jan  5 08:43:13 2022
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+
+<document>
+ <properties>
+  <title>Torque Generator - Changes Report</title>
+ </properties>
+
+ <body>
+  @MERGEPOINT_BODY_CONTENT@
+ </body>
+</document>

Added: db/torque/trunk/torque-site/src/site/xdoc/documentation/modules/runtime/reports/changes-report.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-site/src/site/xdoc/documentation/modules/runtime/reports/changes-report.xml?rev=1896698&view=auto
==============================================================================
--- db/torque/trunk/torque-site/src/site/xdoc/documentation/modules/runtime/reports/changes-report.xml (added)
+++ db/torque/trunk/torque-site/src/site/xdoc/documentation/modules/runtime/reports/changes-report.xml Wed Jan  5 08:43:13 2022
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+
+<document>
+ <properties>
+  <title>Torque Runtime - Changes Report</title>
+ </properties>
+
+ <body>
+  @MERGEPOINT_BODY_CONTENT@
+ </body>
+</document>

Added: db/torque/trunk/torque-site/src/site/xdoc/documentation/modules/templates/reports/changes-report.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-site/src/site/xdoc/documentation/modules/templates/reports/changes-report.xml?rev=1896698&view=auto
==============================================================================
--- db/torque/trunk/torque-site/src/site/xdoc/documentation/modules/templates/reports/changes-report.xml (added)
+++ db/torque/trunk/torque-site/src/site/xdoc/documentation/modules/templates/reports/changes-report.xml Wed Jan  5 08:43:13 2022
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+
+<document>
+ <properties>
+  <title>Torque Templates Changes Report</title>
+ </properties>
+
+ <body>
+  @MERGEPOINT_BODY_CONTENT@
+ </body>
+</document>

Modified: db/torque/trunk/torque-site/src/site/xdoc/documentation/orm-reference/index.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-site/src/site/xdoc/documentation/orm-reference/index.xml?rev=1896698&r1=1896697&r2=1896698&view=diff
==============================================================================
--- db/torque/trunk/torque-site/src/site/xdoc/documentation/orm-reference/index.xml (original)
+++ db/torque/trunk/torque-site/src/site/xdoc/documentation/orm-reference/index.xml Wed Jan  5 08:43:13 2022
@@ -32,7 +32,7 @@
       This Reference contains information about how to use Torque as 
       a Object-Relational mapper (a tool that maps from relational databases
       to java classes). 
-      Torque 4.0 requires JDK 1.6 or higher, Torque 5.0 JDK 1.8 or higher.
+      Torque 4.0 requires JDK 1.6 or higher, Torque 5.0,5.1 JDK 1.8 or higher.
     </p>
     <p>
       To access a database with Torque, the following steps are needed, 

Modified: db/torque/trunk/torque-site/src/site/xdoc/download.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-site/src/site/xdoc/download.xml?rev=1896698&r1=1896697&r2=1896698&view=diff
==============================================================================
--- db/torque/trunk/torque-site/src/site/xdoc/download.xml (original)
+++ db/torque/trunk/torque-site/src/site/xdoc/download.xml Wed Jan  5 08:43:13 2022
@@ -175,6 +175,13 @@ The currently released versions of Torqu
       <th>Version</th>
       <th>Download</th>
     </tr>
+
+    <tr>
+      <td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-5.1/">Torque 5.1</a></td>
+      <td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-5.0/source/torque-5.1-source-release.zip">ZIP</a>&nbsp;
+          <a href="https://downloads.apache.org/db/torque/torque-5.1/source/torque-5.1-source-release.zip.asc">Sig.</a>&nbsp;
+          <a href="https://downloads.apache.org/db/torque/torque-5.1/source/torque-5.1-source-release.zip.sha512">SHA512</a></td>
+      </tr>
     
      <tr>
       <td><a href="http://www.apache.org/dyn/closer.cgi/db/torque/torque-5.0/">Torque 5.0</a></td>

Modified: db/torque/trunk/torque-site/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-site/src/site/xdoc/index.xml?rev=1896698&r1=1896697&r2=1896698&view=diff
==============================================================================
--- db/torque/trunk/torque-site/src/site/xdoc/index.xml (original)
+++ db/torque/trunk/torque-site/src/site/xdoc/index.xml Wed Jan  5 08:43:13 2022
@@ -57,8 +57,9 @@
      </p>
      
      <p>
-       Torque 5.0 requires JDK 1.8 or higher. Torque 4.0 requires JDK 1.6 or higher.  Also labelled version 5.0 it is still considered highly compatible with version 4.
-       Current development version is 5.1-SNAPSHOT.
+       Torque 5.0 and 5.1 requires JDK 1.8 or higher. Torque 4.0 requires JDK 1.6 or higher.
+         Also labelled version 5.0 it is still considered highly compatible with version 4.
+       Current development version is 5.2-SNAPSHOT.
      </p>
    </section>
 
@@ -67,7 +68,7 @@
      <ul>
       <li>
         The most recent <i>production</i> release of Torque is 
-        <a href="http://db.apache.org/torque">Torque 5.0</a>.
+        <a href="http://db.apache.org/torque">Torque 5.1</a>.
       </li>
        <li>
         The previous stable <i>production</i> release is 

Modified: db/torque/trunk/torque-site/src/site/xslt/body-content.xsl
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-site/src/site/xslt/body-content.xsl?rev=1896698&r1=1896697&r2=1896698&view=diff
==============================================================================
--- db/torque/trunk/torque-site/src/site/xslt/body-content.xsl (original)
+++ db/torque/trunk/torque-site/src/site/xslt/body-content.xsl Wed Jan  5 08:43:13 2022
@@ -23,7 +23,10 @@
 
  
   <xsl:output method="xml" encoding="UTF-8" omit-xml-declaration="yes" />
- 
+
+  <xsl:template match="*[not(node())] |
+                    @*[not(normalize-space())]"/>
+
   <xsl:template match="@*|node()">
     <xsl:apply-templates/>
   </xsl:template>

Modified: db/torque/trunk/torque-templates/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/src/changes/changes.xml?rev=1896698&r1=1896697&r2=1896698&view=diff
==============================================================================
--- db/torque/trunk/torque-templates/src/changes/changes.xml (original)
+++ db/torque/trunk/torque-templates/src/changes/changes.xml Wed Jan  5 08:43:13 2022
@@ -23,8 +23,8 @@
   </properties>
 
   <body>
-  <release version="5.1-SNAPSHOT" date="in SVN">
-   <action type="update" dev="gk">
+  <release version="5.1-SNAPSHOT" date="in SVN">   
+    <action type="update" dev="gk">
        remove versions in build-helper-maven-plugin, moved to parent build-helper v.3.2.0
     </action>
      <action type="fix" dev="gk" issue="TORQUE-360" due-to="Youngho Cho">
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.