Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package maven-archetype for openSUSE:Factory
checked in at 2024-09-27 17:11:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/maven-archetype (Old)
and /work/SRC/openSUSE:Factory/.maven-archetype.new.29891 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven-archetype"
Fri Sep 27 17:11:53 2024 rev:8 rq:1204136 version:3.3.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/maven-archetype/maven-archetype.changes
2024-09-25 21:53:23.876547996 +0200
+++
/work/SRC/openSUSE:Factory/.maven-archetype.new.29891/maven-archetype.changes
2024-09-27 17:12:40.581618319 +0200
@@ -1,0 +2,41 @@
+Fri Sep 27 10:28:56 UTC 2024 - Fridrich Strba <[email protected]>
+
+- 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, boo#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
+
+-------------------------------------------------------------------
Old:
----
maven-archetype-3.2.1-source-release.zip
port-to-maven-script-interpreter-1_3.patch
New:
----
0002-Revert-ARCHETYPE-667-Upgrade-Velocity-from-1.7-to-2..patch
maven-archetype-3.3.0-source-release.zip
BETA DEBUG BEGIN:
Old:- Removed patch:
* port-to-maven-script-interpreter-1_3.patch
+ upstream is on 1.5 now
BETA DEBUG END:
BETA DEBUG BEGIN:
New:- 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
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ maven-archetype.spec ++++++
--- /var/tmp/diff_new_pack.owcmT3/_old 2024-09-27 17:12:41.141641701 +0200
+++ /var/tmp/diff_new_pack.owcmT3/_new 2024-09-27 17:12:41.141641701 +0200
@@ -17,14 +17,14 @@
Name: maven-archetype
-Version: 3.2.1
+Version: 3.3.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
+Patch2: 0002-Revert-ARCHETYPE-667-Upgrade-Velocity-from-1.7-to-2..patch
Patch3: reproducible-from-environment.patch
BuildRequires: fdupes
BuildRequires: maven-local
@@ -36,11 +36,8 @@
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)
@@ -52,13 +49,11 @@
BuildRequires: mvn(org.apache.velocity:velocity)
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-xml)
-BuildRequires: mvn(org.eclipse.aether:aether-impl)
+BuildRequires: mvn(org.eclipse.sisu:sisu-maven-plugin)
BuildRequires: mvn(org.jdom:jdom2)
BuildArch: noarch
@@ -135,12 +130,9 @@
%patch -P 1 -p1
%patch -P 2 -p1
%patch -P 3 -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
++++++ 0001-Avoid-reliance-on-groovy.patch ++++++
--- /var/tmp/diff_new_pack.owcmT3/_old 2024-09-27 17:12:41.161642536 +0200
+++ /var/tmp/diff_new_pack.owcmT3/_new 2024-09-27 17:12:41.169642870 +0200
@@ -1,74 +1,76 @@
-From b3fb162b5d01b352511a56393cf1c16294601e9e Mon Sep 17 00:00:00 2001
+From 3904fd7196f4dcf65e2b617e442b656f9c6375f2 Mon Sep 17 00:00:00 2001
From: Mat Booth <[email protected]>
Date: Thu, 9 Jul 2020 17:13:18 +0100
Subject: [PATCH 1/3] Avoid reliance on groovy
---
- archetype-common/pom.xml | 6 -----
- .../DefaultFilesetArchetypeGenerator.java | 23 +------------------
- 2 files changed, 1 insertion(+), 28 deletions(-)
+ archetype-common/pom.xml | 5 ----
+ .../DefaultFilesetArchetypeGenerator.java | 28 ++++---------------
+ 2 files changed, 5 insertions(+), 28 deletions(-)
diff --git a/archetype-common/pom.xml b/archetype-common/pom.xml
-index 0743131..410d23b 100644
+index b3e84279..acd34901 100644
--- a/archetype-common/pom.xml
+++ b/archetype-common/pom.xml
-@@ -50,12 +50,6 @@
+@@ -47,11 +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>
+- <version>4.0.23</version>
- </dependency>
<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 c57eb8f6..2bb6dec9 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" );
+@@ -213,27 +211,11 @@ public class DefaultFilesetArchetypeGenerator extends
AbstractLogEnabled impleme
+ context);
+ }
+- String postGenerationScript =
archetypeArtifactManager.getPostGenerationScript(archetypeFile);
+- if (postGenerationScript != null) {
+- getLogger().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);
++ String postGenerationScript =
archetypeArtifactManager.getPostGenerationScript( archetypeFile );
++ if ( postGenerationScript != null )
++ {
++ getLogger().info( "Skipping " +
Constants.ARCHETYPE_POST_GENERATION_SCRIPT
++ + " post-generation script" );
}
//
----------------------------------------------------------------------
--
-2.26.2
+2.46.1
++++++ 0002-Revert-ARCHETYPE-667-Upgrade-Velocity-from-1.7-to-2..patch ++++++
>From 53b617347a6214def825f6248422440ec53778de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <[email protected]>
Date: Fri, 27 Sep 2024 09:55:16 +0200
Subject: [PATCH 2/3] Revert "[ARCHETYPE-667] Upgrade Velocity from 1.7 to 2.3"
This reverts commit 8b10a1aa171d3d47a15b04866dcb7481e53b55cf.
---
archetype-common/pom.xml | 2 +-
.../maven/archetype/VelocityConfigurator.java | 65 -------------------
.../DefaultFilesetArchetypeGenerator.java | 7 +-
.../maven/archetype/old/ArchetypeTest.java | 5 +-
maven-archetype-plugin/pom.xml | 2 +-
...efaultArchetypeGenerationConfigurator.java | 20 +++---
pom.xml | 20 +++++-
7 files changed, 35 insertions(+), 86 deletions(-)
delete mode 100644
archetype-common/src/main/java/org/apache/maven/archetype/VelocityConfigurator.java
diff --git a/archetype-common/pom.xml b/archetype-common/pom.xml
index acd34901..5fc92702 100644
--- a/archetype-common/pom.xml
+++ b/archetype-common/pom.xml
@@ -105,7 +105,7 @@
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
- <artifactId>velocity-engine-core</artifactId>
+ <artifactId>velocity</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git
a/archetype-common/src/main/java/org/apache/maven/archetype/VelocityConfigurator.java
b/archetype-common/src/main/java/org/apache/maven/archetype/VelocityConfigurator.java
deleted file mode 100644
index 899f0f6b..00000000
---
a/archetype-common/src/main/java/org/apache/maven/archetype/VelocityConfigurator.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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
- *
- * http://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.apache.maven.archetype;
-
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import java.util.Properties;
-
-import org.codehaus.plexus.velocity.VelocityComponentConfigurator;
-
-/**
- * Velocity configurator. Used by {@link
org.codehaus.plexus.velocity.VelocityComponent}
- * <p/>
- * Preserve compatibility of Velocity 2.2 with Velocity 1.x
- * <a href="https://velocity.apache.org/engine/2.3/upgrading.html";>Velocity
Upgrading</a>
- */
-@Named
-@Singleton
-class VelocityConfigurator implements VelocityComponentConfigurator {
-
- @Override
- public void configure(Properties properties) {
-
- // # No automatic conversion of methods arguments
- properties.put("introspector.conversion_handler.class", "none");
-
- // # Use backward compatible space gobbling
- properties.put("parser.space_gobbling", "bc");
-
- // # Have #if($foo) only returns false if $foo is false or null
- properties.put("directive.if.empty_check", false);
-
- // # Allow '-' in identifiers (since 2.1)
- properties.put("parser.allow_hyphen_in_identifiers", true);
-
- // # Enable backward compatibility mode for Velocimacros
- properties.put("velocimacro.enable_bc_mode", true);
-
- // # When using an invalid reference handler, also include quiet
references (since 2.2)
- properties.put("event_handler.invalid_references.quiet", "true");
-
- // # When using an invalid reference handler, also include null
references (since 2.2)
- properties.put("event_handler.invalid_references.null", true);
-
- // # When using an invalid reference handler, also include tested
references (since 2.2)
- properties.put("event_handler.invalid_references.tested", true);
- }
-}
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 2bb6dec9..3a1b81fc 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
@@ -60,6 +60,7 @@ import org.apache.maven.archetype.metadata.FileSet;
import org.apache.maven.archetype.metadata.ModuleDescriptor;
import org.apache.maven.archetype.metadata.RequiredProperty;
import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.Velocity;
import org.apache.velocity.context.Context;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.FileUtils;
@@ -429,7 +430,7 @@ public class DefaultFilesetArchetypeGenerator extends
AbstractLogEnabled impleme
private String evaluateExpression(Context context, String key, String
value) {
try (StringWriter stringWriter = new StringWriter()) {
- velocity.getEngine().evaluate(context, stringWriter, key, value);
+ Velocity.evaluate(context, stringWriter, key, value);
return stringWriter.toString();
} catch (Exception ex) {
return value;
@@ -685,8 +686,8 @@ public class DefaultFilesetArchetypeGenerator extends
AbstractLogEnabled impleme
String localTemplateFileName = templateFileName.replace('/',
File.separatorChar);
if (!templateFileName.equals(localTemplateFileName)
- && !velocity.getEngine().resourceExists(templateFileName)
- && velocity.getEngine().resourceExists(localTemplateFileName))
{
+ && !velocity.getEngine().templateExists(templateFileName)
+ && velocity.getEngine().templateExists(localTemplateFileName))
{
templateFileName = localTemplateFileName;
}
diff --git
a/archetype-common/src/test/java/org/apache/maven/archetype/old/ArchetypeTest.java
b/archetype-common/src/test/java/org/apache/maven/archetype/old/ArchetypeTest.java
index 82a1f48e..03256432 100644
---
a/archetype-common/src/test/java/org/apache/maven/archetype/old/ArchetypeTest.java
+++
b/archetype-common/src/test/java/org/apache/maven/archetype/old/ArchetypeTest.java
@@ -146,10 +146,7 @@ public class ArchetypeTest extends PlexusTestCase {
velocity.getEngine()
.mergeTemplate(
- OldArchetype.ARCHETYPE_RESOURCES + "/" +
OldArchetype.ARCHETYPE_POM,
- "utf-8",
- context,
- writer);
+ OldArchetype.ARCHETYPE_RESOURCES + "/" +
OldArchetype.ARCHETYPE_POM, context, writer);
} finally {
Thread.currentThread().setContextClassLoader(old);
}
diff --git a/maven-archetype-plugin/pom.xml b/maven-archetype-plugin/pom.xml
index 57ab3fad..b07ab7af 100644
--- a/maven-archetype-plugin/pom.xml
+++ b/maven-archetype-plugin/pom.xml
@@ -130,7 +130,7 @@
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
- <artifactId>velocity-engine-core</artifactId>
+ <artifactId>velocity</artifactId>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
diff --git
a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationConfigurator.java
b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationConfigurator.java
index 186700b5..52e897a7 100644
---
a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationConfigurator.java
+++
b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeGenerationConfigurator.java
@@ -46,8 +46,13 @@ import org.apache.maven.archetype.exception.UnknownArchetype;
import org.apache.maven.archetype.ui.ArchetypeConfiguration;
import org.apache.maven.archetype.ui.ArchetypeDefinition;
import org.apache.maven.archetype.ui.ArchetypeFactory;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
+import org.apache.maven.artifact.repository.MavenArtifactRepository;
+import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.Velocity;
import org.apache.velocity.context.Context;
import org.apache.velocity.context.InternalContextAdapterImpl;
import org.apache.velocity.runtime.RuntimeServices;
@@ -59,7 +64,6 @@ import org.apache.velocity.runtime.visitor.BaseVisitor;
import org.codehaus.plexus.components.interactivity.PrompterException;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.plexus.velocity.VelocityComponent;
import org.eclipse.aether.RepositorySystem;
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.repository.RemoteRepository;
@@ -80,9 +84,6 @@ public class DefaultArchetypeGenerationConfigurator extends
AbstractLogEnabled
@Inject
private ArchetypeGenerationQueryer archetypeGenerationQueryer;
- @Inject
- private VelocityComponent velocity;
-
@Inject
private RepositorySystem repositorySystem;
@@ -263,10 +264,11 @@ public class DefaultArchetypeGenerationConfigurator
extends AbstractLogEnabled
request.setProperties(properties);
}
- private String expandEmbeddedTemplateExpressions(String originalText,
String textDescription, Context context) {
+ private static String expandEmbeddedTemplateExpressions(
+ String originalText, String textDescription, Context context) {
if (StringUtils.contains(originalText, "${")) {
try (StringWriter target = new StringWriter()) {
- velocity.getEngine().evaluate(context, target,
textDescription, originalText);
+ Velocity.evaluate(context, target, textDescription,
originalText);
return target.toString();
} catch (IOException ex) {
// closing StringWriter shouldn't actually generate any
exception
@@ -333,9 +335,9 @@ public class DefaultArchetypeGenerationConfigurator extends
AbstractLogEnabled
String defaultValue =
archetypeConfiguration.getDefaultValue(propertyName);
if (StringUtils.contains(defaultValue, "${")) {
try {
- Template template = new Template();
- template.setName(propertyName + ".default");
- SimpleNode node = RuntimeSingleton.parse(new
StringReader(defaultValue), template);
+ final boolean dumpNamespace = false;
+ SimpleNode node = RuntimeSingleton.parse(
+ new StringReader(defaultValue), propertyName +
".default", dumpNamespace);
node.init(velocityContextAdapter, velocityRuntime);
diff --git a/pom.xml b/pom.xml
index 2a66d3e0..6e784f26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -162,7 +162,21 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-velocity</artifactId>
- <version>2.1.0</version>
+ <version>1.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>velocity</groupId>
+ <artifactId>velocity</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>velocity</groupId>
+ <artifactId>velocity-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jdom</groupId>
@@ -171,8 +185,8 @@
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
- <artifactId>velocity-engine-core</artifactId>
- <version>2.3</version>
+ <artifactId>velocity</artifactId>
+ <version>1.7</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
--
2.46.1
++++++ maven-archetype-3.2.1-source-release.zip ->
maven-archetype-3.3.0-source-release.zip ++++++
++++ 31338 lines of diff (skipped)
++++++ reproducible-from-environment.patch ++++++
--- /var/tmp/diff_new_pack.owcmT3/_old 2024-09-27 17:12:41.621661742 +0200
+++ /var/tmp/diff_new_pack.owcmT3/_new 2024-09-27 17:12:41.625661910 +0200
@@ -1,8 +1,8 @@
----
maven-archetype-3.2.1/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/JarMojo.java
2024-09-24 16:19:57.678404688 +0200
-+++
maven-archetype-3.2.1/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/JarMojo.java
2024-09-24 16:21:47.675826578 +0200
-@@ -139,6 +139,14 @@
+---
a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/JarMojo.java
++++
b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/JarMojo.java
+@@ -133,6 +133,14 @@ public class JarMojo extends AbstractMojo {
- archiver.setArchiver( (JarArchiver) archivers.get( "jar" ) );
+ archiver.setArchiver((JarArchiver) archivers.get("jar"));
+ if ( outputTimestamp == null ||
+ outputTimestamp.length() < 1 ||
@@ -13,6 +13,6 @@
+ }
+
// configure for Reproducible Builds based on outputTimestamp value
- archiver.configureReproducible( outputTimestamp );
+ archiver.configureReproducibleBuild(outputTimestamp);
