Author: gk
Date: Mon Jan 3 15:52:43 2022
New Revision: 1896650
URL: http://svn.apache.org/viewvc?rev=1896650&view=rev
Log:
- Revert RC torque-5-1, as torque.test.log4j2.version was missed / disregarded.
- Removed and replaced with the single log4j2.version property in parent pom.xml
- Renamed property torque.test.torque.derby.version to derby.version
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=1896650&r1=1896649&r2=1896650&view=diff
==============================================================================
--- db/torque/trunk/README.md (original)
+++ db/torque/trunk/README.md Mon Jan 3 15:52:43 2022
@@ -126,7 +126,7 @@ Check versions with Maven Versions Plugi
Public Key is added to KEYS.
-- Deploy artifacts
+##### Deploy artifacts
You will be asked for your gpg passphrase during the build process, if not provided otherwise.
@@ -134,7 +134,7 @@ You will be asked for your gpg passphras
mvn deploy -DskipTests=true
-- Release modules
+##### Release modules
First test the release locally until the build is successfull,
then clean again and run and perform release (from the parent root):
@@ -146,7 +146,15 @@ then clean again and run and perform rel
You have to add profiles test,derbyEmbedded-jenkins to allow for running the test module (find more information below in Note)
and profile apache-release to create the release checksums.
-##### Important information
+ mvn release:prepare -DautoVersionSubmodules=true -Ptest,managers,beans,apache-release,derbyEmbedded-jenkins
+
+ mvn release:perform -Pmanagers,beans,apache-release
+
+Note: We need to add profiles managers, beans as release perform does a checkout
+of the tagged version (which is then uploaded to nexus) and is running the build process again.
+In module torque-test the beans and manager java is generated only, if the beforementioned profiles are active.
+
+###### Important information for version < 5.1
From the developer-guide: Running release:prepare "will change the version in the poms
to the release version and then run a clean verify cycle on the new poms.
@@ -157,14 +165,7 @@ then run **mvn install** to install the
Then run again **mvn -Ptest release:prepare..** to finish building the release".
This requires **activated profile test** to also apply the release prepare step to module torque-test,
which is by default not in modules list.
-
- mvn release:prepare -DautoVersionSubmodules=true -Ptest,managers,beans,apache-release,derbyEmbedded-jenkins
-
- mvn release:perform -Pmanagers,beans,apache-release
-
-Note: We need to add profiles managers, beans as release perform does a checkout
-of the tagged version (which is then uploaded to nexus) and is running the build process again.
-In module torque-test the beans and manager java is generated only, if the beforementioned profiles are active.
+
Now close the staging repository after Login in Nexus Repo
https://repository.apache.org/index.html#stagingRepositories
Modified: db/torque/trunk/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/pom.xml?rev=1896650&r1=1896649&r2=1896650&view=diff
==============================================================================
--- db/torque/trunk/pom.xml (original)
+++ db/torque/trunk/pom.xml Mon Jan 3 15:52:43 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>
@@ -447,20 +447,20 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>${torque.test.derby.version}</version>
+ <version>${derby.version}</version>
<scope>test</scope>
</dependency>
<!--required for derby 15 / java 11:
dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyshared</artifactId>
- <version>${torque.test.derby.version}</version>
+ <version>${derby.version}</version>
<scope>test</scope>
</dependency-->
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
- <version>${torque.test.derby.version}</version>
+ <version>${derby.version}</version>
<scope>test</scope>
</dependency>
@@ -616,7 +616,7 @@
<format>html</format>
<format>xml</format>
</formats>
- <check />
+ <check/>
</configuration>
</plugin>
<plugin>
@@ -777,7 +777,7 @@
<!--suppress UnresolvedMavenProperty -->
<torque.compiler.javac>${JAVA_HOME}/bin/javac</torque.compiler.javac>
<!-- derby 10.15 requires java 11 -->
- <torque.test.derby.version>10.14.2.0</torque.test.derby.version>
+ <derby.version>10.14.2.0</derby.version>
<project.build.outputTimestamp>1</project.build.outputTimestamp>
Modified: db/torque/trunk/torque-ant-tasks/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-ant-tasks/pom.xml?rev=1896650&r1=1896649&r2=1896650&view=diff
==============================================================================
--- db/torque/trunk/torque-ant-tasks/pom.xml (original)
+++ db/torque/trunk/torque-ant-tasks/pom.xml Mon Jan 3 15:52:43 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>
Modified: db/torque/trunk/torque-generator/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-generator/pom.xml?rev=1896650&r1=1896649&r2=1896650&view=diff
==============================================================================
--- db/torque/trunk/torque-generator/pom.xml (original)
+++ db/torque/trunk/torque-generator/pom.xml Mon Jan 3 15:52:43 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>
Modified: db/torque/trunk/torque-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-maven-plugin/pom.xml?rev=1896650&r1=1896649&r2=1896650&view=diff
==============================================================================
--- db/torque/trunk/torque-maven-plugin/pom.xml (original)
+++ db/torque/trunk/torque-maven-plugin/pom.xml Mon Jan 3 15:52:43 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>
@@ -79,13 +79,13 @@
<artifactId>xercesImpl</artifactId>
<version>2.12.1</version>
</dependency>
-
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <scope>test</scope>
- </dependency>
-
+
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <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=1896650&r1=1896649&r2=1896650&view=diff
==============================================================================
--- db/torque/trunk/torque-runtime/pom.xml (original)
+++ db/torque/trunk/torque-runtime/pom.xml Mon Jan 3 15:52:43 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>
Modified: db/torque/trunk/torque-site/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-site/pom.xml?rev=1896650&r1=1896649&r2=1896650&view=diff
==============================================================================
--- db/torque/trunk/torque-site/pom.xml (original)
+++ db/torque/trunk/torque-site/pom.xml Mon Jan 3 15:52:43 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>
Modified: db/torque/trunk/torque-templates/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-templates/pom.xml?rev=1896650&r1=1896649&r2=1896650&view=diff
==============================================================================
--- db/torque/trunk/torque-templates/pom.xml (original)
+++ db/torque/trunk/torque-templates/pom.xml Mon Jan 3 15:52:43 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>
Modified: db/torque/trunk/torque-test/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-test/pom.xml?rev=1896650&r1=1896649&r2=1896650&view=diff
==============================================================================
--- db/torque/trunk/torque-test/pom.xml (original)
+++ db/torque/trunk/torque-test/pom.xml Mon Jan 3 15:52:43 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>
@@ -51,11 +51,10 @@
<properties>
<onSqlError>abort</onSqlError>
- <!-- torque.test.derby.version now in parent pom as shared in other modules -->
+ <!-- log4j2.version and derby.version now renamed in parent pom as shared in other modules -->
<torque.test.hsqldb.version>2.5.1</torque.test.hsqldb.version><!-- 2.5.1 as of june 2020 -->
<torque.test.mssql.version>1.2.7</torque.test.mssql.version>
<torque.test.mysql.version>8.0.27</torque.test.mysql.version><!-- 5.1.48 -->
- <torque.test.log4j2.version>2.16.0</torque.test.log4j2.version>
<torque.test.oracle.version>10.2.0.4.0</torque.test.oracle.version>
<torque.test.postgres.jdbc.version>42.2.14</torque.test.postgres.jdbc.version><!-- 9.1-901.jdbc4, -->
<torque.test.postgres.version>13.1</torque.test.postgres.version>
@@ -708,19 +707,19 @@
<dependency>
<artifactId>derby</artifactId>
<groupId>org.apache.derby</groupId>
- <version>${torque.test.derby.version}</version>
+ <version>${derby.version}</version>
<scope>test</scope>
</dependency>
<!--dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyshared</artifactId>
- <version>${torque.test.derby.version}</version>
+ <version>${derby.version}</version>
<scope>test</scope>
</dependency-->
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
- <version>${torque.test.derby.version}</version>
+ <version>${derby.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -733,17 +732,17 @@
<dependency>
<artifactId>derby</artifactId>
<groupId>org.apache.derby</groupId>
- <version>${torque.test.derby.version}</version>
+ <version>${derby.version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyshared</artifactId>
- <version>${torque.test.derby.version}</version>
+ <version>${derby.version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
- <version>${torque.test.derby.version}</version>
+ <version>${derby.version}</version>
</dependency>
</dependencies>
</plugin>
@@ -753,17 +752,17 @@
<dependency>
<artifactId>derby</artifactId>
<groupId>org.apache.derby</groupId>
- <version>${torque.test.derby.version}</version>
+ <version>${derby.version}</version>
</dependency>
<!--dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyshared</artifactId>
- <version>${torque.test.derby.version}</version>
+ <version>${derby.version}</version>
</dependency-->
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
- <version>${torque.test.derby.version}</version>
+ <version>${derby.version}</version>
</dependency>
</dependencies>
</plugin>
@@ -810,19 +809,19 @@
<dependency>
<artifactId>derby</artifactId>
<groupId>org.apache.derby</groupId>
- <version>${torque.test.derby.version}</version>
+ <version>${derby.version}</version>
<scope>test</scope>
</dependency>
<!--dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyshared</artifactId>
- <version>${torque.test.derby.version}</version>
+ <version>${derby.version}</version>
<scope>test</scope>
</dependency-->
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
- <version>${torque.test.derby.version}</version>
+ <version>${derby.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -835,12 +834,12 @@
<dependency>
<artifactId>derby</artifactId>
<groupId>org.apache.derby</groupId>
- <version>${torque.test.derby.version}</version>
+ <version>${derby.version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
- <version>${torque.test.derby.version}</version>
+ <version>${derby.version}</version>
</dependency>
</dependencies>
</plugin>
@@ -850,12 +849,12 @@
<dependency>
<artifactId>derby</artifactId>
<groupId>org.apache.derby</groupId>
- <version>${torque.test.derby.version}</version>
+ <version>${derby.version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
- <version>${torque.test.derby.version}</version>
+ <version>${derby.version}</version>
</dependency>
</dependencies>
</plugin>
@@ -1034,7 +1033,7 @@
<dependency>
<artifactId>derbyclient</artifactId>
<groupId>org.apache.derby</groupId>
- <version>${torque.test.derby.version}</version>
+ <version>${derby.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -1047,7 +1046,7 @@
<dependency>
<artifactId>derbyclient</artifactId>
<groupId>org.apache.derby</groupId>
- <version>${torque.test.derby.version}</version>
+ <version>${derby.version}</version>
</dependency>
</dependencies>
</plugin>
@@ -1057,7 +1056,7 @@
<dependency>
<artifactId>derbyclient</artifactId>
<groupId>org.apache.derby</groupId>
- <version>${torque.test.derby.version}</version>
+ <version>${derby.version}</version>
</dependency>
</dependencies>
</plugin>
@@ -1110,7 +1109,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
- <version>${torque.test.log4j2.version}</version>
+ <version>${log4j2.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -1321,7 +1320,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
- <version>${torque.test.log4j2.version}</version>
+ <version>${log4j2.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
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.