Accepting request 1294854 from Java:packages

reproducible: another solution

OBS-URL: https://build.opensuse.org/request/show/1294854
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/maven-archetype?expand=0&rev=12

0001-Avoid-reliance-on-groovy.patch

@@ -1,73 +1,110 @@
-From b3fb162b5d01b352511a56393cf1c16294601e9e Mon Sep 17 00:00:00 2001
+From a2bb8e7fe0d80943ab561343b0ab14de08f84b1b Mon Sep 17 00:00:00 2001
 From: Mat Booth <mat.booth@redhat.com>
 Date: Thu, 9 Jul 2020 17:13:18 +0100
-Subject: [PATCH 1/3] Avoid reliance on groovy
+Subject: [PATCH 1/2] Avoid reliance on groovy
 
 ---
- archetype-common/pom.xml                      |  6 -----
- .../DefaultFilesetArchetypeGenerator.java     | 23 +------------------
- 2 files changed, 1 insertion(+), 28 deletions(-)
+ archetype-common/pom.xml                      | 26 -------------------
+ .../DefaultFilesetArchetypeGenerator.java     | 23 ++--------------
+ pom.xml                                       |  7 -----
+ 3 files changed, 2 insertions(+), 54 deletions(-)
 
 diff --git a/archetype-common/pom.xml b/archetype-common/pom.xml
-index 0743131..410d23b 100644
+index 4a726102..b4406e1e 100644
 --- a/archetype-common/pom.xml
 +++ b/archetype-common/pom.xml
-@@ -50,12 +50,6 @@
+@@ -47,32 +47,6 @@
        <groupId>org.apache.maven.archetype</groupId>
        <artifactId>archetype-descriptor</artifactId>
      </dependency>
 -    <dependency>
--      <groupId>org.codehaus.groovy</groupId>
--      <artifactId>groovy-all</artifactId>
--      <version>2.4.16</version>
--      <scope>compile</scope>
+-      <groupId>org.apache.groovy</groupId>
+-      <artifactId>groovy</artifactId>
 -    </dependency>
+-    <!-- additional groovy modules -->
+-    <dependency>
+-      <groupId>org.apache.groovy</groupId>
+-      <artifactId>groovy-json</artifactId>
+-      <scope>runtime</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.groovy</groupId>
+-      <artifactId>groovy-templates</artifactId>
+-      <scope>runtime</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.groovy</groupId>
+-      <artifactId>groovy-xml</artifactId>
+-      <scope>runtime</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.groovy</groupId>
+-      <artifactId>groovy-yaml</artifactId>
+-      <scope>runtime</scope>
+-    </dependency>
+-    <!-- /additional groovy modules -->
      <dependency>
        <groupId>org.apache.ivy</groupId>
        <artifactId>ivy</artifactId>
 diff --git a/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java b/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
-index 7e88a95..9b3b3cd 100644
+index 1e613531..edb40cf2 100644
 --- a/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
 +++ b/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
-@@ -19,8 +19,6 @@ package org.apache.maven.archetype.generator;
-  * under the License.
-  */
+@@ -42,8 +42,6 @@ import java.util.regex.Pattern;
+ import java.util.zip.ZipEntry;
+ import java.util.zip.ZipFile;
  
 -import groovy.lang.Binding;
 -import groovy.lang.GroovyShell;
  import org.apache.maven.archetype.ArchetypeGenerationRequest;
  import org.apache.maven.archetype.common.ArchetypeArtifactManager;
  import org.apache.maven.archetype.common.ArchetypeFilesResolver;
