Plugin and tool updates (#938)

acoburn · web-flow · commit d804ea303fd3 · 2020-06-30T14:19:01.000-04:00
diff --git 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
@@ -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
@@ -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
@@ -36,7 +36,7 @@ dependencies {
 }
 
 pitest {
-    testPlugin = 'junit5'
     pitestVersion = pitestToolVersion
+    junit5PluginVersion = pitestJunitPluginVersion
     threads = 4
 }
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -5,6 +5,8 @@
   <feature name="trellis-api" version="${project.version}">
     <details>Installs the Trellis API bundle</details>
 
+    <feature dependency="true">aries-proxy</feature>
+
     <bundle dependency="true">mvn:org.apache.commons/commons-rdf-api/${commonsRdfVersion}</bundle>
     <bundle dependency="true">mvn:jakarta.enterprise/jakarta.enterprise.cdi-api/${cdiApiVersion}</bundle>
     <bundle dependency="true">mvn:jakarta.el/jakarta.el-api/${elVersion}</bundle>
@@ -37,6 +39,8 @@
   <feature name="trellis-vocabulary" version="${project.version}">
     <details>Installs the Trellis Vocabulary bundle</details>
 
+    <feature dependency="true">aries-proxy</feature>
+
     <bundle dependency="true">mvn:org.apache.commons/commons-rdf-api/${commonsRdfVersion}</bundle>
     <bundle dependency="true">mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/${spiflyVersion}</bundle>
 
diff --git 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"
     }

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@ dependencies {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`pitest {`
`32`		`- testPlugin = 'junit5'`
`33`	`32`	`pitestVersion = pitestToolVersion`
	`33`	`+ junit5PluginVersion = pitestJunitPluginVersion`
`34`	`34`	`threads = 4`
`35`	`35`	`}`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,8 @@ dependencies {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`pitest {`
`40`		`- testPlugin = 'junit5'`
`41`	`40`	`pitestVersion = pitestToolVersion`
	`41`	`+ junit5PluginVersion = pitestJunitPluginVersion`
`42`	`42`	`threads = 4`
`43`	`43`	`}`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,8 @@ dependencies {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`pitest {`
`38`		`- testPlugin = 'junit5'`
`39`	`38`	`pitestVersion = pitestToolVersion`
	`39`	`+ junit5PluginVersion = pitestJunitPluginVersion`
`40`	`40`	`threads = 4`
`41`	`41`	`}`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ dependencies {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`pitest {`
`39`		`- testPlugin = 'junit5'`
`40`	`39`	`pitestVersion = pitestToolVersion`
	`40`	`+ junit5PluginVersion = pitestJunitPluginVersion`
`41`	`41`	`threads = 4`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,8 @@ dependencies {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`pitest {`
`42`		`- testPlugin = 'junit5'`
`43`	`42`	`pitestVersion = pitestToolVersion`
	`43`	`+ junit5PluginVersion = pitestJunitPluginVersion`
`44`	`44`	`threads = 4`
`45`	`45`	`}`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@ dependencies {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`pitest {`
`24`		`- testPlugin = 'junit5'`
`25`	`24`	`pitestVersion = pitestToolVersion`
	`25`	`+ junit5PluginVersion = pitestJunitPluginVersion`
`26`	`26`	`threads = 4`
`27`	`27`	`}`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@ dependencies {`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`pitest {`
`21`		`- testPlugin = 'junit5'`
`22`	`21`	`pitestVersion = pitestToolVersion`
	`22`	`+ junit5PluginVersion = pitestJunitPluginVersion`
`23`	`23`	`threads = 4`
`24`	`24`	`}`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,8 @@ dependencies {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`pitest {`
`33`		`- testPlugin = 'junit5'`
`34`	`33`	`pitestVersion = pitestToolVersion`
	`34`	`+ junit5PluginVersion = pitestJunitPluginVersion`
`35`	`35`	`threads = 4`
`36`	`36`	`}`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@ dependencies {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`pitest {`
`25`		`- testPlugin = 'junit5'`
`26`	`25`	`pitestVersion = pitestToolVersion`
	`26`	`+ junit5PluginVersion = pitestJunitPluginVersion`
`27`	`27`	`threads = 4`
`28`	`28`	`}`
`29`	`29`