[tomcat-native] branch master updated: Update release script to use 10.0.x

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git


The following commit(s) were added to refs/heads/master by this push:
     new f0c206d  Update release script to use 10.0.x
f0c206d is described below

commit f0c206d4ccb8f32eaa07c92661ee0c3a6e683210
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Apr 24 18:39:55 2020 +0100

    Update release script to use 10.0.x
---
 jnirelease.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/jnirelease.sh b/jnirelease.sh
index 97413fb..e867c88 100755
--- a/jnirelease.sh
+++ b/jnirelease.sh
@@ -162,18 +162,18 @@ else
     git checkout ${JKJNIHASH}
 fi
 
-if [ ! -d .git/refs/remotes/9.0.x ]; then
-    git remote add -f 9.0.x ${TCJAVA_GITBASE}
+if [ ! -d .git/refs/remotes/10.0.x ]; then
+    git remote add -f 10.0.x ${TCJAVA_GITBASE}
 fi
-git remote update 9.0.x
-diffcount=`git diff HEAD remotes/9.0.x/master java/org/apache/tomcat/jni | wc -l`
+git remote update 10.0.x
+diffcount=`git diff HEAD remotes/10.0.x/master java/org/apache/tomcat/jni | wc -l`
 
 if [ $diffcount -ne 0 ]; then
     echo "WARNING: git subtree is not up to date with"
     echo "         $TCJAVA_GITBASE"
     echo "         Either correct now by running"
     echo "         'git rm -rf java/org/apache/tomcat/jni'"
-    echo "         'git read-tree --prefix=java/org/apache/tomcat/jni/ -u 9.0.x/master:java/org/apache/tomcat/jni'"
+    echo "         'git read-tree --prefix=java/org/apache/tomcat/jni/ -u 10.0.x/master:java/org/apache/tomcat/jni'"
     echo "         'git commit'"
     echo "         or run this script with -f (force)"
     if [ "X$JKJNIFORCE" = "X1" ]


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org