diff --git a/build.gradle b/build.gradle index f3b6b54..3f6d66f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id "com.github.hierynomus.license" version "0.14.0" + id "com.github.hierynomus.license" version "0.16.1" id 'nebula.release' version '13.0.0' } @@ -8,7 +8,7 @@ plugins { apply plugin: 'java' apply plugin: 'idea' apply plugin: 'eclipse' -apply plugin: 'maven' +// apply plugin: 'maven' repositories { mavenLocal() @@ -44,16 +44,16 @@ task integrationTest(type: Test, dependsOn: ['build']) { dependencies { // Place rest-assured before JUnit dependency to make sure correct Hamcrest is used - testCompile 'io.rest-assured:rest-assured:3.2.0' - testCompile 'junit:junit:4.11' - testCompile 'com.googlecode.json-simple:json-simple:1.1.1' - testCompile 'org.assertj:assertj-core:3.6.2' - testCompile "org.testcontainers:testcontainers:1.15.0" - testCompile 'org.slf4j:slf4j-simple:1.8.0-beta2' - testCompile 'org.skyscreamer:jsonassert:1.5.0' + testImplementation 'io.rest-assured:rest-assured:3.2.0' + testImplementation 'junit:junit:4.11' + testImplementation 'com.googlecode.json-simple:json-simple:1.1.1' + testImplementation 'org.assertj:assertj-core:3.6.2' + testImplementation "org.testcontainers:testcontainers:1.15.0" + testImplementation 'org.slf4j:slf4j-simple:1.8.0-beta2' + testImplementation 'org.skyscreamer:jsonassert:1.5.0' - compile 'com.google.guava:guava:23.0' - compile 'org.yaml:snakeyaml:1.24' + implementation 'com.google.guava:guava:23.0' + implementation 'org.yaml:snakeyaml:1.24' } diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..9ca3ecd --- /dev/null +++ b/gradle.properties @@ -0,0 +1,3 @@ +#Wed May 02 14:39:33 CEST 2018 +languageLevel=1.8 +xlPluginsPluginVersion=1.3.5 diff --git a/gradle/buildViaTravis.sh b/gradle/buildViaTravis.sh new file mode 100755 index 0000000..a30945e --- /dev/null +++ b/gradle/buildViaTravis.sh @@ -0,0 +1,34 @@ +#!/bin/bash +# This script will build the project. + +SWITCHES="--info --stacktrace" + +GRADLE_VERSION=$(./gradlew -version | grep Gradle | cut -d ' ' -f 2) + +if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then + echo -e "Build Pull Request #$TRAVIS_PULL_REQUEST => Branch [$TRAVIS_BRANCH]" + ./gradlew clean build $SWITCHES +elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" == "" ]; then + echo -e 'Build Branch with Snapshot => Branch ['$TRAVIS_BRANCH']' + ./gradlew -Prelease.travisci=true clean snapshot $SWITCHES +elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ]; then + echo -e 'Build Branch for Release => Branch ['$TRAVIS_BRANCH'] Tag ['$TRAVIS_TAG']' + case "$TRAVIS_TAG" in + *-rc\.*) + ./gradlew -Prelease.travisci=true -Prelease.useLastTag=true clean candidate $SWITCHES + ;; + *) + ./gradlew -Prelease.travisci=true -Prelease.useLastTag=true clean final $SWITCHES + ;; + esac +else + echo -e 'WARN: Should not be here => Branch ['$TRAVIS_BRANCH'] Tag ['$TRAVIS_TAG'] Pull Request ['$TRAVIS_PULL_REQUEST']' + ./gradlew clean build $SWITCHES +fi + +EXIT=$? + +rm -f "$HOME/.gradle/caches/modules-2/modules-2.lock" +rm -rf "$HOME/.gradle/caches/$GRADLE_VERSION/plugin-resolution" + +exit $EXIT \ No newline at end of file diff --git a/gradle/dependencies.conf b/gradle/dependencies.conf new file mode 100644 index 0000000..1ad41c2 --- /dev/null +++ b/gradle/dependencies.conf @@ -0,0 +1,8 @@ +dependencyManagement { + versions { + docBaseStyleVersion="3.0.3" + xlDeployVersion="9.0.0-alpha.78" + licenseDatabaseVersion="1.2.45" + xlPlatformVersion="2019.2.0-alpha.75" + } +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7a3265e..5c2d1cf 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 ffb5977..05679dc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip diff --git a/gradlew b/gradlew index cccdd3d..b0d6d0a 100755 --- a/gradlew +++ b/gradlew @@ -1,5 +1,21 @@ #!/usr/bin/env sh +# +# Copyright 2015 the original author or 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 +# +# 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. +# + ############################################################################## ## ## Gradle start up script for UN*X @@ -28,7 +44,7 @@ APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` # 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" diff --git a/gradlew.bat b/gradlew.bat index e95643d..15e1ee3 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@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 http://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 @@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @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 diff --git a/src/main/resources/synthetic.xml b/src/main/resources/synthetic.xml index 235107f..3a902f2 100644 --- a/src/main/resources/synthetic.xml +++ b/src/main/resources/synthetic.xml @@ -1,7 +1,7 @@