You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ma...@apache.org on 2021/01/06 13:46:07 UTC
[commons-daemon] branch master updated (ea81b2d -> eada675)
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/commons-daemon.git.
from ea81b2d JUnit v4.13.1
new a1db42a Remove file that appears to be unused
new ffc20de Correct a path
new eada675 Need to use Java 8 to build (JARs will still target Java 6)
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:
HOWTO-RELEASE.txt | 4 +-
src/native/unix/support/mkdist.sh | 104 --------------------------------------
2 files changed, 2 insertions(+), 106 deletions(-)
delete mode 100755 src/native/unix/support/mkdist.sh
[commons-daemon] 01/03: Remove file that appears to be unused
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/commons-daemon.git
commit a1db42a61a78772154d9a3d1861b5473d73a35f8
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jan 6 12:26:10 2021 +0000
Remove file that appears to be unused
---
src/native/unix/support/mkdist.sh | 104 --------------------------------------
1 file changed, 104 deletions(-)
diff --git a/src/native/unix/support/mkdist.sh b/src/native/unix/support/mkdist.sh
deleted file mode 100755
index 37c325b..0000000
--- a/src/native/unix/support/mkdist.sh
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/sh
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Create Apache Commons Daemon native package distribution on UNIX systems.
-# You should execute this script from the src/native/unix directory
-#
-# support/mkdist.sh <arch> [os]
-#
-# This will create something like commons-daemon-1.2.3-bin-os-arch.tar.gz
-# The version numbers are parsed from the native/version.h file.
-# If the os argument is not provided current os name will be used.
-#
-#
-gpgopts="-ba"
-arch=""
-for o
-do
- case "$o" in
- *=*) a=`echo "$o" | sed 's/^[-_a-zA-Z0-9]*=//'`
- ;;
- *) a=''
- ;;
- esac
- case "$o" in
- --passphrase=* )
- gpgopts="$gpgopts --passphrase $a"
- shift
- ;;
- --arch=* )
- arch="$a"
- shift
- ;;
- --os=* )
- osname="$a"
- shift
- ;;
- * )
- break
- ;;
- esac
-done
-
-
-if [ ".$arch" = . ];then
- arch=`uname -m 2>/dev/null | tr '[A-Z]' '[a-z]'` || arch="unknown"
- echo "No architecture provided. Using $arch"
-fi
-if [ ".$osname" = . ];then
- osname=`uname -s 2>/dev/null | tr '[A-Z]' '[a-z]'` || osname="unknown"
- echo "No OS name provided. Using $osname"
-fi
-topdir=.
-major_sed='/#define.*JSVC_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p'
-minor_sed='/#define.*JSVC_MINOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p'
-patch_sed='/#define.*JSVC_PATCH_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p'
-vmajor="`sed -n $major_sed $topdir/native/version.h`"
-vminor="`sed -n $minor_sed $topdir/native/version.h`"
-vpatch="`sed -n $patch_sed $topdir/native/version.h`"
-verdst="commons-daemon-$vmajor.$vminor.$vpatch-bin-$osname-$arch"
-extfiles="LICENSE.txt NOTICE.txt RELEASE-NOTES.txt"
-for i in $extfiles
-do
- cp ../../../$i .
-done
-# Try to locate a MD5 binary
-md5_bin="`which md5sum 2>/dev/null || type md5sum 2>&1`"
-if [ -x "$md5_bin" ]; then
- MD5SUM="$md5_bin --binary "
-else
- MD5SUM="echo 00000000000000000000000000000000 "
-fi
-# Try to locate a SHA1 binary
-sha1_bin="`which sha1sum 2>/dev/null || type sha1sum 2>&1`"
-if [ -x "$sha1_bin" ]; then
- SHA1SUM="$sha1_bin --binary "
-else
- SHA1SUM="echo 0000000000000000000000000000000000000000 "
-fi
-dstfile=$verdst.tar.gz
-echo "Creating $dstfile ..."
-tar cfz $dstfile jsvc $extfiles
-if [ ".$?" = .0 ]; then
- echo "Signing $dstfile"
- gpg $gpgopts $dstfile
- $MD5SUM $dstfile > $dstfile.md5
- $SHA1SUM $dstfile > $dstfile.sha1
-else
- rm $verdst.tar.gz >/dev/null 2>&1
-fi
-rm $extfiles
[commons-daemon] 02/03: Correct a path
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/commons-daemon.git
commit ffc20de42bd488435a6295b4bc5b832a89899417
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jan 6 12:26:45 2021 +0000
Correct a path
---
HOWTO-RELEASE.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/HOWTO-RELEASE.txt b/HOWTO-RELEASE.txt
index 376fa48..1d1c5b9 100644
--- a/HOWTO-RELEASE.txt
+++ b/HOWTO-RELEASE.txt
@@ -74,7 +74,7 @@ mvn clean
Create native build scripts
---------------------------
-cd /src/native/unix
+cd src/native/unix
sh support/buildconf.sh
[commons-daemon] 03/03: Need to use Java 8 to build (JARs will
still target Java 6)
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/commons-daemon.git
commit eada675200e15e973d74fff35bfde9d42325bb36
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jan 6 13:45:23 2021 +0000
Need to use Java 8 to build (JARs will still target Java 6)
---
HOWTO-RELEASE.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/HOWTO-RELEASE.txt b/HOWTO-RELEASE.txt
index 1d1c5b9..4b77870 100644
--- a/HOWTO-RELEASE.txt
+++ b/HOWTO-RELEASE.txt
@@ -23,7 +23,7 @@ Review open issues in Jira.
Review open PRs on GitHub.
Update to latest commons-parent and fix any issues.
-Use Java 7.
+Use Java 8.
If you haven't already, add your public PGP key to KEYS.