From 62b5b0ad23905d09ad3e2e338d81d54766d65f59 Mon Sep 17 00:00:00 2001 From: David Blacka Date: Sun, 15 Jul 2018 17:08:29 +0000 Subject: [PATCH] Updates for gradle; changelog --- .gitignore | 1 + ChangeLog | 11 +++++++++++ README.md | 2 +- VERSION | 2 +- bin/jdnssec-keygen | 2 +- bin/jdnssec-keyinfo | 2 +- bin/jdnssec-signkeyset | 2 +- bin/jdnssec-signrrset | 2 +- bin/jdnssec-signzone | 2 +- bin/jdnssec-verifyzone | 2 +- bin/jdnssec-zoneformat | 2 +- build.gradle | 8 ++++---- build.xml | 3 +-- 13 files changed, 26 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index bda8615..6dbf5a3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ build .classpath .project +.gradle jdnssec-tools*.tar.gz docs diff --git a/ChangeLog b/ChangeLog index ce3bebf..eff8f7e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2018-07-15 Pallavi Aras + + * Add Gradle build support. Adjust ant to use same paths. + +2018-07-15 David Blacka , Kees Monshouwer * Fix leading zero(s) padding in ECDSA sig conversion diff --git a/README.md b/README.md index fc0787f..64d11c2 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ Building from source: 4. You can build the distribution tarballs with 'ant dist'. You can run the tools directly from the build area (without building the jdnssec-tools.jar file) by using the ./bin/_jdnssec_* wrappers. 5. Build the project using gradle -./gradlew clean +./gradlew clean ./gradlew assemble -i jar file gets generated in build/libs diff --git a/VERSION b/VERSION index b1c9c68..f8715f3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -version=0.13 +version=0.14 diff --git a/bin/jdnssec-keygen b/bin/jdnssec-keygen index 610fefd..4a86ea5 100755 --- a/bin/jdnssec-keygen +++ b/bin/jdnssec-keygen @@ -9,7 +9,7 @@ if [ $ulimit_max != "unlimited" ]; then fi # set the classpath -for i in $basedir/lib/*.jar $basedir/lib/*.zip $basedir/build/lib/*.jar; do +for i in $basedir/lib/*.jar $basedir/lib/*.zip $basedir/build/libs/*.jar; do CLASSPATH="$CLASSPATH":"$i" done export CLASSPATH diff --git a/bin/jdnssec-keyinfo b/bin/jdnssec-keyinfo index bbaca6f..15312f7 100755 --- a/bin/jdnssec-keyinfo +++ b/bin/jdnssec-keyinfo @@ -9,7 +9,7 @@ if [ $ulimit_max != "unlimited" ]; then fi # set the classpath -for i in $basedir/lib/*.jar $basedir/lib/*.zip $basedir/build/lib/*.jar; do +for i in $basedir/lib/*.jar $basedir/lib/*.zip $basedir/build/libs/*.jar; do CLASSPATH="$CLASSPATH":"$i" done export CLASSPATH diff --git a/bin/jdnssec-signkeyset b/bin/jdnssec-signkeyset index 4d00ca3..5098909 100755 --- a/bin/jdnssec-signkeyset +++ b/bin/jdnssec-signkeyset @@ -4,7 +4,7 @@ thisdir=`dirname $0` basedir=`cd $thisdir/..; pwd` # set the classpath -for i in $basedir/lib/*.jar $basedir/lib/*.zip $basedir/build/lib/*.jar; do +for i in $basedir/lib/*.jar $basedir/lib/*.zip $basedir/build/libs/*.jar; do CLASSPATH="$CLASSPATH":"$i" done export CLASSPATH diff --git a/bin/jdnssec-signrrset b/bin/jdnssec-signrrset index cfc3dfe..e7a7bbe 100755 --- a/bin/jdnssec-signrrset +++ b/bin/jdnssec-signrrset @@ -4,7 +4,7 @@ thisdir=`dirname $0` basedir=`cd $thisdir/..; pwd` # set the classpath -for i in $basedir/lib/*.jar $basedir/lib/*.zip $basedir/build/lib/*.jar; do +for i in $basedir/lib/*.jar $basedir/lib/*.zip $basedir/build/libs/*.jar; do CLASSPATH="$CLASSPATH":"$i" done export CLASSPATH diff --git a/bin/jdnssec-signzone b/bin/jdnssec-signzone index 7ce8b60..e5eda3f 100755 --- a/bin/jdnssec-signzone +++ b/bin/jdnssec-signzone @@ -9,7 +9,7 @@ if [ $ulimit_max != "unlimited" ]; then fi # set the classpath -for i in $basedir/lib/*.jar $basedir/lib/*.zip $basedir/build/lib/*.jar; do +for i in $basedir/lib/*.jar $basedir/lib/*.zip $basedir/build/libs/*.jar; do CLASSPATH="$CLASSPATH":"$i" done export CLASSPATH diff --git a/bin/jdnssec-verifyzone b/bin/jdnssec-verifyzone index dca9aec..56b9247 100755 --- a/bin/jdnssec-verifyzone +++ b/bin/jdnssec-verifyzone @@ -9,7 +9,7 @@ if [ $ulimit_max != "unlimited" ]; then fi # set the classpath -for i in $basedir/lib/*.jar $basedir/lib/*.zip $basedir/build/lib/*.jar; do +for i in $basedir/lib/*.jar $basedir/lib/*.zip $basedir/build/libs/*.jar; do CLASSPATH="$CLASSPATH":"$i" done export CLASSPATH diff --git a/bin/jdnssec-zoneformat b/bin/jdnssec-zoneformat index 6e0a153..e16c009 100755 --- a/bin/jdnssec-zoneformat +++ b/bin/jdnssec-zoneformat @@ -9,7 +9,7 @@ if [ $ulimit_max != "unlimited" ]; then fi # set the classpath -for i in $basedir/lib/*.jar $basedir/lib/*.zip $basedir/build/lib/*.jar; do +for i in $basedir/lib/*.jar $basedir/lib/*.zip $basedir/build/libs/*.jar; do CLASSPATH="$CLASSPATH":"$i" done export CLASSPATH diff --git a/build.gradle b/build.gradle index 6dadf51..81ab849 100644 --- a/build.gradle +++ b/build.gradle @@ -10,16 +10,16 @@ apply plugin: 'idea' jar { baseName = 'jdnssec-tools' - version = '0.13' + version = '0.14' } repositories { mavenCentral() } -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +sourceCompatibility = 1.7 +targetCompatibility = 1.7 dependencies { - compile fileTree(dir: 'lib', include: '*.jar') + compile fileTree(dir: 'lib', include: '*.jar') } diff --git a/build.xml b/build.xml index 6f03664..3e38ac9 100644 --- a/build.xml +++ b/build.xml @@ -19,7 +19,7 @@ - + @@ -47,7 +47,6 @@ deprecation="true" includeantruntime="false" includes="com/verisignlabs/dnssec/" - debug="true" source="1.7" target="1.7" />