You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/02/19 14:23:29 UTC
[tomcat-connectors] branch master updated (83dc3e4 -> 637edee)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git.
from 83dc3e4 Update documentation reference to secret attribute of Tomcat AJP Connector, following up to its rename in recent versions of Tomcat.
new 40cbef4 Fix syntax error
new fd76777 Git repo name changed
new 637edee Git tags retained svn format (for now)
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
tools/jkrelease.sh | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat-connectors] 02/03: Git repo name changed
Posted by 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-connectors.git
commit fd76777a421c18608f069432563db4ea71b45a8b
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Feb 19 11:40:26 2020 +0000
Git repo name changed
---
tools/jkrelease.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/jkrelease.sh b/tools/jkrelease.sh
index 95a11dd..eca8196 100755
--- a/tools/jkrelease.sh
+++ b/tools/jkrelease.sh
@@ -27,7 +27,7 @@
# And any one of: w3m, elinks, links (links2)
SVN_REPOS="http://svn.apache.org/repos/asf/tomcat/jk"
-GIT_REPOS="https://gitbox.apache.org/repos/asf/tomcat-jk.git"
+GIT_REPOS="https://gitbox.apache.org/repos/asf/tomcat-connectors.git"
JK_CVST="tomcat-connectors"
JK_OWNER="root"
JK_GROUP="bin"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat-connectors] 01/03: Fix syntax error
Posted by 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-connectors.git
commit 40cbef45a39ddafbb6b674df6fd98cf3e1d9e402
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Feb 19 11:32:29 2020 +0000
Fix syntax error
---
tools/jkrelease.sh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/tools/jkrelease.sh b/tools/jkrelease.sh
index 787fdbb..95a11dd 100755
--- a/tools/jkrelease.sh
+++ b/tools/jkrelease.sh
@@ -92,14 +92,14 @@ do
o) JK_OWNER=$OPTARG;;
g) JK_GROUP=$OPTARG;;
b) branch=$OPTARG
- conflict=$(($conflict+1));;
- rev_allowed=1
+ conflict=$(($conflict+1))
+ rev_allowed=1;;
T) trunk=trunk
- conflict=$(($conflict+1));;
- rev_allowed=1
+ conflict=$(($conflict+1))
+ rev_allowed=1;;
d) local_dir=$OPTARG
- conflict=$(($conflict+1));;
- rev_allowed=1
+ conflict=$(($conflict+1))
+ rev_allowed=1;;
f) force='y';;
h) txtgen='y';;
\:) usage
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat-connectors] 03/03: Git tags retained svn format (for now)
Posted by 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-connectors.git
commit 637edee00ca30b1d927f41d40748809c61ccb70e
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Feb 19 11:59:42 2020 +0000
Git tags retained svn format (for now)
---
tools/jkrelease.sh | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/tools/jkrelease.sh b/tools/jkrelease.sh
index eca8196..fabd5a1 100755
--- a/tools/jkrelease.sh
+++ b/tools/jkrelease.sh
@@ -254,14 +254,17 @@ then
JK_DIST=${JK_CVST}-${version}-dev${JK_SUFFIX}-src
fi
else
+ JK_TAG=`echo $version | sed -e 's#^#JK_#' -e 's#\.#_#g'`
if [ $USE_GIT -eq 1 ]
then
+ echo Tag: [$tag]
+ echo JK_TAG: [$JK_TAG]
if [ -n "$tag" ]
then
if [ -z "$force" ]
then
- echo $tag | grep "^$version" > /dev/null 2>&1
- if [ "X$tag" != "X$version" ]
+ echo $tag | grep "^$JK_TAG" > /dev/null 2>&1
+ if [ "X$tag" != "X$JK_TAG" ]
then
echo "Tag '$tag' doesn't belong to version '$version'."
echo "Force by using '-f' if you are sure."
@@ -276,17 +279,16 @@ else
fi
JK_SUFFIX=-tag-${tag}-${JK_REV}
else
- JK_REV=`git ls-remote $REPOS refs/tags/$version | awk '{print $1}'`
+ JK_REV=`git ls-remote $REPOS refs/tags/$JK_TAG | awk '{print $1}'`
if [ -z "$JK_REV" ]
then
- echo "No git hash found via 'git ls-remote $REPOS refs/tags/$version'"
+ echo "No git hash found via 'git ls-remote $REPOS refs/tags/$JK_TAG'"
exit 3
fi
JK_SUFFIX=''
fi
JK_DIST=${JK_CVST}-${version}${JK_SUFFIX}-src
else
- JK_TAG=`echo $version | sed -e 's#^#JK_#' -e 's#\.#_#g'`
if [ -n "$tag" ]
then
if [ -z "$force" ]
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org