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 2022-04-30 00:45:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/maven-archetype (Old)
and /work/SRC/openSUSE:Factory/.maven-archetype.new.1538 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven-archetype"
Sat Apr 30 00:45:14 2022 rev:3 rq:973678 version:3.2.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/maven-archetype/maven-archetype.changes
2021-01-11 17:16:34.372637231 +0100
+++
/work/SRC/openSUSE:Factory/.maven-archetype.new.1538/maven-archetype.changes
2022-04-30 00:45:58.970974555 +0200
@@ -1,0 +2,12 @@
+Thu Apr 28 11:37:04 UTC 2022 - Fridrich Strba <[email protected]>
+
+- Upgrade to version 3.2.1
+- Added patches:
+ * 0001-Avoid-reliance-on-groovy.patch
+ + Groovy is only used for running a post generation script,
+ removing this continues the old behaviour of ignoring it
+ * port-to-maven-script-interpreter-1_3.patch
+ + Adapt to the new function signatures in
+ maven-script-interpreter-1.3
+
+-------------------------------------------------------------------
Old:
----
maven-archetype-3.2.0-source-release.zip
New:
----
0001-Avoid-reliance-on-groovy.patch
maven-archetype-3.2.1-source-release.zip
port-to-maven-script-interpreter-1_3.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ maven-archetype.spec ++++++
--- /var/tmp/diff_new_pack.RWL6Ys/_old 2022-04-30 00:45:59.994975443 +0200
+++ /var/tmp/diff_new_pack.RWL6Ys/_new 2022-04-30 00:45:59.998975447 +0200
@@ -1,7 +1,7 @@
#
# spec file for package maven-archetype
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,28 +17,30 @@
Name: maven-archetype
-Version: 3.2.0
+Version: 3.2.1
Release: 0
Summary: Maven project templating toolkit
License: Apache-2.0
URL: https://maven.apache.org/archetype/
-Source0:
https://downloads.apache.org/maven/archetype/%{name}-%{version}-source-release.zip
+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
+BuildRequires: mvn(com.ibm.icu:icu4j)
BuildRequires: mvn(commons-collections:commons-collections)
BuildRequires: mvn(commons-io:commons-io)
-BuildRequires: mvn(jdom:jdom)
-BuildRequires: mvn(net.sourceforge.jchardet:jchardet)
-BuildRequires: mvn(org.apache.ant:ant-antlr)
-BuildRequires: mvn(org.apache.ivy:ivy)
+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-antrun-plugin)
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:maven-archiver)
BuildRequires: mvn(org.apache.maven:maven-artifact)
BuildRequires: mvn(org.apache.maven:maven-core)
BuildRequires: mvn(org.apache.maven:maven-model)
@@ -47,13 +49,15 @@
BuildRequires: mvn(org.apache.maven:maven-settings)
BuildRequires: mvn(org.apache.maven:maven-settings-builder)
BuildRequires: mvn(org.apache.velocity:velocity)
-BuildRequires: mvn(org.codehaus.groovy:groovy)
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.eclipse.aether:aether-impl)
+BuildRequires: mvn(org.jdom:jdom2)
BuildArch: noarch
%description
@@ -126,12 +130,55 @@
%prep
%setup -q
+%patch1 -p1
+%patch2 -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
+ %pom_xpath_remove "pom:project/pom:packaging"
+ %pom_xpath_inject "pom:project" "<packaging>bundle</packaging>"
+ %pom_xpath_inject "pom:build/pom:plugins" "
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <_nouses>true</_nouses>
+
<Export-Package>org.apache.maven.archetype.catalog.*</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>"
+popd
+pushd archetype-models/archetype-descriptor
+ %pom_xpath_remove "pom:project/pom:packaging"
+ %pom_xpath_inject "pom:project" "<packaging>bundle</packaging>"
+ %pom_xpath_inject "pom:build/pom:plugins" "
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <_nouses>true</_nouses>
+
<Export-Package>org.apache.maven.archetype.metadata.*</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>"
+popd
+
+# Remove ivy as a runtime dep
+%pom_remove_dep org.apache.ivy:ivy archetype-common
+
+# Disable processing of test resources using ant
+%pom_remove_plugin org.apache.maven.plugins:maven-antrun-plugin
archetype-common
+
%build
%{mvn_package} :archetype-models maven-archetype
%{mvn_build} -s -f -- \
++++++ 0001-Avoid-reliance-on-groovy.patch ++++++
>From b3fb162b5d01b352511a56393cf1c16294601e9e 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(-)
diff --git a/archetype-common/pom.xml b/archetype-common/pom.xml
index 0743131..410d23b 100644
--- a/archetype-common/pom.xml
+++ b/archetype-common/pom.xml
@@ -50,12 +50,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>
- </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
---
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.
*/
-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" );
- Binding binding = new Binding();
-
- final Properties archetypeGeneratorProperties = new
Properties();
- archetypeGeneratorProperties.putAll( System.getProperties() );
-
- if ( request.getProperties() != null )
- {
- archetypeGeneratorProperties.putAll(
request.getProperties() );
- }
-
- for ( Map.Entry<Object, Object> entry :
archetypeGeneratorProperties.entrySet() )
- {
- binding.setVariable( entry.getKey().toString(),
entry.getValue() );
- }
-
- binding.setVariable( "request", request );
-
- GroovyShell shell = new GroovyShell( binding );
- shell.evaluate( postGenerationScript );
}
//
----------------------------------------------------------------------
--
2.26.2
++++++ port-to-maven-script-interpreter-1_3.patch ++++++
--- 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 );
