Author: gk
Date: Tue Dec 21 09:03:44 2021
New Revision: 1896217

URL: http://svn.apache.org/viewvc?rev=1896217&view=rev
Log:
- fix derby dependencies in profile apache-release
- update 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=1896217&r1=1896216&r2=1896217&view=diff
==============================================================================
--- db/torque/trunk/README.md (original)
+++ db/torque/trunk/README.md Tue Dec 21 09:03:44 2021
@@ -121,30 +121,39 @@ Public Key is added to KEYS.
 
 You will be asked for your gpg passphrase during the build process, if not 
provided otherwise.
 
-    mvn package deploy 
-Papache-release,derbyEmbedded-jenkins,beans,managers,owasp
+    mvn clean package 
-Papache-release,derbyEmbedded-jenkins,beans,managers,owasp
+    mvn deploy -DskipTests=true
+    
 
 - Release modules
 
 
-First test the release locally until the build is successfull, then clean 
again and run and perform release:
+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
+    mvn release:prepare -DdryRun=true -DautoVersionSubmodules=true 
-Ptest,managers,beans, apache-release
 
-    mvn release:clean -DautoVersionSubmodules=true 
+    mvn release:clean ..
     
-##### Important information: 
+##### 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 in the new version yet. 
-    To fix this, you might have to run rm torque-test/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".
-    - requires activated profile test to also apply the release prepare step 
to module torque-test, which is by default not in modules list.
+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
+in the new version yet. 
+To fix this, you might have to run **rm torque-test/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
+    mvn release:prepare -DautoVersionSubmodules=true 
-Ptest,managers,beans,apache-release
     
-    mvn release:perform  -Pmanagers,beans
+    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.
+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/torque-test/pom.xml
URL: 
http://svn.apache.org/viewvc/db/torque/trunk/torque-test/pom.xml?rev=1896217&r1=1896216&r2=1896217&view=diff
==============================================================================
--- db/torque/trunk/torque-test/pom.xml (original)
+++ db/torque/trunk/torque-test/pom.xml Tue Dec 21 09:03:44 2021
@@ -1600,7 +1600,7 @@
             </properties>
             <dependencies>
                 <dependency>
-                    <artifactId>derby</artifactId>
+                    <artifactId>derbyclient</artifactId>
                     <groupId>org.apache.derby</groupId>
                     <version>${torque.test.derby.version}</version>
                     <scope>test</scope>
@@ -1612,8 +1612,8 @@
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>sql-maven-plugin</artifactId>
                         <dependencies>
-                            <dependency>
-                                <artifactId>derby</artifactId>
+                             <dependency>
+                                <artifactId>derbyclient</artifactId>
                                 <groupId>org.apache.derby</groupId>
                                 <version>${torque.test.derby.version}</version>
                             </dependency>
@@ -1623,7 +1623,7 @@
                         <artifactId>maven-antrun-plugin</artifactId>
                         <dependencies>
                             <dependency>
-                                <artifactId>derby</artifactId>
+                                <artifactId>derbyclient</artifactId>
                                 <groupId>org.apache.derby</groupId>
                                 <version>${torque.test.derby.version}</version>
                             </dependency>



---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org

Reply via email to