Author: gk
Date: Mon Jan 3 09:17:49 2022
New Revision: 1896635
URL: http://svn.apache.org/viewvc?rev=1896635&view=rev
Log:
- Revert RC 5.1,
https://lists.apache.org/thread/hcgd732n5z2y36jhzcb98fcbqcmvrp1t
Modified:
db/torque/trunk/README.md
db/torque/trunk/pom.xml
db/torque/trunk/torque-ant-tasks/pom.xml
db/torque/trunk/torque-generator/pom.xml
db/torque/trunk/torque-maven-plugin/pom.xml
db/torque/trunk/torque-runtime/pom.xml
db/torque/trunk/torque-site/pom.xml
db/torque/trunk/torque-templates/pom.xml
db/torque/trunk/torque-test/pom.xml
Modified: db/torque/trunk/README.md
URL:
http://svn.apache.org/viewvc/db/torque/trunk/README.md?rev=1896635&r1=1896634&r2=1896635&view=diff
==============================================================================
--- db/torque/trunk/README.md (original)
+++ db/torque/trunk/README.md Mon Jan 3 09:17:49 2022
@@ -76,7 +76,8 @@ or in **root folder** (with default data
#### Site module
-*Torque-site* is used to generate the site (add post-site to merge the
documentation of dependend modules. You need the ant tool installed.
+*Torque-site* is used to generate the site (add post-site to merge the
documentation of dependend modules.
+You need the ant tool installed.
mvn site post-site
Modified: db/torque/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/pom.xml?rev=1896635&r1=1896634&r2=1896635&view=diff
==============================================================================
--- db/torque/trunk/pom.xml (original)
+++ db/torque/trunk/pom.xml Mon Jan 3 09:17:49 2022
@@ -32,7 +32,7 @@
<artifactId>torque</artifactId>
<packaging>pom</packaging>
<name>Torque Maven Parent</name>
- <version>5.2-SNAPSHOT</version>
+ <version>5.1-SNAPSHOT</version>
<description>Torque parent project</description>
<url>http://db.apache.org/torque/releases/torque-5.0</url>
@@ -315,9 +315,9 @@
</contributors>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/tags/torque-5.1</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/tags/torque-5.1</developerConnection>
- <url>http://svn.apache.org/viewvc/db/torque/tags/torque-5.1</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/trunk</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/trunk</developerConnection>
+ <url>http://svn.apache.org/viewvc/db/torque/trunk</url>
</scm>
<dependencyManagement>
@@ -492,7 +492,7 @@
<format>html</format>
<format>xml</format>
</formats>
- <check />
+ <check/>
</configuration>
</plugin>
<plugin>
Modified: db/torque/trunk/torque-ant-tasks/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-ant-tasks/pom.xml?rev=1896635&r1=1896634&r2=1896635&view=diff
==============================================================================
--- db/torque/trunk/torque-ant-tasks/pom.xml (original)
+++ db/torque/trunk/torque-ant-tasks/pom.xml Mon Jan 3 09:17:49 2022
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.torque</groupId>
<artifactId>torque</artifactId>
- <version>5.2-SNAPSHOT</version>
+ <version>5.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -32,9 +32,9 @@
<name>Torque Generator Ant tasks</name>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/tags/torque-5.1</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/tags/torque-5.1</developerConnection>
- <url>http://svn.apache.org/viewvc/db/torque/tags/torque-5.1</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/trunk</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/trunk</developerConnection>
+ <url>http://svn.apache.org/viewvc/db/torque/trunk</url>
</scm>
<dependencies>
Modified: db/torque/trunk/torque-generator/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/pom.xml?rev=1896635&r1=1896634&r2=1896635&view=diff
==============================================================================
--- db/torque/trunk/torque-generator/pom.xml (original)
+++ db/torque/trunk/torque-generator/pom.xml Mon Jan 3 09:17:49 2022
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.torque</groupId>
<artifactId>torque</artifactId>
- <version>5.2-SNAPSHOT</version>
+ <version>5.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -32,9 +32,9 @@
<name>Torque Generator</name>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/tags/torque-5.1</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/tags/torque-5.1</developerConnection>
- <url>http://svn.apache.org/viewvc/db/torque/tags/torque-5.1</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/trunk</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/trunk</developerConnection>
+ <url>http://svn.apache.org/viewvc/db/torque/trunk</url>
</scm>
<dependencies>
Modified: db/torque/trunk/torque-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-maven-plugin/pom.xml?rev=1896635&r1=1896634&r2=1896635&view=diff
==============================================================================
--- db/torque/trunk/torque-maven-plugin/pom.xml (original)
+++ db/torque/trunk/torque-maven-plugin/pom.xml Mon Jan 3 09:17:49 2022
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.torque</groupId>
<artifactId>torque</artifactId>
- <version>5.2-SNAPSHOT</version>
+ <version>5.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -32,9 +32,9 @@
<name>Torque Generator Maven 2 Plugin</name>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/tags/torque-5.1</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/tags/torque-5.1</developerConnection>
- <url>http://svn.apache.org/viewvc/db/torque/tags/torque-5.1</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/trunk</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/trunk</developerConnection>
+ <url>http://svn.apache.org/viewvc/db/torque/trunk</url>
</scm>
<dependencies>
@@ -72,14 +72,14 @@
<artifactId>xercesImpl</artifactId>
<version>2.12.1</version>
</dependency>
-
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.11.0</version>
- <scope>test</scope>
- </dependency>
-
+
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.11.0</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.apache.logging.log4j</groupId>
Modified: db/torque/trunk/torque-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-runtime/pom.xml?rev=1896635&r1=1896634&r2=1896635&view=diff
==============================================================================
--- db/torque/trunk/torque-runtime/pom.xml (original)
+++ db/torque/trunk/torque-runtime/pom.xml Mon Jan 3 09:17:49 2022
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.torque</groupId>
<artifactId>torque</artifactId>
- <version>5.2-SNAPSHOT</version>
+ <version>5.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -32,10 +32,10 @@
<name>Torque Runtime</name>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/tags/torque-5.1</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/tags/torque-5.1
+
<connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/trunk</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/trunk
</developerConnection>
- <url>http://svn.apache.org/viewvc/db/torque/tags/torque-5.1</url>
+ <url>http://svn.apache.org/viewvc/db/torque/trunk</url>
</scm>
<dependencies>
Modified: db/torque/trunk/torque-site/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-site/pom.xml?rev=1896635&r1=1896634&r2=1896635&view=diff
==============================================================================
--- db/torque/trunk/torque-site/pom.xml (original)
+++ db/torque/trunk/torque-site/pom.xml Mon Jan 3 09:17:49 2022
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.torque</groupId>
<artifactId>torque</artifactId>
- <version>5.2-SNAPSHOT</version>
+ <version>5.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -38,9 +38,9 @@
</properties>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/tags/torque-5.1</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/tags/torque-5.1</developerConnection>
- <url>http://svn.apache.org/viewvc/db/torque/tags/torque-5.1</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/trunk</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/trunk</developerConnection>
+ <url>http://svn.apache.org/viewvc/db/torque/trunk</url>
</scm>
<distributionManagement>
@@ -73,7 +73,8 @@
</reportSet>
</reportSets>
<configuration>
- <fixVersionIds>12312102,12323291,12324114</fixVersionIds>
+ <!-- 5.1 last jira version id: 12349141 -->
+ <fixVersionIds>12312102,12323291,12324114,12349141</fixVersionIds>
<columnNames>Type,Key,Summary,Assignee,Status,Resolution,Fix
Version</columnNames>
<statusIds>Resolved,Closed</statusIds>
<sortColumnNames>Created DESC,Fix Version DESC</sortColumnNames>
Modified: db/torque/trunk/torque-templates/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/pom.xml?rev=1896635&r1=1896634&r2=1896635&view=diff
==============================================================================
--- db/torque/trunk/torque-templates/pom.xml (original)
+++ db/torque/trunk/torque-templates/pom.xml Mon Jan 3 09:17:49 2022
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.torque</groupId>
<artifactId>torque</artifactId>
- <version>5.2-SNAPSHOT</version>
+ <version>5.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -32,10 +32,10 @@
<name>Torque Templates</name>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/tags/torque-5.1</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/tags/torque-5.1
+
<connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/trunk</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/trunk
</developerConnection>
- <url>http://svn.apache.org/viewvc/db/torque/tags/torque-5.1</url>
+ <url>http://svn.apache.org/viewvc/db/torque/trunk</url>
</scm>
<dependencies>
Modified: db/torque/trunk/torque-test/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-test/pom.xml?rev=1896635&r1=1896634&r2=1896635&view=diff
==============================================================================
--- db/torque/trunk/torque-test/pom.xml (original)
+++ db/torque/trunk/torque-test/pom.xml Mon Jan 3 09:17:49 2022
@@ -38,7 +38,7 @@
<parent>
<groupId>org.apache.torque</groupId>
<artifactId>torque</artifactId>
- <version>5.2-SNAPSHOT</version>
+ <version>5.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -64,10 +64,10 @@
</properties>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/tags/torque-5.1</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/tags/torque-5.1
+
<connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/trunk</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/trunk
</developerConnection>
- <url>http://svn.apache.org/viewvc/db/torque/tags/torque-5.1</url>
+ <url>http://svn.apache.org/viewvc/db/torque/trunk</url>
</scm>
<dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org
