From 639cad63fe3085648194f6a982e88f7bf88e3981 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Fri, 11 Dec 2020 11:47:26 +1000 Subject: [PATCH] Jetty 9.4.x optimize parser warning from logs and add spotbug (#5735) * enable spotbugs in CI Signed-off-by: olivier lamy record issues Signed-off-by: olivier lamy use warning new generation Signed-off-by: olivier lamy activate errorprone Signed-off-by: olivier lamy fix Jenkinsfile Signed-off-by: olivier lamy do not run spotbugs for jetty-runner as we do not want to fix all dependencies bugs :) Signed-off-by: olivier lamy junit should allow empty results Signed-off-by: olivier lamy maven console can be use only once... Signed-off-by: olivier lamy one liner Signed-off-by: olivier lamy recordissues only once Signed-off-by: olivier lamy force id Signed-off-by: olivier lamy aggregate results Signed-off-by: olivier lamy configure a name for aggregated reports Signed-off-by: olivier lamy mo more -T3 no need anymore of remote session test profile Signed-off-by: olivier lamy I want to see what failing tests look like with new report. Signed-off-by: Joakim Erdfelt skip spotbugs for jetty-jmh Signed-off-by: olivier lamy get rid of findbugs as we now have spotbugs Signed-off-by: olivier lamy Revert "I want to see what failing tests look like with new report." This reverts commit df0d13e4c53d7461872e1f925ec06bd36e4a66c9. activate errorProne parser Signed-off-by: olivier lamy make pmd quiet for CI Signed-off-by: olivier lamy remove -fae flag and do not display transfer progress Signed-off-by: olivier lamy try junitParser() to see what it does Signed-off-by: olivier lamy junit parser is a bad idea... Signed-off-by: olivier lamy increase timeout Signed-off-by: olivier lamy no -T2 for javadoc Signed-off-by: olivier lamy fix skip spotbugs and pmd verbose Signed-off-by: olivier lamy * remove -T options Signed-off-by: olivier lamy --- Jenkinsfile | 29 ++++---- examples/pom.xml | 9 +-- jetty-alpn/jetty-alpn-client/pom.xml | 8 +-- jetty-alpn/jetty-alpn-server/pom.xml | 8 +-- jetty-annotations/pom.xml | 8 +-- jetty-client/pom.xml | 8 +-- jetty-continuation/pom.xml | 8 +-- jetty-deploy/pom.xml | 12 +--- jetty-distribution/pom.xml | 9 +-- jetty-home/pom.xml | 9 +-- jetty-http-spi/pom.xml | 8 +-- jetty-http/pom.xml | 8 +-- jetty-io/pom.xml | 12 +--- jetty-jaas/pom.xml | 8 +-- jetty-jaspi/pom.xml | 8 +-- jetty-jmh/pom.xml | 8 +-- jetty-jmx/pom.xml | 12 +--- jetty-jndi/pom.xml | 8 +-- jetty-openid/pom.xml | 8 +-- jetty-osgi/jetty-osgi-boot-jsp/pom.xml | 8 +-- jetty-osgi/jetty-osgi-boot-warurl/pom.xml | 8 +-- jetty-osgi/jetty-osgi-boot/pom.xml | 8 +-- jetty-osgi/jetty-osgi-httpservice/pom.xml | 8 +-- jetty-plus/pom.xml | 8 +-- jetty-proxy/pom.xml | 12 +--- jetty-rewrite/pom.xml | 12 +--- jetty-runner/pom.xml | 2 + jetty-security/pom.xml | 8 +-- jetty-server/pom.xml | 8 +-- jetty-servlet/pom.xml | 8 +-- jetty-servlets/pom.xml | 12 +--- jetty-start/pom.xml | 8 +-- jetty-unixsocket/pom.xml | 8 +-- jetty-util-ajax/pom.xml | 12 +--- jetty-util/pom.xml | 8 +-- jetty-webapp/pom.xml | 8 +-- jetty-websocket/pom.xml | 10 +-- jetty-xml/pom.xml | 8 +-- pom.xml | 81 ++++++++++++++--------- tests/pom.xml | 11 +-- 40 files changed, 106 insertions(+), 338 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a851451b0500..4dafabe0f0b9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,8 +12,7 @@ pipeline { steps { container('jetty-build') { timeout( time: 240, unit: 'MINUTES' ) { - mavenBuild( "jdk8", "clean install", "maven3", - [[parserName: 'Maven'], [parserName: 'Java']]) + mavenBuild( "jdk8", "clean install", "maven3") // Collect up the jacoco execution results (only on main build) jacoco inclusionPattern: '**/org/eclipse/jetty/**/*.class', exclusionPattern: '' + @@ -32,6 +31,7 @@ pipeline { execPattern: '**/target/jacoco.exec', classPattern: '**/target/classes', sourcePattern: '**/src/main/java' + recordIssues id: "jdk8", name: "Static Analysis jdk8", aggregatingResults: true, enabledForFailure: true, tools: [mavenConsole(), java(), checkStyle(), spotBugs(), pmdParser()] } } } @@ -42,8 +42,8 @@ pipeline { steps { container( 'jetty-build' ) { timeout( time: 240, unit: 'MINUTES' ) { - mavenBuild( "jdk11", "clean install -Djacoco.skip=true", "maven3", - [[parserName: 'Maven'], [parserName: 'Java']]) + mavenBuild( "jdk11", "clean install -Djacoco.skip=true -Perrorprone", "maven3") + recordIssues id: "jdk11", name: "Static Analysis jdk11", aggregatingResults: true, enabledForFailure: true, tools: [mavenConsole(), java(), checkStyle(), spotBugs(), pmdParser(), errorProne()] } } } @@ -54,8 +54,8 @@ pipeline { steps { container( 'jetty-build' ) { timeout( time: 240, unit: 'MINUTES' ) { - mavenBuild( "jdk15", "clean install -Djacoco.skip=true", "maven3", - [[parserName: 'Maven'], [parserName: 'Java']]) + mavenBuild( "jdk15", "clean install -Djacoco.skip=true", "maven3") + recordIssues id: "jdk15", name: "Static Analysis jdk15", aggregatingResults: true, enabledForFailure: true, tools: [mavenConsole(), java(), checkStyle(), spotBugs(), pmdParser()] } } } @@ -65,10 +65,11 @@ pipeline { agent { node { label 'linux' } } steps { container( 'jetty-build' ) { - timeout( time: 60, unit: 'MINUTES' ) { + timeout( time: 120, unit: 'MINUTES' ) { mavenBuild( "jdk11", "install javadoc:javadoc javadoc:aggregate-jar -DskipTests -Dpmd.skip=true -Dcheckstyle.skip=true", - "maven3", [[parserName: 'Maven'], [parserName: 'JavaDoc'], [parserName: 'Java']]) + "maven3") + recordIssues id: "javadoc", enabledForFailure: true, tools: [javaDoc()] } } } @@ -78,9 +79,8 @@ pipeline { agent { node { label 'linux' } } steps { container( 'jetty-build' ) { - timeout( time: 60, unit: 'MINUTES' ) { - mavenBuild( "jdk8", "-Pcompact3 clean install -DskipTests", "maven3", - [[parserName: 'Maven'], [parserName: 'Java']]) + timeout( time: 120, unit: 'MINUTES' ) { + mavenBuild( "jdk8", "-Pcompact3 clean install -DskipTests", "maven3") } } } @@ -130,7 +130,7 @@ def slackNotif() { * @param cmdline the command line in " "`format. * @param consoleParsers array of console parsers to run */ -def mavenBuild(jdk, cmdline, mvnName, consoleParsers) { +def mavenBuild(jdk, cmdline, mvnName) { script { try { withEnv(["JAVA_HOME=${ tool "$jdk" }", @@ -138,16 +138,13 @@ def mavenBuild(jdk, cmdline, mvnName, consoleParsers) { "MAVEN_OPTS=-Xms2g -Xmx4g -Djava.awt.headless=true"]) { configFileProvider( [configFile(fileId: 'oss-settings.xml', variable: 'GLOBAL_MVN_SETTINGS')]) { - sh "mvn -s $GLOBAL_MVN_SETTINGS -Dmaven.repo.local=.repository -Pci -V -B -e -Djetty.testtracker.log=true $cmdline -Dunix.socket.tmp=/tmp/unixsocket" + sh "mvn --no-transfer-progress -s $GLOBAL_MVN_SETTINGS -Dmaven.repo.local=.repository -Pci -V -B -e -Djetty.testtracker.log=true $cmdline -Dunix.socket.tmp=/tmp/unixsocket" } } } finally { junit testResults: '**/target/surefire-reports/*.xml,**/target/invoker-reports/TEST*.xml', allowEmptyResults: true - if(consoleParsers!=null){ - warnings consoleParsers: consoleParsers - } } } } diff --git a/examples/pom.xml b/examples/pom.xml index 397c42046aa7..72485e3554f9 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -14,6 +14,7 @@ true + true @@ -26,14 +27,6 @@ true - - org.codehaus.mojo - findbugs-maven-plugin - - - true - - diff --git a/jetty-alpn/jetty-alpn-client/pom.xml b/jetty-alpn/jetty-alpn-client/pom.xml index 8499a6f8d496..349d9ebfd148 100644 --- a/jetty-alpn/jetty-alpn-client/pom.xml +++ b/jetty-alpn/jetty-alpn-client/pom.xml @@ -9,6 +9,7 @@ Jetty :: ALPN :: Client ${project.groupId}.alpn.client + org.eclipse.alpn.* @@ -36,13 +37,6 @@ org.apache.maven.plugins maven-source-plugin - - org.codehaus.mojo - findbugs-maven-plugin - - org.eclipse.jetty.alpn.* - - diff --git a/jetty-alpn/jetty-alpn-server/pom.xml b/jetty-alpn/jetty-alpn-server/pom.xml index 32520d98f27b..c4df1168442c 100644 --- a/jetty-alpn/jetty-alpn-server/pom.xml +++ b/jetty-alpn/jetty-alpn-server/pom.xml @@ -9,6 +9,7 @@ Jetty :: ALPN :: Server ${project.groupId}.alpn.server + org.eclipse.alpn.* @@ -18,13 +19,6 @@ org.apache.maven.plugins maven-source-plugin - - org.codehaus.mojo - findbugs-maven-plugin - - org.eclipse.jetty.alpn.* - - org.codehaus.mojo build-helper-maven-plugin diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index 3b82be745da9..c5b2a7000374 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -10,6 +10,7 @@ Annotation support for deploying servlets in jetty. ${project.groupId}.annotations + org.eclipse.annotations.* @@ -24,13 +25,6 @@ - - org.codehaus.mojo - findbugs-maven-plugin - - org.eclipse.jetty.annotations.* - - diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml index 73333e0cd5c1..d49059af04c2 100644 --- a/jetty-client/pom.xml +++ b/jetty-client/pom.xml @@ -11,16 +11,10 @@ ${project.groupId}.client target/test-policy + org.eclipse.client.* - - org.codehaus.mojo - findbugs-maven-plugin - - org.eclipse.jetty.client.* - - org.apache.maven.plugins maven-dependency-plugin diff --git a/jetty-continuation/pom.xml b/jetty-continuation/pom.xml index a35abef1a97c..fb487b5c40a7 100644 --- a/jetty-continuation/pom.xml +++ b/jetty-continuation/pom.xml @@ -10,16 +10,10 @@ Asynchronous API ${project.groupId}.continuation + org.eclipse.continuation.* - - org.codehaus.mojo - findbugs-maven-plugin - - org.eclipse.jetty.continuation.* - - diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml index a3196cd93853..90076318a3cd 100644 --- a/jetty-deploy/pom.xml +++ b/jetty-deploy/pom.xml @@ -10,18 +10,8 @@ Jetty deployers ${project.groupId}.deploy + org.eclipse.deploy.* - - - - org.codehaus.mojo - findbugs-maven-plugin - - org.eclipse.jetty.deploy.* - - - - org.eclipse.jetty.toolchain diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml index 823d205310dc..b44a4f89b08f 100644 --- a/jetty-distribution/pom.xml +++ b/jetty-distribution/pom.xml @@ -12,6 +12,7 @@ ${basedir}/target/distribution ${basedir}/target/home + true @@ -384,14 +385,6 @@ true - - - org.codehaus.mojo - findbugs-maven-plugin - - true - - diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml index 0b2e6ad23e78..0c20aa89f41d 100644 --- a/jetty-home/pom.xml +++ b/jetty-home/pom.xml @@ -14,6 +14,7 @@ ${basedir}/target/jetty-home ${basedir}/target/jetty-home-sources 1.0.4 + true @@ -538,14 +539,6 @@ true - - - org.codehaus.mojo - findbugs-maven-plugin - - true - - diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml index c3e4b561f735..1ec07091ad49 100644 --- a/jetty-http-spi/pom.xml +++ b/jetty-http-spi/pom.xml @@ -9,6 +9,7 @@ Jetty :: Http Service Provider Interface ${project.groupId}.http.spi + org.eclipse.jetty.http.spi.* @@ -37,13 +38,6 @@ - - org.codehaus.mojo - findbugs-maven-plugin - - org.eclipse.jetty.http.spi.* - - org.apache.maven.plugins maven-surefire-plugin diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index 9fb99870c555..0da02ae4b0e4 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -10,6 +10,7 @@ Jetty :: Http Utility ${project.groupId}.http + org.eclipse.jetty.http.* @@ -58,13 +59,6 @@ - - org.codehaus.mojo - findbugs-maven-plugin - - org.eclipse.jetty.http.* - - org.apache.maven.plugins maven-shade-plugin diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml index 6777993f8f61..227d6d9e9eea 100644 --- a/jetty-io/pom.xml +++ b/jetty-io/pom.xml @@ -10,6 +10,7 @@ Jetty :: IO Utility ${project.groupId}.io + org.eclipse.jetty.io.* @@ -23,15 +24,4 @@ test - - - - org.codehaus.mojo - findbugs-maven-plugin - - org.eclipse.jetty.io.* - - - - diff --git a/jetty-jaas/pom.xml b/jetty-jaas/pom.xml index 83c9d55a534e..1e0473912bab 100644 --- a/jetty-jaas/pom.xml +++ b/jetty-jaas/pom.xml @@ -12,6 +12,7 @@ ${project.groupId}.jaas 2.0.0-M24 + org.eclipse.jetty.jaas.* @@ -21,13 +22,6 @@ org.apache.maven.plugins maven-source-plugin - - org.codehaus.mojo - findbugs-maven-plugin - - org.eclipse.jetty.jaas.* - - diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index 8cd5c9585e62..813212fe3dfc 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -12,17 +12,11 @@ ${project.groupId}.security.jaspi + org.eclipse.jetty.jaspi.* - - org.codehaus.mojo - findbugs-maven-plugin - - org.eclipse.jetty.jaspi.* - - org.apache.felix maven-bundle-plugin diff --git a/jetty-jmh/pom.xml b/jetty-jmh/pom.xml index 0bd16e95e215..6aefdb384ebc 100644 --- a/jetty-jmh/pom.xml +++ b/jetty-jmh/pom.xml @@ -12,17 +12,11 @@ ${project.groupId}.jmh + true - - org.codehaus.mojo - findbugs-maven-plugin - - true - - org.apache.felix maven-bundle-plugin diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml index 051845d62192..09cb594b3467 100644 --- a/jetty-jmx/pom.xml +++ b/jetty-jmx/pom.xml @@ -10,18 +10,8 @@ JMX management artifact for jetty. ${project.groupId}.jmx + org.eclipse.jetty.jmx.* - - - - org.codehaus.mojo - findbugs-maven-plugin - - org.eclipse.jetty.jmx.* - - - - org.eclipse.jetty.toolchain diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml index 4fb28c1be654..858332df792c 100644 --- a/jetty-jndi/pom.xml +++ b/jetty-jndi/pom.xml @@ -10,6 +10,7 @@ JNDI spi impl for java namespace. ${project.groupId}.jndi + org.eclipse.jetty.jndi.* @@ -40,13 +41,6 @@ - - org.codehaus.mojo - findbugs-maven-plugin - - org.eclipse.jetty.jndi.* - - diff --git a/jetty-openid/pom.xml b/jetty-openid/pom.xml index 3477a55b2d64..02b239bd7dc5 100644 --- a/jetty-openid/pom.xml +++ b/jetty-openid/pom.xml @@ -12,17 +12,11 @@ ${project.groupId}.openid + org.eclipse.jetty.security.openid.* - - org.codehaus.mojo - findbugs-maven-plugin - - org.eclipse.jetty.security.openid.* - - org.apache.felix maven-bundle-plugin diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml index f37b815c26db..e024930a94f7 100644 --- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml @@ -10,6 +10,7 @@ Jetty OSGi Boot JSP bundle ${project.groupId}.boot.jsp + org.eclipse.jetty.osgi.boot.jasper.*,org.eclipse.jetty.osgi.boot.jsp.* @@ -125,13 +126,6 @@ - - org.codehaus.mojo - findbugs-maven-plugin - - org.eclipse.jetty.osgi.boot.jasper.*,org.eclipse.jetty.osgi.boot.jsp.* - - diff --git a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml index 34ac1ada51ab..93172e657d8a 100644 --- a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml @@ -11,6 +11,7 @@ Jetty OSGi Boot-Warurl bundle ${project.groupId}.boot.warurl + org.eclipse.jetty.osgi.boot.warurl.* @@ -36,13 +37,6 @@ - - org.codehaus.mojo - findbugs-maven-plugin - - org.eclipse.jetty.osgi.boot.warurl.* - - diff --git a/jetty-osgi/jetty-osgi-boot/pom.xml b/jetty-osgi/jetty-osgi-boot/pom.xml index 9da0d60dd08f..dbc4988f196c 100644 --- a/jetty-osgi/jetty-osgi-boot/pom.xml +++ b/jetty-osgi/jetty-osgi-boot/pom.xml @@ -10,6 +10,7 @@ Jetty OSGi Boot bundle ${project.groupId}.boot + org.eclipse.jetty.osgi.boot.* @@ -99,13 +100,6 @@ - - org.codehaus.mojo - findbugs-maven-plugin - - org.eclipse.jetty.osgi.boot.* - - diff --git a/jetty-osgi/jetty-osgi-httpservice/pom.xml b/jetty-osgi/jetty-osgi-httpservice/pom.xml index 8a0281ec6709..12d1a235fc13 100644 --- a/jetty-osgi/jetty-osgi-httpservice/pom.xml +++ b/jetty-osgi/jetty-osgi-httpservice/pom.xml @@ -10,6 +10,7 @@ Jetty OSGi HttpService bundle ${project.groupId}.httpservice + org.eclipse.jetty.osgi.httpservice.* @@ -70,13 +71,6 @@ - - org.codehaus.mojo - findbugs-maven-plugin - - org.eclipse.jetty.osgi.httpservice.* - - diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml index 8ccca048e2fd..403219abb71f 100644 --- a/jetty-plus/pom.xml +++ b/jetty-plus/pom.xml @@ -10,6 +10,7 @@ Jetty JavaEE style services ${project.groupId}.plus + org.eclipse.jetty.plus.* @@ -46,13 +47,6 @@ - - org.codehaus.mojo - findbugs-maven-plugin - - org.eclipse.jetty.plus.* - - diff --git a/jetty-proxy/pom.xml b/jetty-proxy/pom.xml index 3a17d45f6e3d..fd9a9e7ff16d 100644 --- a/jetty-proxy/pom.xml +++ b/jetty-proxy/pom.xml @@ -10,18 +10,8 @@ Jetty Proxy ${project.groupId}.proxy + org.eclipse.jetty.proxy.* - - - - org.codehaus.mojo - findbugs-maven-plugin - - org.eclipse.jetty.proxy.* - - - - javax.servlet diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml index 354ad29c1138..a8354bae493d 100644 --- a/jetty-rewrite/pom.xml +++ b/jetty-rewrite/pom.xml @@ -10,18 +10,8 @@ Jetty Rewrite Handler ${project.groupId}.rewrite + org.eclipse.jetty.rewrite.* - - - - org.codehaus.mojo - findbugs-maven-plugin - - org.eclipse.jetty.rewrite.* - - - - org.eclipse.jetty diff --git a/jetty-runner/pom.xml b/jetty-runner/pom.xml index ef2d11ec1630..cef963449c35 100644 --- a/jetty-runner/pom.xml +++ b/jetty-runner/pom.xml @@ -11,6 +11,8 @@ target/distribution ${project.groupId}.runner + + true diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml index b2245c03f2cd..550f88a99ec3 100644 --- a/jetty-security/pom.xml +++ b/jetty-security/pom.xml @@ -10,16 +10,10 @@ Jetty security infrastructure ${project.groupId}.security + org.eclipse.jetty.security.* - - org.codehaus.mojo - findbugs-maven-plugin - - org.eclipse.jetty.security.* - - org.apache.felix maven-bundle-plugin diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index 7cd353a839d4..ed93f1658da4 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -10,6 +10,7 @@ The core jetty server artifact. ${project.groupId}.server + org.eclipse.jetty.server.* @@ -25,13 +26,6 @@ - - org.codehaus.mojo - findbugs-maven-plugin - - org.eclipse.jetty.server.* - - diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml index d135c3bbefbb..738c98833b5e 100644 --- a/jetty-servlet/pom.xml +++ b/jetty-servlet/pom.xml @@ -11,6 +11,7 @@ Jetty Servlet Container ${project.groupId}.servlet + org.eclipse.jetty.* @@ -26,13 +27,6 @@ - - org.codehaus.mojo - findbugs-maven-plugin - - org.eclipse.jetty.servlet.* - - diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index 67f3c8976d93..db77ee445d84 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -11,18 +11,8 @@ Utility Servlets from Jetty ${project.groupId}.servlets + org.eclipse.jetty.servlets.* - - - - org.codehaus.mojo - findbugs-maven-plugin - - org.eclipse.jetty.servlets.* - - - - org.eclipse.jetty diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml index 7d35c730f87a..5a84f4ec7110 100644 --- a/jetty-start/pom.xml +++ b/jetty-start/pom.xml @@ -10,6 +10,7 @@ The start utility ${project.groupId}.start + org.eclipse.jetty.start.* @@ -23,13 +24,6 @@ - - org.codehaus.mojo - findbugs-maven-plugin - - org.eclipse.jetty.start.* - - org.apache.maven.plugins maven-shade-plugin diff --git a/jetty-unixsocket/pom.xml b/jetty-unixsocket/pom.xml index 1049c9a66ce7..475fca596bfe 100644 --- a/jetty-unixsocket/pom.xml +++ b/jetty-unixsocket/pom.xml @@ -10,6 +10,7 @@ Jetty UnixSocket ${project.groupId}.unixsocket + org.eclipse.jetty.unixsocket.* @@ -41,13 +42,6 @@ - - org.codehaus.mojo - findbugs-maven-plugin - - org.eclipse.jetty.unixsocket.* - - org.apache.maven.plugins maven-dependency-plugin diff --git a/jetty-util-ajax/pom.xml b/jetty-util-ajax/pom.xml index 08f5d14fb52d..1b5b11644d96 100644 --- a/jetty-util-ajax/pom.xml +++ b/jetty-util-ajax/pom.xml @@ -10,18 +10,8 @@ JSON/Ajax Utility classes for Jetty ${project.groupId}.util.ajax + org.eclipse.jetty.util.ajax.* - - - - org.codehaus.mojo - findbugs-maven-plugin - - org.eclipse.jetty.util.ajax.* - - - - org.eclipse.jetty diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index 3b1daf78d48d..ff927244e5c7 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -10,6 +10,7 @@ Utility classes for Jetty ${project.groupId}.util + org.eclipse.jetty.util.* @@ -19,13 +20,6 @@ - - org.codehaus.mojo - findbugs-maven-plugin - - org.eclipse.jetty.util.* - - org.codehaus.mojo buildnumber-maven-plugin diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index 11fe4b3e77b5..67036f53d8ba 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -10,6 +10,7 @@ Jetty web application support ${project.groupId}.webapp + org.eclipse.jetty.webapp.* @@ -26,13 +27,6 @@ - - org.codehaus.mojo - findbugs-maven-plugin - - org.eclipse.jetty.webapp.* - - org.apache.maven.plugins maven-surefire-plugin diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml index e7910934d50c..ca0677baaf93 100644 --- a/jetty-websocket/pom.xml +++ b/jetty-websocket/pom.xml @@ -21,15 +21,11 @@ javax-websocket-client-impl javax-websocket-server-impl + + org.eclipse.jetty.websocket.* + - - org.codehaus.mojo - findbugs-maven-plugin - - org.eclipse.jetty.websocket.* - - org.apache.maven.plugins maven-jar-plugin diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index e25a9b4c5b09..35e1da9d456b 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -10,16 +10,10 @@ The jetty xml utilities. ${project.groupId}.xml + org.eclipse.jetty.xml.* - - org.codehaus.mojo - findbugs-maven-plugin - - org.eclipse.jetty.xml.* - - org.apache.felix maven-bundle-plugin diff --git a/pom.xml b/pom.xml index fa30d1de520e..34ad95e2605a 100644 --- a/pom.xml +++ b/pom.xml @@ -58,6 +58,8 @@ 3.0.0-M1 3.0.0-M1 + true + false 5.5 @@ -262,7 +264,8 @@ check - true + ${pmd.verbose} + ${pmd.verbose} @@ -790,17 +793,6 @@ exec-maven-plugin 3.0.0 - - org.codehaus.mojo - findbugs-maven-plugin - 3.0.5 - - true - true - Max - org.eclipse.jetty.* - - org.eclipse.m2e lifecycle-mapping @@ -1208,27 +1200,18 @@ maven-compiler-plugin true - javac-with-errorprone - true - - -XepAllErrorsAsWarnings - -Xep:OperatorPrecedence:OFF + + -XDcompilePolicy=simple + -Xplugin:ErrorProne -XepAllErrorsAsWarnings + + + com.google.errorprone + error_prone_core + 2.4.0 + + - - - org.codehaus.plexus - plexus-compiler-javac-errorprone - 2.8.8 - - - - com.google.errorprone - error_prone_core - 2.4.0 - - @@ -1393,6 +1376,14 @@ ${env.GLOBAL_MVN_SETTINGS} 3 + false + + Medium + + Default + false + org.eclipse.jetty.* + false aggregates/jetty-all @@ -1400,6 +1391,11 @@ + + com.github.spotbugs + spotbugs-maven-plugin + 4.1.4 + org.apache.maven.plugins maven-surefire-plugin @@ -1410,6 +1406,29 @@ + + + com.github.spotbugs + spotbugs-maven-plugin + + + spotbugs + + check + + verify + + ${spotbugs.skip} + ${spotbugs.failOnError} + true + false + ${spotbugs.effort} + ${spotbugs.threshold} + + + + + diff --git a/tests/pom.xml b/tests/pom.xml index 14bef2377f5a..a10bd494f85f 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -11,6 +11,9 @@ tests-parent Jetty Tests :: Parent pom + + true + @@ -38,14 +41,6 @@ true - - org.codehaus.mojo - findbugs-maven-plugin - - - true - -