diff --git a/maven-plugin-plugin-bootstrap-resouces.patch b/maven-plugin-plugin-bootstrap-resouces.patch index 32f6c3d..1699b98 100644 --- a/maven-plugin-plugin-bootstrap-resouces.patch +++ b/maven-plugin-plugin-bootstrap-resouces.patch @@ -1,7 +1,10 @@ --- maven-plugin-plugin/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-plugin-plugin/plugin-help.xml 1970-01-01 01:00:00.000000000 +0100 -+++ maven-plugin-plugin/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-plugin-plugin/plugin-help.xml 2023-09-22 17:01:23.758467077 +0200 -@@ -0,0 +1,345 @@ ++++ maven-plugin-plugin/src/main/filtered-resources/META-INF/maven/org.apache.maven.plugins/maven-plugin-plugin/plugin-help.xml 2024-05-15 12:12:45.836896057 +0200 +@@ -0,0 +1,348 @@ + ++ ++ ++ + + ${project.name} + ${project.description} @@ -112,7 +115,7 @@ + false + true + Creates links to existing external javadoc-generated documentation. -+Notes: all given links should have a fetchable /package-list or /element-list file. For instance: <externalJavadocBaseUrls> <externalJavadocBaseUrl>https://docs.oracle.com/javase/8/docs/api/</externalJavadocBaseUrl> <externalJavadocBaseUrls> is valid because https://docs.oracle.com/javase/8/docs/api/package-list exists. See link option of the javadoc tool <https://docs.oracle.com/en/java/javase/17/docs/specs/man/javadoc.html#standard-doclet-options>. Using this parameter requires connectivity to the given URLs during the goal execution. ++Notes: all given links should have a fetchable /package-list or /element-list file. For instance: <externalJavadocBaseUrls> <externalJavadocBaseUrl>https://docs.oracle.com/javase/8/docs/api/</externalJavadocBaseUrl> </externalJavadocBaseUrls> is valid because https://docs.oracle.com/javase/8/docs/api/package-list exists. See link option of the javadoc tool <https://docs.oracle.com/en/java/javase/17/docs/specs/man/javadoc.html#standard-doclet-options>. Using this parameter requires connectivity to the given URLs during the goal execution. + + + extractors @@ -175,7 +178,7 @@ + false + true + The required Java version to set in the plugin descriptor. This is evaluated by Maven 4 and ignored by earlier Maven versions. Can be either one of the following formats: -+* A version range which specifies the supported Java versions. It can either use the usual mathematical syntax like "[2.0.10,2.1.0),[3.0,)" or use a single version like "2.2.1". The latter is a short form for "[2.2.1,)", i.e. denotes the minimum version required. ++* A version range which specifies the supported Java versions. It can either use the usual mathematical syntax like "[1.7,9),[11,)" or use a single version like "1.8". The latter is a short form for "[1.8,)", i.e. denotes the minimum version required. +* "auto" to determine the minimum Java version from the binary class version being generated during compilation (determined by the extractor). + + @@ -347,9 +350,12 @@ + + --- maven-plugin-plugin/src/main/filtered-resources/META-INF/maven/plugin.xml 1970-01-01 01:00:00.000000000 +0100 -+++ maven-plugin-plugin/src/main/filtered-resources/META-INF/maven/plugin.xml 2023-09-22 17:02:25.238892040 +0200 -@@ -0,0 +1,618 @@ ++++ maven-plugin-plugin/src/main/filtered-resources/META-INF/maven/plugin.xml 2024-05-15 12:12:16.933350354 +0200 +@@ -0,0 +1,610 @@ + ++ ++ ++ + + ${project.name} + ${project.description} @@ -359,6 +365,8 @@ + plugin + false + true ++ 1.8 ++ 3.6.3 + + + addPluginArtifactMetadata @@ -388,13 +396,6 @@ + The prefix for the plugin goal. + + -+ project -+ org.apache.maven.project.MavenProject -+ false -+ false -+ The project artifact, which should have the latest metadata added to it. -+ -+ + skip + boolean + 2.8 @@ -404,9 +405,18 @@ + + + -+ + ${maven.plugin.skip} + ++ ++ ++ org.apache.maven.project.MavenProject ++ project ++ ++ ++ org.apache.maven.rtinfo.RuntimeInformation ++ runtimeInformation ++ ++ + + + descriptor @@ -470,7 +480,7 @@ + false + true + Creates links to existing external javadoc-generated documentation. -+Notes: all given links should have a fetchable /package-list or /element-list file. For instance: <externalJavadocBaseUrls> <externalJavadocBaseUrl>https://docs.oracle.com/javase/8/docs/api/</externalJavadocBaseUrl> <externalJavadocBaseUrls> is valid because https://docs.oracle.com/javase/8/docs/api/package-list exists. See link option of the javadoc tool <https://docs.oracle.com/en/java/javase/17/docs/specs/man/javadoc.html#standard-doclet-options>. Using this parameter requires connectivity to the given URLs during the goal execution. ++Notes: all given links should have a fetchable /package-list or /element-list file. For instance: <externalJavadocBaseUrls> <externalJavadocBaseUrl>https://docs.oracle.com/javase/8/docs/api/</externalJavadocBaseUrl> </externalJavadocBaseUrls> is valid because https://docs.oracle.com/javase/8/docs/api/package-list exists. See link option of the javadoc tool <https://docs.oracle.com/en/java/javase/17/docs/specs/man/javadoc.html#standard-doclet-options>. Using this parameter requires connectivity to the given URLs during the goal execution. + + + extractors @@ -534,27 +544,13 @@ + Maven plugin packaging types. Default is single "maven-plugin". + + -+ project -+ org.apache.maven.project.MavenProject -+ false -+ false -+ The project currently being built. -+ -+ -+ repoSession -+ org.eclipse.aether.RepositorySystemSession -+ true -+ false -+ -+ -+ + requiredJavaVersion + java.lang.String + 3.8.0 + false + true + The required Java version to set in the plugin descriptor. This is evaluated by Maven 4 and ignored by earlier Maven versions. Can be either one of the following formats: -+* A version range which specifies the supported Java versions. It can either use the usual mathematical syntax like "[2.0.10,2.1.0),[3.0,)" or use a single version like "2.2.1". The latter is a short form for "[2.2.1,)", i.e. denotes the minimum version required. ++* A version range which specifies the supported Java versions. It can either use the usual mathematical syntax like "[1.7,9),[11,)" or use a single version like "1.8". The latter is a short form for "[1.8,)", i.e. denotes the minimum version required. +* "auto" to determine the minimum Java version from the binary class version being generated during compilation (determined by the extractor). + + @@ -568,14 +564,6 @@ +* "auto" to determine the minimum Maven version from the POM's Maven prerequisite, or if not set the referenced Maven Plugin API version. This value takes precedence over the POM's Maven prerequisite <https://maven.apache.org/pom.html#Prerequisites> in Maven 4. + + -+ settings -+ org.apache.maven.settings.Settings -+ 3.7.0 -+ true -+ false -+ The Maven Settings, for evaluating proxy settings used to access #javadocLinks -+ -+ + skip + boolean + 2.8 @@ -607,11 +595,8 @@ + ${internalJavadocBaseUrl} + ${internalJavadocVersion} + -+ -+ + + -+ + ${maven.plugin.skip} + + ${maven.plugin.skipErrorNoDescriptorsFound} @@ -622,9 +607,17 @@ + buildContext + + ++ org.apache.maven.execution.MavenSession ++ mavenSession ++ ++ + org.apache.maven.tools.plugin.scanner.MojoScanner + mojoScanner + ++ ++ org.apache.maven.project.MavenProject ++ project ++ + + + @@ -732,13 +725,6 @@ + Maven plugin packaging types. Default is single "maven-plugin". + + -+ project -+ org.apache.maven.project.MavenProject -+ false -+ false -+ The project currently being built. -+ -+ + skip + boolean + 2.8 @@ -749,11 +735,14 @@ + + + -+ + ${maven.plugin.skip} + + + ++ org.apache.maven.project.MavenProject ++ project ++ ++ + org.codehaus.plexus.velocity.VelocityComponent + velocity + @@ -768,16 +757,28 @@ + 1.7.36 + + ++ org.apache.commons ++ commons-lang3 ++ jar ++ 3.12.0 ++ ++ + javax.inject + javax.inject + jar + 1 + + ++ org.codehaus.plexus ++ plexus-xml ++ jar ++ 3.0.0 ++ ++ + org.apache.maven.plugin-tools + maven-plugin-tools-api + jar -+ 3.9.0 ++ 3.13.0 + + + org.apache.maven.wagon @@ -789,7 +790,7 @@ + org.codehaus.plexus + plexus-java + jar -+ 1.1.2 ++ 1.2.0 + + + org.apache.httpcomponents @@ -801,49 +802,13 @@ + commons-logging + commons-logging + jar -+ any ++ 1.2 + + + commons-codec + commons-codec + jar -+ any -+ -+ -+ org.apache.httpcomponents -+ httpcore -+ jar -+ 4.4.16 -+ -+ -+ org.apache.maven.plugin-tools -+ maven-plugin-tools-generators -+ jar -+ 3.9.0 -+ -+ -+ org.ow2.asm -+ asm -+ jar -+ 9.5 -+ -+ -+ org.ow2.asm -+ asm-commons -+ jar -+ 9.5 -+ -+ -+ org.ow2.asm -+ asm-tree -+ jar -+ 9.5 -+ -+ -+ org.jsoup -+ jsoup -+ jar -+ 1.16.1 ++ 1.11 + + + org.apache.maven.reporting @@ -861,7 +826,43 @@ + org.apache.maven.doxia + doxia-logging-api + jar -+ 1.9.1 ++ 1.12.0 ++ ++ ++ org.apache.httpcomponents ++ httpcore ++ jar ++ 4.4.16 ++ ++ ++ org.apache.maven.plugin-tools ++ maven-plugin-tools-generators ++ jar ++ 3.13.0 ++ ++ ++ org.ow2.asm ++ asm ++ jar ++ 9.7 ++ ++ ++ org.ow2.asm ++ asm-commons ++ jar ++ 9.7 ++ ++ ++ org.ow2.asm ++ asm-tree ++ jar ++ 9.7 ++ ++ ++ org.jsoup ++ jsoup ++ jar ++ 1.17.2 + + + org.apache.velocity @@ -870,46 +871,40 @@ + 1.7 + + -+ commons-lang -+ commons-lang -+ jar -+ 2.4 -+ -+ + org.apache.maven.plugin-tools + maven-plugin-tools-java + jar -+ 3.9.0 ++ 3.13.0 + + + com.thoughtworks.qdox + qdox + jar -+ 2.0.3 ++ 2.1.0 + + + org.apache.maven.plugin-tools + maven-plugin-tools-annotations + jar -+ 3.9.0 ++ 3.13.0 + + + org.ow2.asm + asm-util + jar -+ 9.5 ++ 9.7 + + + org.ow2.asm + asm-analysis + jar -+ 9.5 ++ 9.7 + + + org.codehaus.plexus + plexus-archiver + jar -+ 4.7.1 ++ 4.9.2 + + + org.codehaus.plexus @@ -939,13 +934,13 @@ + org.apache.maven.plugin-tools + maven-plugin-annotations + jar -+ 3.9.0 ++ 3.13.0 + + + org.codehaus.plexus + plexus-utils + jar -+ 3.5.1 ++ 4.0.1 + + + org.codehaus.plexus @@ -967,8 +962,8 @@ + + + ---- maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpMojo.java 1970-01-01 01:00:00.000000000 +0100 -+++ maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpMojo.java 2023-09-22 16:49:32.513552812 +0200 +--- maven-plugin-plugin/src/main/java/org/apache/maven/plugins/maven_plugin_plugin/HelpMojo.java 1970-01-01 01:00:00.000000000 +0100 ++++ maven-plugin-plugin/src/main/java/org/apache/maven/plugins/maven_plugin_plugin/HelpMojo.java 2024-05-15 12:11:33.063028019 +0200 @@ -0,0 +1,448 @@ +package org.apache.maven.plugins.maven_plugin_plugin; + diff --git a/maven-plugin-plugin-bootstrap.changes b/maven-plugin-plugin-bootstrap.changes index bf25f3a..b2990b1 100644 --- a/maven-plugin-plugin-bootstrap.changes +++ b/maven-plugin-plugin-bootstrap.changes @@ -1,3 +1,75 @@ +------------------------------------------------------------------- +Wed May 15 11:37:24 UTC 2024 - Fridrich Strba + +- Upgrade to upstream version 3.13.0 +- Changes of version 3.13.0 + * Bug + + MPLUGIN-517: GoalRenderer renderParameterDetails() renders in + wrong order + + MPLUGIN-521: Nested types not properly extracted cause + exception while generating Javadoc URLs + * Improvement + + MPLUGIN-520: Get rid of maven-compat classes use + * Dependency upgrade + + MPLUGIN-516: Upgrade asmVersion from 9.6 to 9.7 + + MPLUGIN-519: Update to Parent POM 42, prerequisite 3.6.3 +- Changes of version 3.12.0 + * Improvement + + MPLUGIN-510: update plugin system requirements history + structure + + MPLUGIN-511: create and share tooling to detect plugin + prerequisites history + + MPLUGIN-514: switch dependency schema from png + imagemap to + svg, and update +- Changes of version 3.11.0 + * Bug + + MPLUGIN-496: Translation for keys report.plugin.goal.yes,no + are missing + + MPLUGIN-499: Deprecate descriptions are missing in description + table + * Improvement + + MPLUGIN-450: Make goal prefix mandatory by default + + MPLUGIN-474: Improve descriptor docs for requiredJavaVersion + + MPLUGIN-492: Documentation for plugins in general: Goals + comprises more than that + + MPLUGIN-495: WARNINGs based on usage of @Component for + MavenSession/MavenProject instead of @Parameter + * Task + + MPLUGIN-493: Consistently evaluate skip parameter in + MavenReport#canGenerateReport() + + MPLUGIN-498: Move section rendering to separate methods + * Dependency upgrade + + MPLUGIN-494: Upgrade to Parent 41 + + MPLUGIN-497: Upgrade components +- Changes of version 3.10.2 + * Bug + + MPLUGIN-484: Downgrade plexus-xml to 3.0.0 + * Dependency upgrade + + MPLUGIN-485: Upgrade Parent to 40 + + MPLUGIN-487: Bump org.codehaus.plexus:plexus-java from 1.1.2 + to 1.2.0 + + MPLUGIN-488: Bump asmVersion from 9.5 to 9.6 + + MPLUGIN-489: Bump antVersion from 1.10.13 to 1.10.14 + + MPLUGIN-490: Bump org.jsoup:jsoup from 1.16.1 to 1.16.2 + + MPLUGIN-491: Bump org.codehaus.plexus:plexus-testing from + 1.1.0 to 1.2.0 +- Changes of version 3.10.1 + * Bug + + MPLUGIN-482: JavadocSite.createLink() does not consider + implicit module path prefix + * Improvement + + MPLUGIN-442: Rewrite plugin goal documentation generation to + use supplied sink instead of direct Xdoc + + MPLUGIN-475: Upgrade to plexus-utils / plexus-xml 4.0.0 + + MPLUGIN-477: Don't add a stray period + * Dependency upgrade + + MPLUGIN-478: Upgrade org.junit:junit-bom from 5.9.3 to 5.10.0 + + MPLUGIN-479: Bump org.codehaus.plexus:plexus-archiver from + 4.7.1 to 4.8.0 +- Modified patch: + * maven-plugin-plugin-bootstrap-resouces.patch + + regenerate with itself + ------------------------------------------------------------------- Wed May 1 12:36:18 UTC 2024 - Fridrich Strba diff --git a/maven-plugin-plugin-bootstrap.spec b/maven-plugin-plugin-bootstrap.spec index 6b8d55e..b1bf260 100644 --- a/maven-plugin-plugin-bootstrap.spec +++ b/maven-plugin-plugin-bootstrap.spec @@ -19,7 +19,7 @@ %global base_name maven-plugin-tools %global artifactId maven-plugin-plugin Name: %{artifactId}-bootstrap -Version: 3.9.0 +Version: 3.13.0 Release: 0 Summary: Maven Plugin Plugin License: Apache-2.0 @@ -33,24 +33,19 @@ Patch0: 0002-Remove-dependency-on-jtidy.patch # We generated those ones outside the rpm build for a bootstrap package. Patch20: maven-plugin-plugin-bootstrap-resouces.patch BuildRequires: ant -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 BuildRequires: maven-lib BuildRequires: maven-plugin-annotations +BuildRequires: maven-plugin-tools-annotations BuildRequires: maven-plugin-tools-api BuildRequires: maven-plugin-tools-generators BuildRequires: maven-resolver-api +BuildRequires: maven-resolver-util BuildRequires: plexus-build-api0 BuildRequires: plexus-utils BuildRequires: plexus-velocity -BuildRequires: plexus-xml -BuildRequires: sisu-inject BuildRequires: sisu-plexus BuildRequires: unzip -BuildRequires: xmvn-install -BuildRequires: xmvn-resolve -BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-tools-annotations) -BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-tools-java) -BuildRequires: mvn(org.apache.maven:maven-parent:pom:) BuildArch: noarch %description @@ -70,19 +65,10 @@ artifact metadata and a generic help goal. UTF-8 UTF-8" -# Remove test dependencies because tests are skipped anyways. -%pom_xpath_remove "pom:dependency[pom:scope='test']" - -for i in maven-plugin-report-plugin maven-plugin-tools-annotations maven-plugin-tools-api maven-plugin-tools-generators maven-script; do - %pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 ${i} -done - %pom_remove_dep org.junit:junit-bom %pom_remove_dep :maven-plugin-tools-ant maven-plugin-plugin %pom_remove_dep :maven-plugin-tools-beanshell maven-plugin-plugin -%{mvn_package} :maven-plugin-tools __noinstall - %build mkdir -p lib build-jar-repository -s lib \ @@ -96,11 +82,10 @@ build-jar-repository -s lib \ maven-plugin-tools/maven-plugin-tools-api \ maven-plugin-tools/maven-plugin-tools-generators \ maven-resolver/maven-resolver-api \ - org.eclipse.sisu.inject \ + maven-resolver/maven-resolver-util \ org.eclipse.sisu.plexus \ plexus/plexus-build-api0 \ plexus/utils \ - plexus/xml \ plexus-velocity/plexus-velocity %{mvn_file} :%{artifactId} %{base_name}/%{artifactId} @@ -109,11 +94,15 @@ pushd %{artifactId} -Dtest.skip=true \ jar popd -%{mvn_artifact} pom.xml -%{mvn_artifact} %{artifactId}/pom.xml %{artifactId}/target/%{artifactId}-%{version}.jar %install -%mvn_install +# jar +install -dm 0755 %{buildroot}%{_javadir}/%{base_name} +install -pm 0644 %{artifactId}/target/%{artifactId}-%{version}.jar %{buildroot}%{_javadir}/%{base_name}/%{artifactId}.jar +# pom +install -dm 0755 %{buildroot}%{_mavenpomdir}/%{base_name} +%mvn_install_pom %{artifactId}/pom.xml %{buildroot}%{_mavenpomdir}/%{base_name}/%{artifactId}.pom +%add_maven_depmap %{base_name}/%{artifactId}.pom %{base_name}/%{artifactId}.jar %files -f .mfiles %license LICENSE NOTICE diff --git a/maven-plugin-plugin.changes b/maven-plugin-plugin.changes index ed0eafd..840acdc 100644 --- a/maven-plugin-plugin.changes +++ b/maven-plugin-plugin.changes @@ -1,3 +1,72 @@ +------------------------------------------------------------------- +Wed May 15 11:37:24 UTC 2024 - Fridrich Strba + +- Upgrade to upstream version 3.13.0 +- Changes of version 3.13.0 + * Bug + + MPLUGIN-517: GoalRenderer renderParameterDetails() renders in + wrong order + + MPLUGIN-521: Nested types not properly extracted cause + exception while generating Javadoc URLs + * Improvement + + MPLUGIN-520: Get rid of maven-compat classes use + * Dependency upgrade + + MPLUGIN-516: Upgrade asmVersion from 9.6 to 9.7 + + MPLUGIN-519: Update to Parent POM 42, prerequisite 3.6.3 +- Changes of version 3.12.0 + * Improvement + + MPLUGIN-510: update plugin system requirements history + structure + + MPLUGIN-511: create and share tooling to detect plugin + prerequisites history + + MPLUGIN-514: switch dependency schema from png + imagemap to + svg, and update +- Changes of version 3.11.0 + * Bug + + MPLUGIN-496: Translation for keys report.plugin.goal.yes,no + are missing + + MPLUGIN-499: Deprecate descriptions are missing in description + table + * Improvement + + MPLUGIN-450: Make goal prefix mandatory by default + + MPLUGIN-474: Improve descriptor docs for requiredJavaVersion + + MPLUGIN-492: Documentation for plugins in general: Goals + comprises more than that + + MPLUGIN-495: WARNINGs based on usage of @Component for + MavenSession/MavenProject instead of @Parameter + * Task + + MPLUGIN-493: Consistently evaluate skip parameter in + MavenReport#canGenerateReport() + + MPLUGIN-498: Move section rendering to separate methods + * Dependency upgrade + + MPLUGIN-494: Upgrade to Parent 41 + + MPLUGIN-497: Upgrade components +- Changes of version 3.10.2 + * Bug + + MPLUGIN-484: Downgrade plexus-xml to 3.0.0 + * Dependency upgrade + + MPLUGIN-485: Upgrade Parent to 40 + + MPLUGIN-487: Bump org.codehaus.plexus:plexus-java from 1.1.2 + to 1.2.0 + + MPLUGIN-488: Bump asmVersion from 9.5 to 9.6 + + MPLUGIN-489: Bump antVersion from 1.10.13 to 1.10.14 + + MPLUGIN-490: Bump org.jsoup:jsoup from 1.16.1 to 1.16.2 + + MPLUGIN-491: Bump org.codehaus.plexus:plexus-testing from + 1.1.0 to 1.2.0 +- Changes of version 3.10.1 + * Bug + + MPLUGIN-482: JavadocSite.createLink() does not consider + implicit module path prefix + * Improvement + + MPLUGIN-442: Rewrite plugin goal documentation generation to + use supplied sink instead of direct Xdoc + + MPLUGIN-475: Upgrade to plexus-utils / plexus-xml 4.0.0 + + MPLUGIN-477: Don't add a stray period + * Dependency upgrade + + MPLUGIN-478: Upgrade org.junit:junit-bom from 5.9.3 to 5.10.0 + + MPLUGIN-479: Bump org.codehaus.plexus:plexus-archiver from + 4.7.1 to 4.8.0 + ------------------------------------------------------------------- Tue Apr 2 17:29:28 UTC 2024 - Fridrich Strba diff --git a/maven-plugin-plugin.spec b/maven-plugin-plugin.spec index 6bbd1d9..716abfe 100644 --- a/maven-plugin-plugin.spec +++ b/maven-plugin-plugin.spec @@ -18,7 +18,7 @@ %global base_name maven-plugin-tools Name: maven-plugin-plugin -Version: 3.9.0 +Version: 3.13.0 Release: 0 Summary: Maven Plugin Plugin License: Apache-2.0 @@ -31,9 +31,7 @@ BuildRequires: maven-local BuildRequires: unzip BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-tools-annotations) -BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-tools-ant) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-tools-api) -BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-tools-beanshell) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-tools-generators) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-tools-java) BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) @@ -45,7 +43,6 @@ BuildRequires: mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.apache.maven:maven-repository-metadata) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.codehaus.plexus:plexus-velocity) -BuildRequires: mvn(org.codehaus.plexus:plexus-xml) BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus) BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) Obsoletes: %{name}-bootstrap @@ -74,18 +71,12 @@ API documentation for %{name}. %patch -P 0 -p1 %pom_remove_plugin -r :maven-enforcer-plugin +%pom_remove_plugin :sisu-maven-plugin %pom_xpath_inject "pom:project/pom:properties" " UTF-8 UTF-8" -# Remove test dependencies because tests are skipped anyways. -%pom_xpath_remove "pom:dependency[pom:scope='test']" - -for i in maven-plugin-report-plugin maven-plugin-tools-annotations maven-plugin-tools-api maven-plugin-tools-generators maven-script; do - %pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 ${i} -done - %pom_remove_dep org.junit:junit-bom %pom_remove_dep :maven-plugin-tools-ant maven-plugin-plugin %pom_remove_dep :maven-plugin-tools-beanshell maven-plugin-plugin diff --git a/maven-plugin-tools-3.13.0-source-release.zip b/maven-plugin-tools-3.13.0-source-release.zip new file mode 100644 index 0000000..c5dfce5 --- /dev/null +++ b/maven-plugin-tools-3.13.0-source-release.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8e5fd3cf41b999b6a586f02cb2073e010d266769f82898ea67e5996cbe05937d +size 2001622 diff --git a/maven-plugin-tools-3.9.0-source-release.zip b/maven-plugin-tools-3.9.0-source-release.zip deleted file mode 100644 index 5b9bc47..0000000 --- a/maven-plugin-tools-3.9.0-source-release.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cd6aecc881ea3cc28d8d31f1db42d84dc124672dd2d98c0758fd879f5d77c982 -size 1920005 diff --git a/maven-plugin-tools-build.tar.xz b/maven-plugin-tools-build.tar.xz index 86d2c2f..b3d2ef6 100644 --- a/maven-plugin-tools-build.tar.xz +++ b/maven-plugin-tools-build.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:22fb3a1f61dcbdc267625510f31f59f69c37c1f18508d6a6c25e8dba995ebf4e -size 4724 +oid sha256:fe6e66e5a9e9b2080536520b8c0e40fa5cf315dd655c2e0eb0be38204899b971 +size 4872 diff --git a/maven-plugin-tools.changes b/maven-plugin-tools.changes index e3657b2..40bb9ec 100644 --- a/maven-plugin-tools.changes +++ b/maven-plugin-tools.changes @@ -1,3 +1,72 @@ +------------------------------------------------------------------- +Wed May 15 11:37:24 UTC 2024 - Fridrich Strba + +- Upgrade to upstream version 3.13.0 +- Changes of version 3.13.0 + * Bug + + MPLUGIN-517: GoalRenderer renderParameterDetails() renders in + wrong order + + MPLUGIN-521: Nested types not properly extracted cause + exception while generating Javadoc URLs + * Improvement + + MPLUGIN-520: Get rid of maven-compat classes use + * Dependency upgrade + + MPLUGIN-516: Upgrade asmVersion from 9.6 to 9.7 + + MPLUGIN-519: Update to Parent POM 42, prerequisite 3.6.3 +- Changes of version 3.12.0 + * Improvement + + MPLUGIN-510: update plugin system requirements history + structure + + MPLUGIN-511: create and share tooling to detect plugin + prerequisites history + + MPLUGIN-514: switch dependency schema from png + imagemap to + svg, and update +- Changes of version 3.11.0 + * Bug + + MPLUGIN-496: Translation for keys report.plugin.goal.yes,no + are missing + + MPLUGIN-499: Deprecate descriptions are missing in description + table + * Improvement + + MPLUGIN-450: Make goal prefix mandatory by default + + MPLUGIN-474: Improve descriptor docs for requiredJavaVersion + + MPLUGIN-492: Documentation for plugins in general: Goals + comprises more than that + + MPLUGIN-495: WARNINGs based on usage of @Component for + MavenSession/MavenProject instead of @Parameter + * Task + + MPLUGIN-493: Consistently evaluate skip parameter in + MavenReport#canGenerateReport() + + MPLUGIN-498: Move section rendering to separate methods + * Dependency upgrade + + MPLUGIN-494: Upgrade to Parent 41 + + MPLUGIN-497: Upgrade components +- Changes of version 3.10.2 + * Bug + + MPLUGIN-484: Downgrade plexus-xml to 3.0.0 + * Dependency upgrade + + MPLUGIN-485: Upgrade Parent to 40 + + MPLUGIN-487: Bump org.codehaus.plexus:plexus-java from 1.1.2 + to 1.2.0 + + MPLUGIN-488: Bump asmVersion from 9.5 to 9.6 + + MPLUGIN-489: Bump antVersion from 1.10.13 to 1.10.14 + + MPLUGIN-490: Bump org.jsoup:jsoup from 1.16.1 to 1.16.2 + + MPLUGIN-491: Bump org.codehaus.plexus:plexus-testing from + 1.1.0 to 1.2.0 +- Changes of version 3.10.1 + * Bug + + MPLUGIN-482: JavadocSite.createLink() does not consider + implicit module path prefix + * Improvement + + MPLUGIN-442: Rewrite plugin goal documentation generation to + use supplied sink instead of direct Xdoc + + MPLUGIN-475: Upgrade to plexus-utils / plexus-xml 4.0.0 + + MPLUGIN-477: Don't add a stray period + * Dependency upgrade + + MPLUGIN-478: Upgrade org.junit:junit-bom from 5.9.3 to 5.10.0 + + MPLUGIN-479: Bump org.codehaus.plexus:plexus-archiver from + 4.7.1 to 4.8.0 + ------------------------------------------------------------------- Tue Apr 2 17:29:34 UTC 2024 - Fridrich Strba diff --git a/maven-plugin-tools.spec b/maven-plugin-tools.spec index 12055ef..d968c08 100644 --- a/maven-plugin-tools.spec +++ b/maven-plugin-tools.spec @@ -17,7 +17,7 @@ Name: maven-plugin-tools -Version: 3.9.0 +Version: 3.13.0 Release: 0 Summary: Maven Plugin Tools License: Apache-2.0 @@ -40,12 +40,11 @@ BuildRequires: maven-reporting-api BuildRequires: maven-resolver-api BuildRequires: maven-wagon-provider-api BuildRequires: modello >= 2.0.0 -BuildRequires: objectweb-asm >= 9.5 +BuildRequires: objectweb-asm >= 9.7 BuildRequires: plexus-ant-factory BuildRequires: plexus-archiver BuildRequires: plexus-bsh-factory BuildRequires: plexus-classworlds -BuildRequires: plexus-containers-component-annotations BuildRequires: plexus-languages BuildRequires: plexus-utils BuildRequires: plexus-velocity @@ -156,15 +155,8 @@ API documentation for %{name}. UTF-8 UTF-8" -# Remove test dependencies because tests are skipped anyways. -%pom_xpath_remove "pom:dependency[pom:scope='test']" - %pom_remove_dep net.sf.jtidy:jtidy maven-plugin-tools-generators -for i in maven-plugin-report-plugin maven-plugin-tools-annotations maven-plugin-tools-api maven-plugin-tools-generators maven-script; do - %pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 ${i} -done - %build mkdir -p lib build-jar-repository -s lib \ @@ -191,7 +183,6 @@ build-jar-repository -s lib \ plexus/archiver \ plexus/bsh-factory \ plexus-classworlds \ - plexus-containers/plexus-component-annotations \ plexus-languages/plexus-java \ plexus/utils \ plexus/xml \