-@@ -210,28 +208,9 @@ public class DefaultFilesetArchetypeGenerator
-             String postGenerationScript = archetypeArtifactManager.getPostGenerationScript( archetypeFile );
-             if ( postGenerationScript != null )
-             {
--                getLogger().info( "Executing " + Constants.ARCHETYPE_POST_GENERATION_SCRIPT
-+                getLogger().info( "Skipping " + Constants.ARCHETYPE_POST_GENERATION_SCRIPT
-                     + " post-generation script" );
+@@ -226,25 +224,8 @@ public class DefaultFilesetArchetypeGenerator implements FilesetArchetypeGenerat
  
+             String postGenerationScript = archetypeArtifactManager.getPostGenerationScript(archetypeFile);
+             if (postGenerationScript != null) {
+-                LOGGER.info("Executing " + Constants.ARCHETYPE_POST_GENERATION_SCRIPT + " post-generation script");
+-
 -                Binding binding = new Binding();
 -
 -                final Properties archetypeGeneratorProperties = new Properties();
--                archetypeGeneratorProperties.putAll( System.getProperties() );
+-                archetypeGeneratorProperties.putAll(System.getProperties());
 -
--                if ( request.getProperties() != null )
--                {
--                    archetypeGeneratorProperties.putAll( request.getProperties() );
+-                if (request.getProperties() != null) {
+-                    archetypeGeneratorProperties.putAll(request.getProperties());
 -                }
 -
--                for ( Map.Entry<Object, Object> entry : archetypeGeneratorProperties.entrySet() )
--                {
--                    binding.setVariable( entry.getKey().toString(), entry.getValue() );
+-                for (Map.Entry<Object, Object> entry : archetypeGeneratorProperties.entrySet()) {
+-                    binding.setVariable(entry.getKey().toString(), entry.getValue());
 -                }
 -
--                binding.setVariable( "request", request );
+-                binding.setVariable("request", request);
 -
--                GroovyShell shell = new GroovyShell( binding );
--                shell.evaluate( postGenerationScript );
+-                GroovyShell shell = new GroovyShell(binding);
+-                shell.evaluate(postGenerationScript);
++                LOGGER.info("Skipping " + Constants.ARCHETYPE_POST_GENERATION_SCRIPT
++                    + " post-generation script");
              }
  
              // ----------------------------------------------------------------------
+diff --git a/pom.xml b/pom.xml
+index 3196edd2..e6d41c00 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -83,13 +83,6 @@
+ 
+   <dependencyManagement>
+     <dependencies>
+-      <dependency>
+-        <groupId>org.apache.groovy</groupId>
+-        <artifactId>groovy-bom</artifactId>
+-        <version>4.0.26</version>
+-        <type>pom</type>
+-        <scope>import</scope>
+-      </dependency>
+       <dependency>
+         <groupId>org.apache.maven</groupId>
+         <artifactId>maven-compat</artifactId>
 -- 
-2.26.2
+2.49.0
 

maven-archetype-3.2.1-source-release.zip

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ca13129e1f5d1636b8c0577d23d258b0ce636be2538b16f6d583ae21c8f9f88a
-size 919962

maven-archetype-3.4.0-source-release.zip

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:30f5daadfd97c49373ed19d6581a9a4d22cf34a313df14142a6a5198d4103572
+size 945009

maven-archetype.changes

@@ -1,3 +1,126 @@
+-------------------------------------------------------------------
+Mon Jul 21 14:09:52 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Removed patch:
+  * 0002-reproducible-from-environment.patch
+    + patched already in maven-archiver
+
+-------------------------------------------------------------------
+Tue May 27 11:24:27 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to version 3.4.0
+  * New features and improvements
+    + Bump archetype descriptor version to 1.2.0
+    + Add property for outputDirectory in create-from-project mojo
+    + Lock down plugin versions in maven-archetype packaging
+    + Enable GitHUb Issues
+    + ARCHETYPE-274: Conditionally include or exclude a file from
+      archetype during generation
+  * Bug Fixes
+    + ARCHETYPE-674: Workaround for Maven 4
+    + Fix recognize project packaging by PomUtils
+  * Maintenance
+    + Update site descriptor
+    + Remove clean from the PR template
+    + MNGSITE-529: Rename "Goals" to "Plugin Documentation"
+    + Bump project version to 3.4.0-SNAPSHOT
+    + Add GitHub Actions to dependabot
+    + Add release-drafter configuration
+    + ARCHETYPE-691: Refactor FileCharsetDetector
+    + Remove a lot of old println detritus
+    + @Component --> @Inject
+    + refactor: Replace Plexus AbstractLogEnabled with SLF4J
+- Modified patches:
+  * 0001-Avoid-reliance-on-groovy.patch
+  * 0002-reproducible-from-environment.patch
+    + rediff
+
+-------------------------------------------------------------------
+Tue Oct 29 17:29:25 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to version 3.3.1
+  * Bug
+    + ARCHETYPE-574: Integration testing ignores default values
+    + ARCHETYPE-679: groovy.text.SimpleTemplateEngine Not Found
+    + ARCHETYPE-681: [REGRESSION] Output from archetype verification
+      is no longer logged
+    + ARCHETYPE-683: [REGRESSION] groovy.json.JsonOutput not found
+    + ARCHETYPE-684: Not providing a directory element in the
+      fileset results in a null directory instead
+    + ARCHETYPE-685: Fix namespace in modello models
+    + ARCHETYPE-688: Incompatibities with Velocity in Archetypes
+    + ARCHETYPE-689: Archetype Plugin 3.3.0 introduced
+      incompatibilities
+    + ARCHETYPE-690: Install archetype-packaging for ITs
+  * Improvement
+    + ARCHETYPE-676: A non-parsable archetype-catalog.xml does not
+      result in an warning or error
+    + ARCHETYPE-680: Integration test should report ERROR instead
+      of WARNING when failing
+- Modified patches:
+  * 0001-Avoid-reliance-on-groovy.patch
+  * reproducible-from-environment.patch ->
+    0002-reproducible-from-environment.patch
+    + rediff
+
+-------------------------------------------------------------------
+Wed Oct  2 20:24:19 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Removed patch:
+  * 0002-Revert-ARCHETYPE-667-Upgrade-Velocity-from-1.7-to-2..patch
+    + not needed since we can now build against velocity-engine-core
+      without introducing build cycles
+
+-------------------------------------------------------------------
+Fri Sep 27 10:28:56 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to version 3.3.0
+  * Bug
+    + ARCHETYPE-626: mvn install deploy does not work with 3.2.1
+      but worked with 3.2.0
+    + ARCHETYPE-635: Groovy present twice on classpath of
+      maven-archetype-plugin
+    + ARCHETYPE-637: PomUtils.addNewModule Pretty-Printing has
+      issue on java 9+
+    + ARCHETYPE-646: "WARNING: Parameter 'localRepository' is
+      deprecated" with Maven 3.9.1
+    + ARCHETYPE-657, CVE-2024-47197, bsc#1231000: create 
+      target/archetype-it instead of target/classes/archetype-it, 
+  * Improvement
+    + ARCHETYPE-632: Add logging conflict line in integration-test
+    + ARCHETYPE-634: WARNING: An illegal reflective access
+      operation has occurred
+    + ARCHETYPE-650: improve "The defined artifact is not an
+      archetype" error message
+    + ARCHETYPE-651: add a message when updating local catalog
+    + ARCHETYPE-654: Clarify repository/server id used for custom
+      repository catalog
+    + ARCHETYPE-655: Get rid of Wagon API to download catalogs
+    + ARCHETYPE-660: Require Maven 3.6.3
+    + ARCHETYPE-668: Switch to JSR-330
+    + ARCHETYPE-673: Get rid of maven-artifact-transfer
+- Removed patch:
+  * port-to-maven-script-interpreter-1_3.patch
+    + upstream is on 1.5 now
+- Modified patches:
+  * 0001-Avoid-reliance-on-groovy.patch
+  * reproducible-from-environment.patch
+    + rediff
+- Added patch:
+  * 0002-Revert-ARCHETYPE-667-Upgrade-Velocity-from-1.7-to-2..patch
+    + use for the while velocity 1.x before we have the
+      velocity-engine upgraded to the right version and free of
+      build cycles
+
+-------------------------------------------------------------------
+Tue Sep 24 14:25:00 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Added patch:
+  * reproducible-from-environment.patch
+    + SOURCE_DATE_EPOCH environmental variable triggers reproducible
+      use of the maven-archetype-plugin if it is not requested
+      already using the project.build.outputTimestamp option.
+
 -------------------------------------------------------------------
 Tue Apr  2 17:17:09 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 

maven-archetype.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package maven-archetype
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,14 +17,13 @@
 
 
 Name:           maven-archetype
-Version:        3.2.1
+Version:        3.4.0
 Release:        0
 Summary:        Maven project templating toolkit
 License:        Apache-2.0
 URL:            https://maven.apache.org/archetype/
 Source0:        https://dlcdn.apache.org/maven/archetype/%{name}-%{version}-source-release.zip
 Patch1:         0001-Avoid-reliance-on-groovy.patch
-Patch2:         port-to-maven-script-interpreter-1_3.patch
 BuildRequires:  fdupes
 BuildRequires:  maven-local
 BuildRequires:  unzip
@@ -35,11 +34,8 @@ BuildRequires:  mvn(org.apache.commons:commons-lang3)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
-BuildRequires:  mvn(org.apache.maven.shared:maven-artifact-transfer)
-BuildRequires:  mvn(org.apache.maven.shared:maven-invoker)
-BuildRequires:  mvn(org.apache.maven.shared:maven-script-interpreter)
-BuildRequires:  mvn(org.apache.maven.wagon:wagon-provider-api)
-BuildRequires:  mvn(org.apache.maven:maven-aether-provider)
+BuildRequires:  mvn(org.apache.maven.shared:maven-invoker) >= 3.3.0
+BuildRequires:  mvn(org.apache.maven.shared:maven-script-interpreter) >= 1.5
 BuildRequires:  mvn(org.apache.maven:maven-archiver)
 BuildRequires:  mvn(org.apache.maven:maven-artifact)
 BuildRequires:  mvn(org.apache.maven:maven-core)
@@ -48,16 +44,14 @@ BuildRequires:  mvn(org.apache.maven:maven-parent:pom:)
 BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
 BuildRequires:  mvn(org.apache.maven:maven-settings)
 BuildRequires:  mvn(org.apache.maven:maven-settings-builder)
-BuildRequires:  mvn(org.apache.velocity:velocity)
+BuildRequires:  mvn(org.apache.velocity:velocity-engine-core)
 BuildRequires:  mvn(org.codehaus.modello:modello-maven-plugin)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-archiver)
-BuildRequires:  mvn(org.codehaus.plexus:plexus-component-annotations)
-BuildRequires:  mvn(org.codehaus.plexus:plexus-component-metadata)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-interactivity-api)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
-BuildRequires:  mvn(org.codehaus.plexus:plexus-velocity)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-velocity) >= 2
 BuildRequires:  mvn(org.codehaus.plexus:plexus-xml)
-BuildRequires:  mvn(org.eclipse.aether:aether-impl)
+BuildRequires:  mvn(org.eclipse.sisu:sisu-maven-plugin)
 BuildRequires:  mvn(org.jdom:jdom2)
 BuildArch:      noarch
 
@@ -132,13 +126,9 @@ Summary:        Maven Plugin for using archetypes
 %prep
 %setup -q
 %patch -P 1 -p1
-%patch -P 2 -p1
-%pom_change_dep ant:ant-antlr org.apache.ant:ant-antlr archetype-common
-%pom_change_dep org.sonatype.aether: org.eclipse.aether: archetype-common
 
 # Pointless for rpm build
 %pom_remove_plugin -r org.apache.rat:apache-rat-plugin
-%pom_remove_plugin -r org.apache.maven.plugins:maven-enforcer-plugin
 
 # Add OSGI info to catalog and descriptor jars
 pushd archetype-models/archetype-catalog
@@ -190,7 +180,6 @@ done
 %build
 %{mvn_package} :archetype-models maven-archetype
 %{mvn_build} -s -f -- \
-    -Dproject.build.outputTimestamp=$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%%s)} +%%Y-%%m-%%dT%%H:%%M:%%SZ) \
 %if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
     -Dmaven.compiler.release=8 \
 %endif

