From 6eaf131575109c86b7c93d471bedd09bfdb0a7ad Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sat, 21 Sep 2024 00:09:44 -0400 Subject: [PATCH] [drop] Remove support for maven 3.6 plugin as cannot support any longer The support this was to show fixed isn't supported by maven any longer for many, many years. In order to get to doxia we need to drop this support. --- pom.xml | 2 - src/it/MFINDBUGS-145/invoker.properties | 20 --- src/it/MFINDBUGS-145/pom.xml | 136 ------------------ .../it/mfindbugs145/App.java | 32 ----- src/it/MFINDBUGS-145/src/site/site.xml | 53 ------- src/it/MFINDBUGS-145/verify.groovy | 41 ------ 6 files changed, 284 deletions(-) delete mode 100644 src/it/MFINDBUGS-145/invoker.properties delete mode 100644 src/it/MFINDBUGS-145/pom.xml delete mode 100644 src/it/MFINDBUGS-145/src/main/java/org/codehaus/mojo/spotbugsmavenplugin/it/mfindbugs145/App.java delete mode 100644 src/it/MFINDBUGS-145/src/site/site.xml delete mode 100644 src/it/MFINDBUGS-145/verify.groovy diff --git a/pom.xml b/pom.xml index c2fa2e3b..0d371296 100644 --- a/pom.xml +++ b/pom.xml @@ -209,8 +209,6 @@ 3.15.0 2.1.0 3.12.1 - - 3.6 2.17.1 false diff --git a/src/it/MFINDBUGS-145/invoker.properties b/src/it/MFINDBUGS-145/invoker.properties deleted file mode 100644 index af4f3cdc..00000000 --- a/src/it/MFINDBUGS-145/invoker.properties +++ /dev/null @@ -1,20 +0,0 @@ -# -# Copyright 2005-2023 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 -# -# https://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. -# - -invoker.goals = clean compile site - -# The expected result of the build, possible values are "success" (default) and "failure" -invoker.buildResult = success diff --git a/src/it/MFINDBUGS-145/pom.xml b/src/it/MFINDBUGS-145/pom.xml deleted file mode 100644 index 0910d3ab..00000000 --- a/src/it/MFINDBUGS-145/pom.xml +++ /dev/null @@ -1,136 +0,0 @@ - - - - 4.0.0 - - - - spotbugs-maven-plugin.it - MFINDBUGS-145 - testing - jar - - MFINDBUGS-145 - http://maven.apache.org - - - - 8 - 8 - - 8 - - UTF-8 - UTF-8 - - - - - - org.apache.maven.plugins - maven-site-plugin - @sitePlugin36Version@ - - - - - org.apache.maven.plugins - maven-jxr-plugin - @jxrPluginVersion@ - - - com.github.spotbugs - spotbugs-maven-plugin - @pom.version@ - - - - - - - org.apache.maven.doxia - doxia-sink-api - @doxiaVersion@ - - - org.apache.maven.doxia - doxia-module-xhtml - @doxiaVersion@ - - - org.apache.maven.doxia - doxia-module-apt - @doxiaVersion@ - - - org.apache.maven.doxia - doxia-module-xdoc - @doxiaVersion@ - - - org.apache.maven.doxia - doxia-module-fml - @doxiaVersion@ - - - org.apache.maven.doxia - doxia-module-markdown - @doxiaVersion@ - - - org.apache.maven.doxia - doxia-decoration-model - @doxiaSiteToolsVersion@ - - - org.apache.maven.doxia - doxia-site-renderer - @doxiaSiteToolsVersion@ - - - org.apache.maven.doxia - doxia-integration-tools - @doxiaSiteToolsVersion@ - - - - - - - - - - - - - diff --git a/src/it/MFINDBUGS-145/src/main/java/org/codehaus/mojo/spotbugsmavenplugin/it/mfindbugs145/App.java b/src/it/MFINDBUGS-145/src/main/java/org/codehaus/mojo/spotbugsmavenplugin/it/mfindbugs145/App.java deleted file mode 100644 index 8aa239ec..00000000 --- a/src/it/MFINDBUGS-145/src/main/java/org/codehaus/mojo/spotbugsmavenplugin/it/mfindbugs145/App.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2005-2023 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 - * - * https://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. - */ -package org.codehaus.mojo.spotbugsmavenplugin.it.mfindbugs145; - -/** - * Hello world! - * - */ -public class App implements Cloneable { - - public static void main(String[] args) { - System.out.println("Hello World!"); - } - - public Object clone() { - return null; // Does not call 'super.clone()'. - } - -} diff --git a/src/it/MFINDBUGS-145/src/site/site.xml b/src/it/MFINDBUGS-145/src/site/site.xml deleted file mode 100644 index c44c6805..00000000 --- a/src/it/MFINDBUGS-145/src/site/site.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - SpotBugs Maven Plugin - - - - org.apache.maven.skins - maven-fluido-skin - 1.12.0 - - - - - false - false - ยป - - spotbugs/spotbugs-maven-plugin - right - red - - - spotbugs-maven-plugin - thin-badge - - - - - - - - diff --git a/src/it/MFINDBUGS-145/verify.groovy b/src/it/MFINDBUGS-145/verify.groovy deleted file mode 100644 index 1b2f010a..00000000 --- a/src/it/MFINDBUGS-145/verify.groovy +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2005-2023 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 - * - * https://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. - */ - -import java.io.File; -import java.io.IOException; -import java.io.FileNotFoundException; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Path; - -String[] paths = [ "target/site/spotbugs.html", "target/site/xref/index.html" ] - -// Spotbugs and JXR reports -for (String path : paths) { - File file = new File(basedir, path) - System.out.println("Checking for existence of " + file) - if (!file.isFile()) { - throw new FileNotFoundException("Missing: " + file.getAbsolutePath()) - } -} - -File report = new File(basedir, "target/site/spotbugs.html") -String content = new String(Files.readAllBytes(report.toPath()), StandardCharsets.UTF_8) -if (content.indexOf("") < 0) { - throw new IOException("XRef link not generated.") -} - -return true