diff --git a/maven-compiler-plugin-3.10.1-source-release.zip b/maven-compiler-plugin-3.10.1-source-release.zip
deleted file mode 100644
index 1783d6d..0000000
--- a/maven-compiler-plugin-3.10.1-source-release.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8dc4f56babe3a5ffe9301d2272b519cc64440ec04cac301e395cc8234e07f132
-size 656659
diff --git a/maven-compiler-plugin-3.11.0-source-release.zip b/maven-compiler-plugin-3.11.0-source-release.zip
new file mode 100644
index 0000000..642f3c4
--- /dev/null
+++ b/maven-compiler-plugin-3.11.0-source-release.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1c6f131f18c4a4a052caeeb1cfc59a1badcebaf02d1ae635e2d8db8099ff0860
+size 718452
diff --git a/maven-compiler-plugin-bootstrap-resources.patch b/maven-compiler-plugin-bootstrap-resources.patch
index 0ccfaff..73c3b41 100644
--- a/maven-compiler-plugin-bootstrap-resources.patch
+++ b/maven-compiler-plugin-bootstrap-resources.patch
@@ -1,6 +1,6 @@
---- maven-compiler-plugin-3.10.1/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-compiler-plugin/plugin-help.xml 1970-01-01 01:00:00.000000000 +0100
-+++ maven-compiler-plugin-3.10.1/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-compiler-plugin/plugin-help.xml 2022-03-11 11:00:04.330573606 +0100
-@@ -0,0 +1,774 @@
+--- maven-compiler-plugin-3.11.0/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-compiler-plugin/plugin-help.xml 1970-01-01 01:00:00.000000000 +0100
++++ maven-compiler-plugin-3.11.0/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-compiler-plugin/plugin-help.xml 2023-09-13 19:54:42.838328420 +0200
+@@ -0,0 +1,898 @@
+
+
+ ${project.name}
@@ -9,6 +9,7 @@
+ ${project.artifactId}
+ ${project.version}
+ compiler
++ compiler
+
+
+ compile
@@ -91,6 +92,13 @@
+ Compiles application test sources.
+
+
++ compileSourceRoots
++ java.util.List
++ true
++ true
++ Compiles application sources
++
++
+ createMissingPackageInfoClass
+ boolean
+ 3.10
@@ -199,6 +207,14 @@
+ Compiles application sources
+
+
++ implicit
++ java.lang.String
++ 3.10.2
++ false
++ true
++ Compiles application test sources.
++
++
+ includes
+ java.util.Set
+ false
@@ -206,6 +222,14 @@
+ Compiles application sources
+
+
++ incrementalExcludes
++ java.util.Set
++ 3.11
++ false
++ true
++ Compiles application sources
++
++
+ jdkToolchain
+ java.util.Map
+ 3.6
@@ -277,6 +301,13 @@
+ Compiles application test sources.
+
+
++ showCompilationChanges
++ boolean
++ false
++ true
++ Compiles application test sources.
++
++
+ showDeprecation
+ boolean
+ false
@@ -346,6 +377,7 @@
+ ${maven.compiler.compilerId}
+ ${maven.compiler.compilerReuseStrategy}
+ ${maven.compiler.compilerVersion}
++
+ ${maven.compiler.createMissingPackageInfoClass}
+ ${maven.compiler.debug}
+
@@ -358,23 +390,81 @@
+ ${maven.compiler.forceJavacCompilerUse}
+ ${maven.compiler.fork}
+
++ ${maven.compiler.implicit}
+ ${maven.compiler.maxmem}
+ ${maven.compiler.meminitial}
+ ${maven.compiler.optimize}
+ ${maven.compiler.parameters}
+ ${maven.compiler.release}
++ ${maven.compiler.showCompilationChanges}
+ ${maven.compiler.showDeprecation}
-+ ${maven.compiler.showWarnings}
++ ${maven.compiler.showWarnings}
+ ${maven.main.skip}
+ ${maven.compiler.skipMultiThreadWarning}
-+
++
+ ${lastModGranularityMs}
-+ ${maven.compiler.target}
++ ${maven.compiler.target}
+ ${maven.compiler.useIncrementalCompilation}
+ ${maven.compiler.verbose}
+
+
+
++ help
++ Display help information on maven-compiler-plugin.
++Call mvn compiler:help -Ddetail=true -Dgoal=<goal-name> to display parameter details.
++ false
++ false
++ false
++ false
++ false
++ true
++ org.apache.maven.plugin.compiler.HelpMojo
++ java
++ per-lookup
++ once-per-session
++ true
++
++
++ detail
++ boolean
++ false
++ true
++ Display help information on maven-compiler-plugin.
++Call mvn compiler:help -Ddetail=true -Dgoal=<goal-name> to display parameter details.
++
++
++ goal
++ java.lang.String
++ false
++ true
++ Display help information on maven-compiler-plugin.
++Call mvn compiler:help -Ddetail=true -Dgoal=<goal-name> to display parameter details.
++
++
++ indentSize
++ int
++ false
++ true
++ Display help information on maven-compiler-plugin.
++Call mvn compiler:help -Ddetail=true -Dgoal=<goal-name> to display parameter details.
++
++
++ lineLength
++ int
++ false
++ true
++ Display help information on maven-compiler-plugin.
++Call mvn compiler:help -Ddetail=true -Dgoal=<goal-name> to display parameter details.
++
++
++
++ ${detail}
++ ${goal}
++ ${indentSize}
++ ${lineLength}
++
++
++
+ testCompile
+ Compiles application test sources.
+ test
@@ -556,6 +646,14 @@
+ Compiles application test sources.
+
+
++ implicit
++ java.lang.String
++ 3.10.2
++ false
++ true
++ Compiles application test sources.
++
++
+ jdkToolchain
+ java.util.Map
+ 3.6
@@ -619,6 +717,13 @@
+ Compiles application test sources.
+
+
++ showCompilationChanges
++ boolean
++ false
++ true
++ Compiles application test sources.
++
++
+ showDeprecation
+ boolean
+ false
@@ -699,6 +804,14 @@
+ Compiles application test sources.
+
+
++ testIncrementalExcludes
++ java.util.Set
++ 3.11
++ false
++ true
++ Compiles application test sources.
++
++
+ testRelease
+ java.lang.String
+ 3.6
@@ -731,6 +844,14 @@
+ Compiles application test sources.
+
+
++ useModulePath
++ boolean
++ 3.11
++ false
++ true
++ Compiles application test sources.
++
++
+ verbose
+ boolean
+ false
@@ -754,30 +875,33 @@
+ ${maven.compiler.forceJavacCompilerUse}
+ ${maven.compiler.fork}
+
++ ${maven.compiler.implicit}
+ ${maven.compiler.maxmem}
+ ${maven.compiler.meminitial}
+ ${maven.compiler.optimize}
+ ${maven.compiler.parameters}
+ ${maven.compiler.release}
++ ${maven.compiler.showCompilationChanges}
+ ${maven.compiler.showDeprecation}
-+ ${maven.compiler.showWarnings}
++ ${maven.compiler.showWarnings}
+ ${maven.test.skip}
+ ${maven.compiler.skipMultiThreadWarning}
-+
++
+ ${lastModGranularityMs}
-+ ${maven.compiler.target}
++ ${maven.compiler.target}
+ ${maven.compiler.testRelease}
+ ${maven.compiler.testSource}
+ ${maven.compiler.testTarget}
+ ${maven.compiler.useIncrementalCompilation}
++
+ ${maven.compiler.verbose}
+
+
+
+
---- maven-compiler-plugin-3.10.1/src/main/filtered-resources/META-INF/maven/plugin.xml 1970-01-01 01:00:00.000000000 +0100
-+++ maven-compiler-plugin-3.10.1/src/main/filtered-resources/META-INF/maven/plugin.xml 2022-03-11 11:00:09.386606429 +0100
-@@ -0,0 +1,1026 @@
+--- maven-compiler-plugin-3.11.0/src/main/filtered-resources/META-INF/maven/plugin.xml 1970-01-01 01:00:00.000000000 +0100
++++ maven-compiler-plugin-3.11.0/src/main/filtered-resources/META-INF/maven/plugin.xml 2023-09-13 19:57:10.102691077 +0200
+@@ -0,0 +1,1133 @@
+
+
+ ${project.name}
@@ -848,7 +972,7 @@
+ compileSourceRoots
+ java.util.List
+ true
-+ false
++ true
+ Compiles application sources
+
+
@@ -1006,6 +1130,14 @@
+ Compiles application sources
+
+
++ implicit
++ java.lang.String
++ 3.10.2
++ false
++ true
++ Compiles application test sources.
++
++
+ includes
+ java.util.Set
+ false
@@ -1013,6 +1145,14 @@
+ Compiles application sources
+
+
++ incrementalExcludes
++ java.util.Set
++ 3.11
++ false
++ true
++ Compiles application sources
++
++
+ jdkToolchain
+ java.util.Map
+ 3.6
@@ -1120,6 +1260,13 @@
+ Compiles application test sources.
+
+
++ showCompilationChanges
++ boolean
++ false
++ true
++ Compiles application test sources.
++
++
+ showDeprecation
+ boolean
+ false
@@ -1205,6 +1352,7 @@
+ ${maven.compiler.forceJavacCompilerUse}
+ ${maven.compiler.fork}
+
++ ${maven.compiler.implicit}
+ ${maven.compiler.maxmem}
+ ${maven.compiler.meminitial}
+
@@ -1215,13 +1363,14 @@
+
+ ${maven.compiler.release}
+
++ ${maven.compiler.showCompilationChanges}
+ ${maven.compiler.showDeprecation}
-+ ${maven.compiler.showWarnings}
++ ${maven.compiler.showWarnings}
+ ${maven.main.skip}
+ ${maven.compiler.skipMultiThreadWarning}
-+
++
+ ${lastModGranularityMs}
-+ ${maven.compiler.target}
++ ${maven.compiler.target}
+ ${maven.compiler.useIncrementalCompilation}
+ ${maven.compiler.verbose}
+
@@ -1235,20 +1384,72 @@
+ compilerManager
+
+
-+ org.apache.maven.repository.RepositorySystem
++ org.eclipse.aether.RepositorySystem
+ repositorySystem
+
+
-+ org.apache.maven.artifact.resolver.ResolutionErrorHandler
-+ resolutionErrorHandler
-+
-+
+ org.apache.maven.toolchain.ToolchainManager
+ toolchainManager
+
+
+
+
++ help
++ Display help information on maven-compiler-plugin.<br>
++Call <code>mvn compiler:help -Ddetail=true -Dgoal=<goal-name></code> to display parameter details.
++ false
++ false
++ false
++ false
++ false
++ true
++ org.apache.maven.plugin.compiler.HelpMojo
++ java
++ per-lookup
++ once-per-session
++ true
++
++
++ detail
++ boolean
++ false
++ true
++ Display help information on maven-compiler-plugin.<br>
++Call <code>mvn compiler:help -Ddetail=true -Dgoal=<goal-name></code> to display parameter details.
++
++
++ goal
++ java.lang.String
++ false
++ true
++ Display help information on maven-compiler-plugin.<br>
++Call <code>mvn compiler:help -Ddetail=true -Dgoal=<goal-name></code> to display parameter details.
++
++
++ indentSize
++ int
++ false
++ true
++ Display help information on maven-compiler-plugin.<br>
++Call <code>mvn compiler:help -Ddetail=true -Dgoal=<goal-name></code> to display parameter details.
++
++
++ lineLength
++ int
++ false
++ true
++ Display help information on maven-compiler-plugin.<br>
++Call <code>mvn compiler:help -Ddetail=true -Dgoal=<goal-name></code> to display parameter details.
++
++
++
++ ${detail}
++ ${goal}
++ ${indentSize}
++ ${lineLength}
++
++
++
+ testCompile
+ Compiles application test sources.
+ test
@@ -1451,6 +1652,14 @@
+ Compiles application test sources.
+
+
++ implicit
++ java.lang.String
++ 3.10.2
++ false
++ true
++ Compiles application test sources.
++
++
+ jdkToolchain
+ java.util.Map
+ 3.6
@@ -1543,6 +1752,13 @@
+ Compiles application test sources.
+
+
++ showCompilationChanges
++ boolean
++ false
++ true
++ Compiles application test sources.
++
++
+ showDeprecation
+ boolean
+ false
@@ -1623,6 +1839,14 @@
+ Compiles application test sources.
+
+
++ testIncrementalExcludes
++ java.util.Set
++ 3.11
++ false
++ true
++ Compiles application test sources.
++
++
+ testPath
+ java.util.List
+ false
@@ -1662,6 +1886,14 @@
+ Compiles application test sources.
+
+
++ useModulePath
++ boolean
++ 3.11
++ false
++ true
++ Compiles application test sources.
++
++
+ verbose
+ boolean
+ false
@@ -1688,6 +1920,7 @@
+ ${maven.compiler.forceJavacCompilerUse}
+ ${maven.compiler.fork}
+
++ ${maven.compiler.implicit}
+ ${maven.compiler.maxmem}
+ ${maven.compiler.meminitial}
+
@@ -1697,18 +1930,20 @@
+
+ ${maven.compiler.release}
+
++ ${maven.compiler.showCompilationChanges}
+ ${maven.compiler.showDeprecation}
-+ ${maven.compiler.showWarnings}
++ ${maven.compiler.showWarnings}
+ ${maven.test.skip}
+ ${maven.compiler.skipMultiThreadWarning}
-+
++
+ ${lastModGranularityMs}
-+ ${maven.compiler.target}
++ ${maven.compiler.target}
+
+ ${maven.compiler.testRelease}
+ ${maven.compiler.testSource}
+ ${maven.compiler.testTarget}
+ ${maven.compiler.useIncrementalCompilation}
++
+ ${maven.compiler.verbose}
+
+
@@ -1721,14 +1956,10 @@
+ compilerManager
+
+
-+ org.apache.maven.repository.RepositorySystem
++ org.eclipse.aether.RepositorySystem
+ repositorySystem
+
+
-+ org.apache.maven.artifact.resolver.ResolutionErrorHandler
-+ resolutionErrorHandler
-+
-+
+ org.apache.maven.toolchain.ToolchainManager
+ toolchainManager
+
@@ -1740,13 +1971,13 @@
+ org.codehaus.plexus
+ plexus-utils
+ jar
-+ 3.3.0
++ 4.0.0
+
+
+ org.codehaus.plexus
+ plexus-component-annotations
+ jar
-+ 1.5.5
++ 2.1.0
+
+
+ org.apache.maven.shared
@@ -1758,7 +1989,7 @@
+ commons-io
+ commons-io
+ jar
-+ 2.5
++ 2.6
+
+
+ org.apache.maven.shared
@@ -1770,7 +2001,7 @@
+ org.codehaus.plexus
+ plexus-java
+ jar
-+ 1.1.1
++ 1.1.2
+
+
+ org.ow2.asm
@@ -1782,25 +2013,25 @@
+ com.thoughtworks.qdox
+ qdox
+ jar
-+ 2.0.1
++ 2.0.3
+
+
+ org.codehaus.plexus
+ plexus-compiler-api
+ jar
-+ 2.11.1
++ 2.13.0
+
+
+ org.codehaus.plexus
+ plexus-compiler-manager
+ jar
-+ 2.11.1
++ 2.13.0
+
+
+ org.codehaus.plexus
+ plexus-compiler-javac
+ jar
-+ 2.11.1
++ 2.13.0
+
+
+
diff --git a/maven-compiler-plugin-build.xml b/maven-compiler-plugin-build.xml
index 446d493..e6d7460 100644
--- a/maven-compiler-plugin-build.xml
+++ b/maven-compiler-plugin-build.xml
@@ -14,10 +14,10 @@
value="The Compiler Plugin is used to compile the sources of your project."/>
-
+
-
+
@@ -237,9 +237,7 @@
excludes="**/package.html">
-
-
diff --git a/maven-compiler-plugin.spec b/maven-compiler-plugin.spec
index d46d0e5..2c70eb4 100644
--- a/maven-compiler-plugin.spec
+++ b/maven-compiler-plugin.spec
@@ -1,7 +1,7 @@
#
# spec file
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -23,7 +23,7 @@
%bcond_with bootstrap
%endif
%global base_name maven-compiler-plugin
-Version: 3.10.1
+Version: 3.11.0
Release: 0
Summary: Maven Compiler Plugin
License: Apache-2.0
@@ -52,13 +52,23 @@ BuildRequires: ant
Name: %{base_name}
BuildRequires: fdupes
BuildRequires: xmvn
+BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
BuildRequires: mvn(org.apache.maven.plugins:maven-compiler-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-jar-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-javadoc-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
+BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:)
BuildRequires: mvn(org.apache.maven.plugins:maven-resources-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-surefire-plugin)
-BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata)
+BuildRequires: mvn(org.apache.maven.shared:maven-shared-incremental)
+BuildRequires: mvn(org.apache.maven.shared:maven-shared-utils)
+BuildRequires: mvn(org.apache.maven:maven-artifact)
+BuildRequires: mvn(org.apache.maven:maven-core)
+BuildRequires: mvn(org.apache.maven:maven-plugin-api)
+BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-api) >= 2.13
+BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-javac) >= 2.13
+BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-manager) >= 2.13
+BuildRequires: mvn(org.codehaus.plexus:plexus-java)
Obsoletes: %{base_name}-bootstrap
#!BuildRequires: maven-compiler-plugin-bootstrap
#!BuildRequires: maven-jar-plugin-bootstrap
@@ -89,6 +99,9 @@ cp %{SOURCE1} build.xml
%pom_remove_dep :::test
+# There is nothing to index and this creates a cycle
+%pom_remove_plugin org.eclipse.sisu:sisu-maven-plugin
+
%pom_xpath_remove pom:project/pom:parent/pom:relativePath
%build
@@ -112,7 +125,7 @@ build-jar-repository -s lib \
xmvn --batch-mode --offline \
-Dmaven.test.skip=true \
%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
- -Dmaven.compiler.release=7 \
+ -Dmaven.compiler.release=8 \
%endif
package org.apache.maven.plugins:maven-javadoc-plugin:aggregate
%endif