port-to-maven-script-interpreter-1_3.patch

@@ -1,89 +0,0 @@
---- maven-archetype-3.2.1/maven-archetype-plugin/pom.xml	2022-04-27 07:09:49.600766370 +0200
-+++ maven-archetype-3.2.1/maven-archetype-plugin/pom.xml	2022-04-27 08:26:27.624062781 +0200
-@@ -157,7 +157,7 @@
-     <dependency>
-       <groupId>org.apache.maven.shared</groupId>
-       <artifactId>maven-script-interpreter</artifactId>
--      <version>1.2</version>
-+      <version>1.3</version>
-     </dependency>
-     
-     <dependency>
---- maven-archetype-3.2.1/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/FileLogger.java	2022-04-27 07:09:49.624766532 +0200
-+++ maven-archetype-3.2.1/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/FileLogger.java	2022-04-27 08:19:58.097380863 +0200
-@@ -19,9 +19,9 @@
-  * under the License.
-  */
- 
--import org.apache.maven.plugin.logging.Log;
- import org.apache.maven.shared.invoker.InvocationOutputHandler;
- import org.apache.maven.shared.scriptinterpreter.ExecutionLogger;
-+import org.apache.maven.shared.scriptinterpreter.FileLoggerMirrorHandler;
- 
- import java.io.File;
- import java.io.IOException;
-@@ -51,13 +51,13 @@
-      * Creates a new logger that writes to the specified file and optionally mirrors messages to the given mojo logger.
-      *
-      * @param outputFile The path to the output file, must not be <code>null</code>.
--     * @param log The mojo logger to additionally output messages to, may be <code>null</code> if not used.
-+     * @param mirrorHandler The class which handle mirrored message, can be <code>null</code>.
-      * @throws java.io.IOException If the output file could not be created.
-      */
--    FileLogger( File outputFile, Log log )
-+    FileLogger( File outputFile, FileLoggerMirrorHandler mirrorHandler )
-         throws IOException
-     {
--        super( outputFile, log );
-+        super( outputFile, mirrorHandler );
-     }
- 
- }
---- maven-archetype-3.2.1/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java	2022-04-27 07:09:49.624766532 +0200
-+++ maven-archetype-3.2.1/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java	2022-04-27 08:14:43.135212339 +0200
-@@ -66,7 +66,7 @@
- import org.apache.maven.shared.invoker.InvocationResult;
- import org.apache.maven.shared.invoker.Invoker;
- import org.apache.maven.shared.invoker.MavenInvocationException;
--import org.apache.maven.shared.scriptinterpreter.RunFailureException;
-+import org.apache.maven.shared.scriptinterpreter.ScriptException;
- import org.apache.maven.shared.scriptinterpreter.ScriptRunner;
- import org.codehaus.plexus.util.FileUtils;
- import org.codehaus.plexus.util.IOUtil;
-@@ -725,7 +725,7 @@
-             getLog().info( "No post-archetype-generation goals to invoke." );
-         }
-         // verify result
--        ScriptRunner scriptRunner = new ScriptRunner( getLog() );
-+        ScriptRunner scriptRunner = new ScriptRunner();
-         scriptRunner.setScriptEncoding( encoding );
- 
-         Map<String, Object> context = new LinkedHashMap<>();
-@@ -733,10 +733,9 @@
- 
-         try
-         {
--            scriptRunner.run( "post-build script", goalFile.getParentFile(), postBuildHookScript, context, logger,
--                              "failure post script", true );
-+            scriptRunner.run( "post-build script", goalFile.getParentFile(), postBuildHookScript, context, logger );
-         }
--        catch ( RunFailureException e )
-+        catch ( ScriptException e )
-         {
-             throw new IntegrationTestFailure( "post build script failure failure: " + e.getMessage(), e );
-         }
-@@ -751,14 +750,7 @@
-         {
-             File outputLog = new File( basedir, "build.log" );
- 
--            if ( streamLogs )
--            {
--                logger = new FileLogger( outputLog, getLog() );
--            }
--            else
--            {
-                 logger = new FileLogger( outputLog );
--            }
- 
-             getLog().debug( "build log initialized in: " + outputLog );
-