Author: gk
Date: Tue Dec 21 09:30:28 2021
New Revision: 1896218
URL: http://svn.apache.org/viewvc?rev=1896218&view=rev
Log:
- remove duplicate derby configuration in pom, use explicit profile instead and
update release information in README
Modified:
db/torque/trunk/README.md
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=1896218&r1=1896217&r2=1896218&view=diff
==============================================================================
--- db/torque/trunk/README.md (original)
+++ db/torque/trunk/README.md Tue Dec 21 09:30:28 2021
@@ -131,23 +131,26 @@ 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
+ mvn release:prepare -DdryRun=true -DautoVersionSubmodules=true
-Ptest,managers,beans, apache-release,derbyEmbedded-jenkins
mvn release:clean ..
+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
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.
-This will fail because the test project needs the *maven plugin* which is not
installed
+This will fail because **the test project** needs the *maven plugin* which is
not installed
in the new version yet.
-To fix this, you might have to run **rm torque-test/derby.log**,
+To fix this, you might have to run **rm derby.log**,
then run **mvn install** to install the torque artifacts in the release
version.
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
+ mvn release:prepare -DautoVersionSubmodules=true
-Ptest,managers,beans,apache-release,derbyEmbedded-jenkins
mvn release:perform -Pmanagers,beans,apache-release
Modified: db/torque/trunk/torque-test/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-test/pom.xml?rev=1896218&r1=1896217&r2=1896218&view=diff
==============================================================================
--- db/torque/trunk/torque-test/pom.xml (original)
+++ db/torque/trunk/torque-test/pom.xml Tue Dec 21 09:30:28 2021
@@ -1571,67 +1571,10 @@
</dependencies>
</profile>
- <profile>
+ <!-- needs profile derbyEmbedded-jenkins activated -->
+ <!-- profile>
<id>apache-release</id>
- <properties>
-
<torque.test.profileDirectory>derbyEmbedded</torque.test.profileDirectory>
- <torque.test.idmethod>native</torque.test.idmethod>
-
<torque.test.databaseSchema>bookstore</torque.test.databaseSchema>
- <torque.test.onUpdateCascade />
- <torque.test.onUpdateSetNull />
-
<torque.test.onUpdateRestrict>onUpdate="restrict"</torque.test.onUpdateRestrict>
-
<torque.test.onDeleteRestrict>onDelete="restrict"</torque.test.onDeleteRestrict>
- <torque.test.bitDataType>BOOLEANINT
- </torque.test.bitDataType><!-- BIT if database supports BIT
type, something else if not -->
- <torque.test.currentDateDefault>default="CURRENT_DATE"
- </torque.test.currentDateDefault><!-- default="CURRENT_DATE"
if database supports it -->
- <torque.test.currentTimeDefault>default="CURRENT_TIME"
- </torque.test.currentTimeDefault><!-- default="CURRENT_TIME"
if database supports it -->
-
<torque.test.currentTimestampDefault>default="CURRENT_TIMESTAMP"
- </torque.test.currentTimestampDefault><!--
default="CURRENT_TIMESTAMP" if database supports it -->
-
<torque.driver>org.apache.derby.jdbc.EmbeddedDriver</torque.driver>
- <torque.targetDatabase>derby</torque.targetDatabase>
-
<torque.database.url>jdbc:derby:torque-test/target/bookstore;create=true</torque.database.url>
- <torque.database.user />
- <torque.database.password />
-
<torque.database.shutdown.url>jdbc:derby:torque-test/target/bookstore;shutdown=true
- </torque.database.shutdown.url>
-
<torque.database.shutdown.skip>false</torque.database.shutdown.skip>
- </properties>
- <dependencies>
- <dependency>
- <artifactId>derbyclient</artifactId>
- <groupId>org.apache.derby</groupId>
- <version>${torque.test.derby.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>sql-maven-plugin</artifactId>
- <dependencies>
- <dependency>
- <artifactId>derbyclient</artifactId>
- <groupId>org.apache.derby</groupId>
- <version>${torque.test.derby.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <dependencies>
- <dependency>
- <artifactId>derbyclient</artifactId>
- <groupId>org.apache.derby</groupId>
- <version>${torque.test.derby.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
+ </profile-->
<profile>
<id>beans</id>
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org
