Skip to content

Commit

Permalink
fix: gradle build (serenity-bdd#2813)
Browse files Browse the repository at this point in the history
  • Loading branch information
gallardo authored May 9, 2022
1 parent 6e5ff98 commit 5b79499
Showing 48 changed files with 400 additions and 570 deletions.
128 changes: 64 additions & 64 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -228,70 +228,70 @@ subprojects {
check.dependsOn -= integrationTests


dependencies {
compile "net.bytebuddy:byte-buddy:${byteBuddyVersion}"
compile "net.bytebuddy:byte-buddy-agent:${byteBuddyVersion}"
compile "com.google.guava:guava:${guavaVersion}"

compile("com.google.inject:guice:${guiceVersion}") {
exclude group: "org.ow2.asm", module: "asm"
exclude group: "asm", module: "asm"
exclude group: "com.google.guava", module: "guava"
exclude group: "org.sonatype.sisu.inject", module: "cglib"
}

compile("org.ow2.asm:asm:${asmVersion}")

compile "commons-codec:commons-codec:${commonsCodecVersion}"
compile "org.objenesis:objenesis:${objenesisVersion}"
compile "org.slf4j:slf4j-api:${slf4jVersion}"
compile "xml-apis:xml-apis:${xmlApisVersion}"
compile("io.cucumber:cucumber-core:${cucumberVersion}") {
exclude group: "org.apiguardian", module: 'apiguardian-api'
}
compile("io.cucumber:cucumber-java:${cucumberVersion}") {
exclude group: "org.apiguardian", module: 'apiguardian-api'
}


compile("commons-logging:commons-logging:${commonsLoggingVersion}")
testCompile "junit:junit:${junitVersion}"

compile "io.vavr:vavr:${vavrVersion}"

/* Required for Java 9 and higher */
compile "javax.xml.bind:jaxb-api:${jaxbApiVersion}"
compile "com.sun.xml.bind:jaxb-core:${jaxbCoreVersion}"
compile "com.sun.xml.bind:jaxb-impl:${jaxbImplVersion}"
compile "javax.activation:activation:${activationVersion}"

testCompile("ch.qos.logback:logback-classic:${logbackVersion}") {
exclude group: "org.slf4j", module: 'slf4j-api'
}
compile("org.mockito:mockito-core:${mockitoCoreVersion}") {
exclude group: "org.hamcrest", module: "hamcrest-core"
exclude group: "org.objenesis", module: "objenesis"
exclude group: "net.bytebuddy", module: "byte-buddy"
exclude group: "net.bytebuddy", module: "byte-buddy-agent"
}
testCompile "org.hamcrest:hamcrest-integration:${hamcrestVersion}"
testCompile "org.hamcrest:hamcrest-library:${hamcrestVersion}"
testCompile "org.hamcrest:hamcrest-core:${hamcrestVersion}"

testCompile("org.codehaus.groovy:groovy-all:${groovyVersion}") {
exclude group: "org.junit"
exclude group: "org.junit.jupiter"
exclude group: "com.google.inject"
exclude group: "org.junit.platform"
}
testCompile("org.spockframework:spock-core:${spockVersion}") {
exclude group: "org.codehaus.groovy"
exclude group: "org.junit.platform"

}
testCompile "org.jetbrains:annotations:19.0.0"
testCompile "org.assertj:assertj-core:${assertjVersion}"
}
// dependencies {
// compile "net.bytebuddy:byte-buddy:${byteBuddyVersion}"
// compile "net.bytebuddy:byte-buddy-agent:${byteBuddyVersion}"
// compile "com.google.guava:guava:${guavaVersion}"
//
// compile("com.google.inject:guice:${guiceVersion}") {
// exclude group: "org.ow2.asm", module: "asm"
// exclude group: "asm", module: "asm"
// exclude group: "com.google.guava", module: "guava"
// exclude group: "org.sonatype.sisu.inject", module: "cglib"
// }
//
// compile("org.ow2.asm:asm:${asmVersion}")
//
// compile "commons-codec:commons-codec:${commonsCodecVersion}"
// compile "org.objenesis:objenesis:${objenesisVersion}"
// compile "org.slf4j:slf4j-api:${slf4jVersion}"
// compile "xml-apis:xml-apis:${xmlApisVersion}"
// compile("io.cucumber:cucumber-core:${cucumberVersion}") {
// exclude group: "org.apiguardian", module: 'apiguardian-api'
// }
// compile("io.cucumber:cucumber-java:${cucumberVersion}") {
// exclude group: "org.apiguardian", module: 'apiguardian-api'
// }
//
//
// compile("commons-logging:commons-logging:${commonsLoggingVersion}")
// testCompile "junit:junit:${junitVersion}"
//
// compile "io.vavr:vavr:${vavrVersion}"
//
// /* Required for Java 9 and higher */
// compile "javax.xml.bind:jaxb-api:${jaxbApiVersion}"
// compile "com.sun.xml.bind:jaxb-core:${jaxbCoreVersion}"
// compile "com.sun.xml.bind:jaxb-impl:${jaxbImplVersion}"
// compile "javax.activation:activation:${activationVersion}"
//
// testCompile("ch.qos.logback:logback-classic:${logbackVersion}") {
// exclude group: "org.slf4j", module: 'slf4j-api'
// }
// compile("org.mockito:mockito-core:${mockitoCoreVersion}") {
// exclude group: "org.hamcrest", module: "hamcrest-core"
// exclude group: "org.objenesis", module: "objenesis"
// exclude group: "net.bytebuddy", module: "byte-buddy"
// exclude group: "net.bytebuddy", module: "byte-buddy-agent"
// }
// testCompile "org.hamcrest:hamcrest-integration:${hamcrestVersion}"
// testCompile "org.hamcrest:hamcrest-library:${hamcrestVersion}"
// testCompile "org.hamcrest:hamcrest-core:${hamcrestVersion}"
//
// testCompile("org.codehaus.groovy:groovy-all:${groovyVersion}") {
// exclude group: "org.junit"
// exclude group: "org.junit.jupiter"
// exclude group: "com.google.inject"
// exclude group: "org.junit.platform"
// }
// testCompile("org.spockframework:spock-core:${spockVersion}") {
// exclude group: "org.codehaus.groovy"
// exclude group: "org.junit.platform"
//
// }
// testCompile "org.jetbrains:annotations:19.0.0"
// testCompile "org.assertj:assertj-core:${assertjVersion}"
// }

// configurations.all {
// resolutionStrategy.eachDependency { DependencyResolveDetails details ->
79 changes: 41 additions & 38 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,42 +1,44 @@
org.gradle.parallel=false
# Dependency versions
seleniumVersion=3.141.59
groovyVersion=3.0.6
seleniumVersion=4.1.4
groovyVersion=4.0.1
gradleVersion=5.6.2
junitVersion=4.13
hamcrestVersion=1.3
springVersion=5.1.2.RELEASE
junitVersion=4.13.2
hamcrestVersion=2.2
springVersion=5.3.16
springBootVersion=2.1.0.RELEASE
guavaVersion=25.0-jre
guavaVersion=31.1-jre
okioVersion=1.14.1
restAssuredVersion=4.3.2
restAssuredVersion=5.0.1
mockitoCoreVersion=3.1.0
jbehaveVersion=4.7
commonsIoVersion=2.6
jbehaveVersion=4.8.3
commonsIoVersion=2.11.0
commonsCollectionsVersion=3.2.2
commonsLang3Version=3.8.1
commonsTextVersion=1.8
commonsCodecVersion=1.10
commonsNetVersion=3.8.0
commonsLang3Version=3.12.0
commonsLang2Version=2.6
commonsTextVersion=1.9
commonsCodecVersion=1.15
commonsCompressVersion=1.20
xstreamVersion=1.4.13
jodaTimeVersion=2.7
gsonVersion=2.8.6
typesafeConfigVersion=1.3.1
freemarkerVersion=2.3.29
wiremockCoreVersion=1.58
cucumberVersion=6.9.1
xstreamVersion=1.4.19
jodaTimeVersion=2.8.2
gsonVersion=2.9.0
typesafeConfigVersion=1.4.2
freemarkerVersion=2.3.31
wiremockVersion=1.58
cucumberVersion=7.2.3
commonsLoggingVersion=1.2
xmlApisVersion=1.4.01
cglibVersion=3.3.0
asmVersion=8.0.1
objenesisVersion=3.1
logbackVersion=1.2.3
mockitoVersion=3.1.0
mockitoVersion=3.3.3
openCsvVersion=2.0
beanUtilsVersion=1.8.3
jexcelapiVersion=2.6.12
httpclientVersion=4.5.5
httpCoreVersion=4.4.9
httpclientVersion=4.5.13
httpCoreVersion=4.4.14
fluentleniumVersion=0.10.2
jhlabfiltersVersion=2.0.235
asciidoctorVersion=2.5.1
@@ -45,44 +47,45 @@ javaxValidationVersion=1.1.0.Final
hibernateValidatorVersion=5.1.1.Final
elApiVersion=2.2.4
xalanVersion=2.7.2
awaitilityVersion=4.0.1
jsoupVersion=1.10.3
jimfsVersion=1.1
slf4jVersion=1.7.26
awaitilityVersion=4.2.0
jsoupVersion=1.14.3
jimfsVersion=1.2
slf4jVersion=1.7.30
vavrVersion=0.9.0
browsermobVersion=2.1.5
jettyVersion=9.4.8.v20171121
antVersion=1.10.8
antVersion=1.10.12
bouncycastleVersion=1.58
nettyVersion=4.0.33.Final
websocketVersion=1.1
javassistVersion=3.28.0-GA
jacksonVersion=2.13.2
# Webdriver libraries
phantomjsDriverVersion=1.4.4
appiumJavaClientVersion=7.3.0
appiumJavaClientVersion=8.0.0
operaDriverVersion=1.5
htmlunitVersion=2.45.0
htmlunitDriverVersion=2.45.0
ngwebdriver=1.1.5
webdrivermanagerVersion=4.2.2
ngwebdriver=1.1.6
webdrivermanagerVersion=5.1.0
# Photo libraries
shutterBugVersion=0.9.3
# Scheduled for updates
byteBuddyVersion=1.10.10
guiceVersion=5.0.1
byteBuddyVersion=1.12.8
guiceVersion=5.1.0
# Test-scope dependencies
spockVersion=2.0-M3-groovy-3.0
spockVersion=2.2-M1-groovy-4.0
spockExtensionsVersion=0.1.4
assertjVersion=3.12.2
assertjVersion=3.22.0
jsonassertVersion=1.5.0
junit5Version=5.6.2
junit5Version=5.8.2
junitPlatformLauncher=1.8.1
opentest4jVersion=1.2.0
# Bintray configuration
bintrayBaseUrl=https://api.bintray.com/maven
bintrayRepository=maven
bintrayPackage=serenity-core
projectDescription=Serenity Core
kotlin.incremental=true
thymeleafVersion=3.0.11.RELEASE
thymeleafVersion=3.1.0.M1
xchartVersion=3.5.2
jaxbApiVersion=2.3.1
jaxbCoreVersion=2.3.0.1
Binary file added gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
5 changes: 5 additions & 0 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
29 changes: 12 additions & 17 deletions gradlew
Original file line number Diff line number Diff line change
@@ -154,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
else
eval `echo args$i`="\"$arg\""
fi
i=$((i+1))
i=`expr $i + 1`
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" ;;
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

@@ -175,14 +175,9 @@ save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=$(save "$@")
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")"
fi

exec "$JAVACMD" "$@"
5 changes: 1 addition & 4 deletions serenity-ant-task/build.gradle
Original file line number Diff line number Diff line change
@@ -7,9 +7,6 @@ dependencies {
compile project(':serenity-core')
compile "org.apache.ant:ant:${antVersion}"

testCompile project(':serenity-test-utils')
testCompile ("org.apache.ant:ant-testutil:${antVersion}"){
exclude group: "junit"
}
testCompile ("org.apache.ant:ant-testutil:${antVersion}")
testCompile "org.assertj:assertj-core:${assertjVersion}"
}
2 changes: 1 addition & 1 deletion serenity-ant-task/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 2 additions & 2 deletions serenity-asciidoc/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
buildscript {
ext.kotlin_version = '1.4.10'
ext.kotlin_version = '1.6.0'
ext.serenity_cucumber_version = '1.9.12'
repositories {
mavenCentral()
@@ -10,7 +10,7 @@ buildscript {
}
}
plugins {
id "org.jetbrains.kotlin.jvm" version "1.4.10"
id "org.jetbrains.kotlin.jvm" version "1.6.0"
}
test {
useJUnitPlatform {
2 changes: 1 addition & 1 deletion serenity-asciidoc/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
28 changes: 13 additions & 15 deletions serenity-browsermob-plugin/build.gradle
Original file line number Diff line number Diff line change
@@ -4,23 +4,21 @@ ext {
}

dependencies {
compile project(':serenity-model')
compile project(':serenity-core')
compile project(':serenity-model')
compile("net.lightbody.bmp:browsermob-core:${browsermobVersion}") {
exclude group: 'org.seleniumhq.selenium', module:'selenium-java'
exclude group: 'org.seleniumhq.selenium', module:'selenium-server'
exclude group: 'org.seleniumhq.selenium', module:'selenium-remote-driver'
exclude group: 'org.seleniumhq.selenium', module:'selenium-api'
exclude group: 'org.apache.commons', module:'commons-lang3'
exclude group: 'commons-io', module:'commons-io'
exclude group: 'com.google.guava'
exclude group: 'com.fasterxml.jackson.core', module:'jackson-databind'
exclude module: "slf4j-api"
exclude group: 'com.google.code.findbugs', module:'jsr305'
exclude group:'commons-codec' ,module:'commons-codec'
exclude group:'io.netty' ,module:'netty-all'
exclude group: 'com.fasterxml.jackson.core', module:'jackson-annotations'
exclude group: 'org.bouncycastle', module:'bcprov-jdk15on'
}
compile("io.netty:netty-all:${nettyVersion}")
compile("org.bouncycastle:bcprov-jdk15on:${bouncycastleVersion}")
testCompile("org.opentest4j:opentest4j:${opentest4jVersion}")
compile "io.netty:netty-all:4.1.69.Final"
compile "org.bouncycastle:bcprov-jdk15on:1.69"
compile "org.opentest4j:opentest4j:1.2.0"

// TEST DEPENDENCIES
testCompile "org.junit.jupiter:junit-jupiter-engine:${junit5Version}"
testCompile "junit:junit:${junitVersion}"
testCompile("org.spockframework:spock-core:${spockVersion}") {
exclude group:'org.junit.platform', module:'junit-platform-engine'
}
}
Loading

0 comments on commit 5b79499

Please sign in to comment.