From d804ea303fd3f009bd6f2051ec2185c5fcb91d20 Mon Sep 17 00:00:00 2001 From: Aaron Coburn Date: Tue, 30 Jun 2020 14:19:01 -0400 Subject: [PATCH] Plugin and tool updates (#938) --- auth/basic/build.gradle | 2 +- auth/jwt/build.gradle | 2 +- auth/oauth/build.gradle | 2 +- auth/webac/build.gradle | 2 +- build.gradle | 19 +++++-------------- components/app/build.gradle | 2 +- components/audit/build.gradle | 2 +- components/cache/build.gradle | 2 +- components/cdi/build.gradle | 2 +- components/constraint/build.gradle | 2 +- components/file/build.gradle | 2 +- components/jena/build.gradle | 2 +- components/rdfa/build.gradle | 2 +- components/webdav/build.gradle | 2 +- core/api/build.gradle | 2 +- core/http/build.gradle | 2 +- notifications/amqp/build.gradle | 2 +- notifications/event-jackson/build.gradle | 2 +- notifications/event-jsonb/build.gradle | 2 +- notifications/jms/build.gradle | 2 +- notifications/kafka/build.gradle | 2 +- .../karaf/src/main/resources/features.xml | 4 ++++ settings.gradle | 2 +- 23 files changed, 30 insertions(+), 35 deletions(-) diff --git a/auth/basic/build.gradle b/auth/basic/build.gradle index 62e79c1a8..71e5c6666 100644 --- a/auth/basic/build.gradle +++ b/auth/basic/build.gradle @@ -29,8 +29,8 @@ dependencies { } pitest { - testPlugin = 'junit5' pitestVersion = pitestToolVersion + junit5PluginVersion = pitestJunitPluginVersion threads = 4 } diff --git a/auth/jwt/build.gradle b/auth/jwt/build.gradle index 85b95fd9b..a357ee832 100644 --- a/auth/jwt/build.gradle +++ b/auth/jwt/build.gradle @@ -37,8 +37,8 @@ dependencies { } pitest { - testPlugin = 'junit5' pitestVersion = pitestToolVersion + junit5PluginVersion = pitestJunitPluginVersion threads = 4 } diff --git a/auth/oauth/build.gradle b/auth/oauth/build.gradle index 03359e185..cb1d57c0d 100644 --- a/auth/oauth/build.gradle +++ b/auth/oauth/build.gradle @@ -35,8 +35,8 @@ dependencies { } pitest { - testPlugin = 'junit5' pitestVersion = pitestToolVersion + junit5PluginVersion = pitestJunitPluginVersion threads = 4 } diff --git a/auth/webac/build.gradle b/auth/webac/build.gradle index 6e1d854f0..aaaa91ada 100644 --- a/auth/webac/build.gradle +++ b/auth/webac/build.gradle @@ -36,7 +36,7 @@ dependencies { } pitest { - testPlugin = 'junit5' pitestVersion = pitestToolVersion + junit5PluginVersion = pitestJunitPluginVersion threads = 4 } diff --git a/build.gradle b/build.gradle index 786d4fea1..e90bf6770 100644 --- a/build.gradle +++ b/build.gradle @@ -1,13 +1,3 @@ -buildscript { - repositories { - mavenCentral() - } - configurations.maybeCreate('pitest') - dependencies { - pitest "org.pitest:pitest-junit5-plugin:0.12" - } -} - plugins { id 'com.github.ben-manes.versions' version "0.28.0" id 'com.github.hierynomus.license' version "0.15.0" @@ -98,9 +88,10 @@ ext { // Tooling jacocoToolVersion = "0.8.5" - checkstyleToolVersion = "8.31" - pitestToolVersion = "1.5.1" - pmdToolVersion = "6.22.0" + checkstyleToolVersion = "8.34" + pitestToolVersion = "1.5.2" + pitestJunitPluginVersion = "0.12" + pmdToolVersion = "6.24.0" // OSGi elVersion = "3.0.3" @@ -113,7 +104,7 @@ ext { osgiVersion = "6.0.0" osgiCompendiumVersion = "5.0.0" paxExamVersion = "4.13.3" - spiflyVersion = "1.2.4" + spiflyVersion = "1.3.0" omitFromJacocoReporting = [ 'trellis-bom', diff --git a/components/app/build.gradle b/components/app/build.gradle index 7b6a777c6..7a27fef76 100644 --- a/components/app/build.gradle +++ b/components/app/build.gradle @@ -39,8 +39,8 @@ dependencies { } pitest { - testPlugin = 'junit5' pitestVersion = pitestToolVersion + junit5PluginVersion = pitestJunitPluginVersion threads = 4 } diff --git a/components/audit/build.gradle b/components/audit/build.gradle index ef3adc5dd..e913ec531 100644 --- a/components/audit/build.gradle +++ b/components/audit/build.gradle @@ -21,8 +21,8 @@ dependencies { } pitest { - testPlugin = 'junit5' pitestVersion = pitestToolVersion + junit5PluginVersion = pitestJunitPluginVersion threads = 4 } diff --git a/components/cache/build.gradle b/components/cache/build.gradle index 8fbc4e4fa..d08027500 100644 --- a/components/cache/build.gradle +++ b/components/cache/build.gradle @@ -18,8 +18,8 @@ dependencies { } pitest { - testPlugin = 'junit5' pitestVersion = pitestToolVersion + junit5PluginVersion = pitestJunitPluginVersion threads = 4 } diff --git a/components/cdi/build.gradle b/components/cdi/build.gradle index edbd2a984..9d48b0246 100644 --- a/components/cdi/build.gradle +++ b/components/cdi/build.gradle @@ -30,8 +30,8 @@ dependencies { } pitest { - testPlugin = 'junit5' pitestVersion = pitestToolVersion + junit5PluginVersion = pitestJunitPluginVersion threads = 4 } diff --git a/components/constraint/build.gradle b/components/constraint/build.gradle index c1c0f332c..126846c2a 100644 --- a/components/constraint/build.gradle +++ b/components/constraint/build.gradle @@ -22,8 +22,8 @@ dependencies { } pitest { - testPlugin = 'junit5' pitestVersion = pitestToolVersion + junit5PluginVersion = pitestJunitPluginVersion threads = 4 } diff --git a/components/file/build.gradle b/components/file/build.gradle index 6ee9e82ca..4c83cdb49 100644 --- a/components/file/build.gradle +++ b/components/file/build.gradle @@ -29,8 +29,8 @@ dependencies { } pitest { - testPlugin = 'junit5' pitestVersion = pitestToolVersion + junit5PluginVersion = pitestJunitPluginVersion threads = 4 } diff --git a/components/jena/build.gradle b/components/jena/build.gradle index 97f9a00aa..0184b05b0 100644 --- a/components/jena/build.gradle +++ b/components/jena/build.gradle @@ -27,8 +27,8 @@ dependencies { } pitest { - testPlugin = 'junit5' pitestVersion = pitestToolVersion + junit5PluginVersion = pitestJunitPluginVersion threads = 4 } diff --git a/components/rdfa/build.gradle b/components/rdfa/build.gradle index 97bc5d6d2..4693cb674 100644 --- a/components/rdfa/build.gradle +++ b/components/rdfa/build.gradle @@ -27,8 +27,8 @@ dependencies { } pitest { - testPlugin = 'junit5' pitestVersion = pitestToolVersion + junit5PluginVersion = pitestJunitPluginVersion threads = 4 } diff --git a/components/webdav/build.gradle b/components/webdav/build.gradle index 4cc9c8e99..b5bf07e9f 100644 --- a/components/webdav/build.gradle +++ b/components/webdav/build.gradle @@ -46,8 +46,8 @@ dependencies { } pitest { - testPlugin = 'junit5' pitestVersion = pitestToolVersion + junit5PluginVersion = pitestJunitPluginVersion threads = 4 } diff --git a/core/api/build.gradle b/core/api/build.gradle index bd6db3547..cc9e11a63 100644 --- a/core/api/build.gradle +++ b/core/api/build.gradle @@ -26,8 +26,8 @@ dependencies { } pitest { - testPlugin = 'junit5' pitestVersion = pitestToolVersion + junit5PluginVersion = pitestJunitPluginVersion threads = 4 } diff --git a/core/http/build.gradle b/core/http/build.gradle index c497f5f4c..8a036d951 100644 --- a/core/http/build.gradle +++ b/core/http/build.gradle @@ -32,7 +32,7 @@ dependencies { testImplementation "com.fasterxml.jackson.core:jackson-core:$jacksonVersion" testImplementation "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion" testImplementation "io.smallrye.config:smallrye-config:$smallryeConfigVersion" - testImplementation "org.apache.jena:jena-commonsrdf:$commonsRdfVersion" + testImplementation "org.apache.jena:jena-commonsrdf:$jenaVersion" testImplementation "org.glassfish.jersey.core:jersey-server:$jerseyVersion" testImplementation "org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2:$jerseyVersion" testImplementation "org.glassfish.jersey.inject:jersey-hk2:$jerseyVersion" diff --git a/notifications/amqp/build.gradle b/notifications/amqp/build.gradle index 1f0c1441e..50bd98304 100644 --- a/notifications/amqp/build.gradle +++ b/notifications/amqp/build.gradle @@ -39,8 +39,8 @@ dependencies { } pitest { - testPlugin = 'junit5' pitestVersion = pitestToolVersion + junit5PluginVersion = pitestJunitPluginVersion threads = 4 jvmArgs = ["-Dderby.stream.error.file=$buildDir/derby.log"] } diff --git a/notifications/event-jackson/build.gradle b/notifications/event-jackson/build.gradle index d067cd4e3..1402d8c42 100644 --- a/notifications/event-jackson/build.gradle +++ b/notifications/event-jackson/build.gradle @@ -25,8 +25,8 @@ dependencies { } pitest { - testPlugin = 'junit5' pitestVersion = pitestToolVersion + junit5PluginVersion = pitestJunitPluginVersion threads = 4 } diff --git a/notifications/event-jsonb/build.gradle b/notifications/event-jsonb/build.gradle index d92f0a25d..d79fdbef1 100644 --- a/notifications/event-jsonb/build.gradle +++ b/notifications/event-jsonb/build.gradle @@ -24,8 +24,8 @@ dependencies { } pitest { - testPlugin = 'junit5' pitestVersion = pitestToolVersion + junit5PluginVersion = pitestJunitPluginVersion threads = 4 } diff --git a/notifications/jms/build.gradle b/notifications/jms/build.gradle index 70c63bf02..a5dd23944 100644 --- a/notifications/jms/build.gradle +++ b/notifications/jms/build.gradle @@ -42,8 +42,8 @@ dependencies { } pitest { - testPlugin = 'junit5' pitestVersion = pitestToolVersion + junit5PluginVersion = pitestJunitPluginVersion threads = 4 } diff --git a/notifications/kafka/build.gradle b/notifications/kafka/build.gradle index 36e951054..1c8f84349 100644 --- a/notifications/kafka/build.gradle +++ b/notifications/kafka/build.gradle @@ -28,8 +28,8 @@ dependencies { } pitest { - testPlugin = 'junit5' pitestVersion = pitestToolVersion + junit5PluginVersion = pitestJunitPluginVersion threads = 4 } diff --git a/platform/karaf/src/main/resources/features.xml b/platform/karaf/src/main/resources/features.xml index 69d4a6d7b..ca70e7696 100644 --- a/platform/karaf/src/main/resources/features.xml +++ b/platform/karaf/src/main/resources/features.xml @@ -5,6 +5,8 @@
Installs the Trellis API bundle
+ aries-proxy + mvn:org.apache.commons/commons-rdf-api/${commonsRdfVersion} mvn:jakarta.enterprise/jakarta.enterprise.cdi-api/${cdiApiVersion} mvn:jakarta.el/jakarta.el-api/${elVersion} @@ -37,6 +39,8 @@
Installs the Trellis Vocabulary bundle
+ aries-proxy + mvn:org.apache.commons/commons-rdf-api/${commonsRdfVersion} mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/${spiflyVersion} diff --git a/settings.gradle b/settings.gradle index 2493d68dd..55955b30d 100755 --- a/settings.gradle +++ b/settings.gradle @@ -5,7 +5,7 @@ pluginManagement { } plugins { id 'biz.aQute.bnd.builder' version "4.1.0" - id 'info.solidsoft.pitest' version "1.4.9" + id 'info.solidsoft.pitest' version "1.5.1" id 'io.quarkus' version "1.5.2.Final" id "net.wasdev.wlp.gradle.plugins.Liberty" version "2.7" }