Skip to content

Commit

Permalink
Drop support for 2.10, 2.11 and 2.12
Browse files Browse the repository at this point in the history
As 2.10 is no longer supported, there is no need to build dCache with
Java 7.  Therefore support for choosing which Java version is also
removed.
  • Loading branch information
paulmillar committed Jul 5, 2017
1 parent 1d85419 commit 0a93fc2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 20 deletions.
17 changes: 2 additions & 15 deletions bin/tag-releases
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ fi
if [ $# -gt 0 ]; then
BRANCHES="$@"
else
BRANCHES="3.1 3.0 2.16 2.15 2.14 2.13 2.12 2.11 2.10"
BRANCHES="3.1 3.0 2.16 2.15 2.14 2.13"
fi

for branch in $BRANCHES; do
case "$branch" in
2.[0-9]*)
case "${branch#2.}" in
6|7|8|9|10|11|12|13|14|15|16)
13|14|15|16)
# Valid
;;
*)
Expand All @@ -61,18 +61,6 @@ for branch in $BRANCHES; do
esac
done

java_home_for_tag() {
case $1 in
2.10* | 2.9* | 2.8* | 2.7* | 2.6*)
echo $JDK7_HOME
;;

*)
echo $JDK8_HOME
;;
esac
}

branches_to_release() {
git fetch $git_remote_branch

Expand Down Expand Up @@ -133,7 +121,6 @@ for branch in $release_branches; do
git checkout -q $branch
git clean -df >/dev/null
next_tag=$(sed -n '/version/s/[^0-9]*\([0-9.]*\).*/\1/p' pom.xml |head -1)
export JAVA_HOME=$(java_home_for_tag ${next_tag})
echo
echo "==="
echo "=== Preparing for $next_tag"
Expand Down
5 changes: 0 additions & 5 deletions etc/paths
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,3 @@
# Locations of various tools

MULTIMARKDOWN=$HOME/git/peg-multimarkdown/multimarkdown

# Paths of various directories

JDK7_HOME=/usr/lib/jvm/java-7-openjdk-amd64
JDK8_HOME=/usr/lib/jvm/java-8-oracle

0 comments on commit 0a93fc2

Please sign in to comment.