diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
new file mode 100644
index 00000000..d244594a
--- /dev/null
+++ b/.github/workflows/ci.yaml
@@ -0,0 +1,52 @@
+name: CI
+
+on:
+ push:
+ branches:
+ - "main"
+ pull_request:
+ workflow_dispatch:
+concurrency:
+ group:
+ ${{ github.repository }}-${{ github.workflow }}-${{ github.event.number || github.head_ref || github.run_id || github.sha }}
+ cancel-in-progress: true
+permissions:
+ contents: write
+
+jobs:
+ build:
+ name: Build on ${{ matrix.os }} with Java ${{ matrix.java }}
+ strategy:
+ fail-fast: false
+ matrix:
+ java: [ 8, 11 ]
+ os: [ ubuntu-22.04, macos-13 ]
+
+ runs-on: ${{ matrix.os }}
+ steps:
+ - uses: actions/checkout@v4
+ - name: Set up JDK ${{ matrix.java }}
+ uses: actions/setup-java@v4
+ with:
+ java-version: ${{ matrix.java }}
+ distribution: 'temurin'
+ - name: Setup Gradle
+ uses: gradle/actions/setup-gradle@v3
+ with:
+ add-job-summary-as-pr-comment: on-failure
+ dependency-graph: generate-and-submit
+ build-scan-publish: true
+ build-scan-terms-of-service-url: "https://gradle.com/terms-of-service"
+ build-scan-terms-of-service-agree: "yes"
+ - name: Grant execute permission for gradlew
+ run: chmod +x gradlew
+ - name: Run build with Gradle wrapper
+ run: ./gradlew build --stacktrace --warning-mode all
+ - name: Upload build reports
+ uses: actions/upload-artifact@v4
+ if: always()
+ with:
+ name: build-reports-${{ matrix.os }}-${{ matrix.java }}
+ path: build/reports/
+ - name: Run checks
+ run: ./gradlew check test integrationTest jacocoTestReport --stacktrace --warning-mode all
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34bb254f..eaaf382f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
## V 2.x.x (NEXT)
+* Enh: Upgrade tooling and migrate to GitHub Actions.
+
## V 2.3.0 Bugfix Release
This releases fixes a security issue (#50) where encrypted, but not signed archives could be modified.
diff --git a/README.md b/README.md
index 96e9454e..08bd0863 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
**Looking for contributors**: *_It's boring to work alone_ - If you are interested in contributing to an open source project please open an issue to discuss your ideas or create a PR*
-[](https://travis-ci.org/neuhalje/bouncy-gpg)
+[](https://github.com/neuhalje/bouncy-gpg/actions/workflows/ci.yaml)
[](https://codecov.io/gh/neuhalje/bouncy-gpg)
[](https://www.codacy.com/app/neuhalje/bouncy-gpg?utm_source=github.com&utm_medium=referral&utm_content=neuhalje/bouncy-gpg&utm_campaign=Badge_Grade)
[](https://www.apache.org/licenses/LICENSE-2.0.html)
diff --git a/bintray.gradle b/bintray.gradle
index 8f3baff3..219d3cf0 100644
--- a/bintray.gradle
+++ b/bintray.gradle
@@ -22,13 +22,13 @@ def pomConfig = {
}
}
-task javadocJar(type: Jar) {
- classifier = 'javadoc'
+tasks.register('javadocJar', Jar) {
+ getArchiveClassifier().set("javadoc")
from javadoc
}
-task sourcesJar(type: Jar) {
- classifier = 'sources'
+tasks.register('sourcesJar', Jar) {
+ getArchiveClassifier().set("sources")
from sourceSets.main.allSource
}
diff --git a/build.gradle b/build.gradle
index 6ad763b6..a05173e7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,28 +1,26 @@
buildscript {
repositories {
+ mavenCentral()
jcenter()
}
- dependencies {
- classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:4.3.1'
- }
}
plugins {
- id 'java'
+ id 'java-library'
id 'jacoco'
id 'checkstyle'
id 'pmd'
// required for: website.gradle
- id 'org.ajoberstar.git-publish' version '0.3.0'
+ id 'org.ajoberstar.git-publish'
// deploy to maven central
- id 'maven'
id 'maven-publish'
id 'signing'
- id "com.jfrog.bintray" version "1.8.4"
- id "com.github.ben-manes.versions" version "0.27.0"
+ id "com.jfrog.bintray"
+ id "com.github.ben-manes.versions"
+ id "biz.aQute.bnd.builder"
}
javadoc {
@@ -31,30 +29,30 @@ javadoc {
}
checkstyle {
- toolVersion = "8.1"
+ toolVersion = "8.24"
showViolations = false
sourceSets = [project.sourceSets.main]
// maxWarnings = 0
}
-tasks.withType(Checkstyle) {
+tasks.withType(Checkstyle).configureEach {
reports {
- xml.enabled true
+ xml.setRequired(true)
// html.destination rootProject.file("build/reports/checkstyle.html")
// html.stylesheet resources.text.fromFile('config/xsl/checkstyle-custom.xsl')
}
}
jacoco {
- toolVersion = "0.8.5"
- reportsDir = file("${buildDir}/jacocoHtml")
+ toolVersion = "0.8.11"
+ getReportsDirectory().set(file("${buildDir}/jacocoHtml"))
}
jacocoTestReport {
reports {
- xml.enabled true
- csv.enabled false
- html.enabled true
+ xml.setRequired(true)
+ csv.setRequired(true)
+ html.setRequired(true)
html.destination file("${buildDir}/jacocoHtml")
}
}
@@ -90,14 +88,14 @@ group = 'name.neuhalfen.projects.crypto.bouncycastle.openpgp'
version = '2.3.0'
repositories {
+ mavenCentral()
jcenter()
}
sourceSets {
integrationTest {
compileClasspath += sourceSets.main.output \
- + sourceSets.test.output \
- + configurations.testRuntime
+ + sourceSets.test.output
runtimeClasspath += output + compileClasspath
@@ -107,11 +105,17 @@ sourceSets {
}
configurations {
- integrationTestCompile.extendsFrom testCompile
- integrationTestRuntime.extendsFrom testRuntime
+ integrationTestImplementation.extendsFrom testImplementation
+ integrationTestRuntimeOnly.extendsFrom testRuntimeOnly
+ checkstyle {
+ // See https://github.com/gradle/gradle/issues/27035
+ resolutionStrategy.capabilitiesResolution.withCapability("com.google.collections:google-collections") {
+ select("com.google.guava:guava:0")
+ }
+ }
}
-task integrationTest(type: Test) {
+tasks.register('integrationTest', Test) {
description = 'Runs the integration tests.'
group = LifecycleBasePlugin.VERIFICATION_GROUP
testClassesDirs = sourceSets.integrationTest.output.classesDirs
@@ -123,20 +127,19 @@ check.dependsOn integrationTest
dependencies {
- compile 'org.bouncycastle:bcprov-jdk15on:1.67'
- compile 'org.bouncycastle:bcpg-jdk15on:1.67'
+ implementation 'org.bouncycastle:bcprov-jdk15on:1.67'
+ implementation 'org.bouncycastle:bcpg-jdk15on:1.67'
- compile 'org.slf4j:slf4j-api:1.7.30'
+ implementation 'org.slf4j:slf4j-api:1.7.30'
// @Nullable and friends are not needed at runtime
- compile 'com.google.code.findbugs:jsr305:3.0.2'
-
- testCompile 'junit:junit:4.13'
- testCompile 'org.hamcrest:hamcrest-all:1.3'
- testCompile 'org.mockito:mockito-core:3.2.4'
- testCompile 'org.concordion:concordion-api-documentation-extension:0.0.4'
- testCompile 'ch.qos.logback:logback-classic:1.2.3'
+ implementation 'com.google.code.findbugs:jsr305:3.0.2'
+ testImplementation 'junit:junit:4.13'
+ testImplementation 'org.hamcrest:hamcrest-all:1.3'
+ testImplementation 'org.mockito:mockito-core:3.2.4'
+ testImplementation 'org.concordion:concordion-api-documentation-extension:0.0.4'
+ testImplementation 'ch.qos.logback:logback-classic:1.2.3'
}
@@ -164,8 +167,5 @@ if (hasProperty('bintray_Username')) {
apply from: 'website.gradle'
wrapper {
- gradleVersion = '6.5'
+ gradleVersion = '7.6.2'
}
-
-// Generate OSGI bundle metadata
-apply plugin: 'biz.aQute.bnd.builder'
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index a983c44e..854fe455 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -27,6 +27,10 @@
+
+
+
+
@@ -39,10 +43,6 @@
-
-
-
-
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index d9b7505b..afba1092 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3ad75d54..4e86b927 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
+networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index cccdd3d5..65dcd68d 100755
--- a/gradlew
+++ b/gradlew
@@ -1,78 +1,129 @@
-#!/usr/bin/env sh
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed 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
+#
+# https://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.
+#
##############################################################################
-##
-## Gradle start up script for UN*X
-##
+#
+# Gradle start up script for POSIX generated by Gradle.
+#
+# Important for running:
+#
+# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+# noncompliant, but you have some other compliant shell such as ksh or
+# bash, then to run this script, type that shell name before the whole
+# command line, like:
+#
+# ksh Gradle
+#
+# Busybox and similar reduced shells will NOT work, because this script
+# requires all of these POSIX shell features:
+# * functions;
+# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+# * compound commands having a testable exit status, especially «case»;
+# * various built-in commands including «command», «set», and «ulimit».
+#
+# Important for patching:
+#
+# (2) This script targets any POSIX shell, so it avoids extensions provided
+# by Bash, Ksh, etc; in particular arrays are avoided.
+#
+# The "traditional" practice of packing multiple parameters into a
+# space-separated string is a well documented source of bugs and security
+# problems, so this is (mostly) avoided, by progressively accumulating
+# options in "$@", and eventually passing that to Java.
+#
+# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+# see the in-line comments for details.
+#
+# There are tweaks for specific operating systems such as AIX, CygWin,
+# Darwin, MinGW, and NonStop.
+#
+# (3) This script is generated from the Groovy template
+# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# within the Gradle project.
+#
+# You can find Gradle at https://github.com/gradle/gradle/.
+#
##############################################################################
# Attempt to set APP_HOME
+
# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+ APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
+ [ -h "$app_path" ]
+do
+ ls=$( ls -ld "$app_path" )
+ link=${ls#*' -> '}
+ case $link in #(
+ /*) app_path=$link ;; #(
+ *) app_path=$APP_HOME$link ;;
+ esac
done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
warn () {
echo "$*"
-}
+} >&2
die () {
echo
echo "$*"
echo
exit 1
-}
+} >&2
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
-case "`uname`" in
- CYGWIN* )
- cygwin=true
- ;;
- Darwin* )
- darwin=true
- ;;
- MINGW* )
- msys=true
- ;;
- NONSTOP* )
- nonstop=true
- ;;
+case "$( uname )" in #(
+ CYGWIN* ) cygwin=true ;; #(
+ Darwin* ) darwin=true ;; #(
+ MSYS* | MINGW* ) msys=true ;; #(
+ NONSTOP* ) nonstop=true ;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
- JAVACMD="$JAVA_HOME/jre/sh/java"
+ JAVACMD=$JAVA_HOME/jre/sh/java
else
- JAVACMD="$JAVA_HOME/bin/java"
+ JAVACMD=$JAVA_HOME/bin/java
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -81,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
- JAVACMD="java"
+ JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
@@ -89,84 +140,105 @@ location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
- MAX_FD_LIMIT=`ulimit -H -n`
- if [ $? -eq 0 ] ; then
- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
- MAX_FD="$MAX_FD_LIMIT"
- fi
- ulimit -n $MAX_FD
- if [ $? -ne 0 ] ; then
- warn "Could not set maximum file descriptor limit: $MAX_FD"
- fi
- else
- warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
- fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+ case $MAX_FD in #(
+ max*)
+ # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC3045
+ MAX_FD=$( ulimit -H -n ) ||
+ warn "Could not query maximum file descriptor limit"
+ esac
+ case $MAX_FD in #(
+ '' | soft) :;; #(
+ *)
+ # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC3045
+ ulimit -n "$MAX_FD" ||
+ warn "Could not set maximum file descriptor limit to $MAX_FD"
+ esac
fi
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
- GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+# * args from the command line
+# * the main class name
+# * -classpath
+# * -D...appname settings
+# * --module-path (only if needed)
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+ APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+ CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+ JAVACMD=$( cygpath --unix "$JAVACMD" )
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
- APP_HOME=`cygpath --path --mixed "$APP_HOME"`
- CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
- JAVACMD=`cygpath --unix "$JAVACMD"`
-
- # We build the pattern for arguments to be converted via cygpath
- ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
- SEP=""
- for dir in $ROOTDIRSRAW ; do
- ROOTDIRS="$ROOTDIRS$SEP$dir"
- SEP="|"
- done
- OURCYGPATTERN="(^($ROOTDIRS))"
- # Add a user-defined pattern to the cygpath arguments
- if [ "$GRADLE_CYGPATTERN" != "" ] ; then
- OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
- fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
- i=0
- for arg in "$@" ; do
- CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
- CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
-
- if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
- eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
- else
- eval `echo args$i`="\"$arg\""
+ for arg do
+ if
+ case $arg in #(
+ -*) false ;; # don't mess with options #(
+ /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
+ [ -e "$t" ] ;; #(
+ *) false ;;
+ esac
+ then
+ arg=$( cygpath --path --ignore --mixed "$arg" )
fi
- i=$((i+1))
+ # Roll the args list around exactly as many times as the number of
+ # args, so each arg winds up back in the position where it started, but
+ # possibly modified.
+ #
+ # NB: a `for` loop captures its iteration list before it begins, so
+ # changing the positional parameters here affects neither the number of
+ # iterations, nor the values presented in `arg`.
+ shift # remove old arg
+ set -- "$@" "$arg" # push replacement arg
done
- case $i in
- (0) set -- ;;
- (1) set -- "$args0" ;;
- (2) set -- "$args0" "$args1" ;;
- (3) set -- "$args0" "$args1" "$args2" ;;
- (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
- (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
- (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
- (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
- (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
- (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
- esac
fi
-# Escape application args
-save () {
- for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
- echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
- cd "$(dirname "$0")"
+# Collect all arguments for the java command;
+# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+# shell script including quotes and variable substitutions, so put them in
+# double quotes to make sure that they get re-expanded; and
+# * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+ "-Dorg.gradle.appname=$APP_BASE_NAME" \
+ -classpath "$CLASSPATH" \
+ org.gradle.wrapper.GradleWrapperMain \
+ "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+ die "xargs is not available"
fi
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+# set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+ printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+ xargs -n1 |
+ sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+ tr '\n' ' '
+ )" '"$@"'
+
exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index e95643d6..6689b85b 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,4 +1,20 @@
-@if "%DEBUG%" == "" @echo off
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@@ -9,19 +25,23 @@
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if %ERRORLEVEL% equ 0 goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +55,7 @@ goto fail
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,38 +65,26 @@ echo location of your Java installation.
goto fail
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end
@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
-if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
:mainEnd
if "%OS%"=="Windows_NT" endlocal
diff --git a/settings.gradle b/settings.gradle
index b9956211..363ecab8 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,10 @@
+pluginManagement {
+ plugins {
+ id "biz.aQute.bnd.builder" version "6.4.0"
+ id "org.ajoberstar.git-publish" version '3.0.1'
+ id "com.github.ben-manes.versions" version "0.42.0"
+ id "com.jfrog.bintray" version "1.8.4"
+ }
+}
+
rootProject.name = 'bouncy-gpg'
diff --git a/website.gradle b/website.gradle
index 1642b6b7..0c73310a 100644
--- a/website.gradle
+++ b/website.gradle
@@ -4,7 +4,8 @@ import name.neuhalfen.concordion.transform.ConcordionHtmlToMarkdownTransformer
// https://github.com/ajoberstar/gradle-git-publish
-task prepareSpecsForCMS(type: Copy, dependsOn: ['prepareCmsBuildRoot', 'test']) {
+tasks.register('prepareSpecsForCMS', Copy) {
+ setDependsOn(['prepareCmsBuildRoot', 'test'])
description 'Transform the build output of concordion to include it in the CMS'
from(fileTree("${specifications_prepareForCms_source}")) {
@@ -16,24 +17,26 @@ task prepareSpecsForCMS(type: Copy, dependsOn: ['prepareCmsBuildRoot', 'test'])
filter(ConcordionHtmlToMarkdownTransformer)
}
-task removeOldCMSBuild(type: Delete) {
+tasks.register('removeOldCMSBuild', Delete) {
delete "${specifications_cms_target}"
delete "${cms_BuildRoot}"
}
-task prepareCmsBuildRoot(type: Copy, dependsOn: ['removeOldCMSBuild']) {
+tasks.register('prepareCmsBuildRoot', Copy) {
+ dependsOn['removeOldCMSBuild']
from("${specifications_cms_cmsdRoot}")
into "${cms_BuildRoot}"
}
-
-task generateWebsite(type: Exec, dependsOn: ['prepareSpecsForCMS']) {
+tasks.register('generateWebsite', Exec) {
+ dependsOn['prepareSpecsForCMS']
commandLine = [hugo, '--cleanDestinationDir', '--destination', "${specifications_cms_target}", '--enableGitInfo']
workingDir = file("${cms_BuildRoot}")
}
-task previewWebsite(type: Exec, dependsOn: ['generateWebsite']) {
+tasks.register('previewWebsite', Exec) {
+ dependsOn['generateWebsite']
commandLine = [hugo, 'server', '--debug', '--watch', '--enableGitInfo']
workingDir = file("${cms_BuildRoot}")
}
@@ -62,4 +65,4 @@ gitPublish {
commitMessage = 'Publishing github pages' // defaults to 'Generated by gradle-git-publish'
}
-task publishWebsite(dependsOn: ['generateWebsite', 'gitPublishPush'])
+tasks.register('publishWebsite') { setDependsOn(['generateWebsite', 'gitPublishPush']) }