You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by rh...@apache.org on 2022/06/07 18:02:47 UTC
svn commit: r1901733 - in /db/derby/code/branches/10.16: ./ maven2/README.txt maven2/SetDerbyVersion.java
Author: rhillegas
Date: Tue Jun 7 18:02:47 2022
New Revision: 1901733
URL: http://svn.apache.org/viewvc?rev=1901733&view=rev
Log:
DERBY-7136: Merge 1901732 from trunk to 10.16 branch.
Modified:
db/derby/code/branches/10.16/ (props changed)
db/derby/code/branches/10.16/maven2/README.txt
db/derby/code/branches/10.16/maven2/SetDerbyVersion.java
Propchange: db/derby/code/branches/10.16/
------------------------------------------------------------------------------
Merged /db/derby/code/trunk:r1901732
Modified: db/derby/code/branches/10.16/maven2/README.txt
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.16/maven2/README.txt?rev=1901733&r1=1901732&r2=1901733&view=diff
==============================================================================
--- db/derby/code/branches/10.16/maven2/README.txt (original)
+++ db/derby/code/branches/10.16/maven2/README.txt Tue Jun 7 18:02:47 2022
@@ -47,7 +47,7 @@ Description of the required steps:
o The Derby release version.
The version must be specified in all POMs. Compile and execute the
Java program SetDerbyVersion, found in the 'maven2' directory, i.e.:
- javac SetDerbyVersion && java -cp .:../jars/insane/derbyshared.jar:../jars/insane/derby.jar SetDerbyVersion
+ javac SetDerbyVersion.java && java -cp .:../jars/insane/derbyshared.jar:../jars/insane/derby.jar SetDerbyVersion
Alternatively, use search and replace (i.e. Perl or sed) - make sure
you don't replace version tags that aren't supposed to be modified.
Modified: db/derby/code/branches/10.16/maven2/SetDerbyVersion.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.16/maven2/SetDerbyVersion.java?rev=1901733&r1=1901732&r2=1901733&view=diff
==============================================================================
--- db/derby/code/branches/10.16/maven2/SetDerbyVersion.java (original)
+++ db/derby/code/branches/10.16/maven2/SetDerbyVersion.java Tue Jun 7 18:02:47 2022
@@ -287,8 +287,20 @@ public class SetDerbyVersion {
String parent = pom.getParent();
if (parent.contains("derbyLocale")) {
return (replaceCount - 2);
- // derbynet also requries two replacements (derby.jar dependency)
+ // derbyoptionaltools depends on derby.jar, derbyshared.jar, derbytools.jar
+ } else if (parent.contains("optionaltools")) {
+ return (replaceCount - 4);
+ // derbytools depends on derbyshared.jar
+ } else if (parent.contains("tools")) {
+ return (replaceCount - 2);
+ // derbynet depends on derby.jar, derbyshared.jar, and derbytools.jar
} else if (parent.contains("net")) {
+ return (replaceCount - 4);
+ // derby depends on derbyshared.jar
+ } else if (parent.contains("engine")) {
+ return (replaceCount - 2);
+ // derbyclient depends on derbyshared.jar
+ } else if (parent.contains("client")) {
return (replaceCount - 2);
} else {
return (replaceCount - 1);