Sync from SUSE:SLFO:Main maven-invoker revision b9f5ce6f6819ac94a2e9ff06e88c4d39
This commit is contained in:
BIN
maven-invoker-3.1.0-source-release.zip
(Stored with Git LFS)
BIN
maven-invoker-3.1.0-source-release.zip
(Stored with Git LFS)
Binary file not shown.
BIN
maven-invoker-3.3.0-source-release.zip
(Stored with Git LFS)
Normal file
BIN
maven-invoker-3.3.0-source-release.zip
(Stored with Git LFS)
Normal file
Binary file not shown.
@@ -1,26 +0,0 @@
|
||||
From 97b2ceb3544c035459341278d45cef2e44c21c7b Mon Sep 17 00:00:00 2001
|
||||
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||
Date: Wed, 13 Mar 2013 13:36:26 +0100
|
||||
Subject: [PATCH 2/2] Fix MSHARED-279
|
||||
|
||||
See: http://jira.codehaus.org/browse/MSHARED-279
|
||||
---
|
||||
.../java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java b/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
|
||||
index 35ab16b..082c988 100644
|
||||
--- a/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
|
||||
+++ b/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
|
||||
@@ -536,7 +536,7 @@ public class MavenCommandLineBuilder
|
||||
if ( mavenHome == null )
|
||||
{
|
||||
String mavenHomeProperty = System.getProperty( "maven.home" );
|
||||
- if ( mavenHomeProperty != null )
|
||||
+ if ( StringUtils.isNotEmpty( mavenHomeProperty ) )
|
||||
{
|
||||
mavenHome = new File( mavenHomeProperty );
|
||||
if ( !mavenHome.isDirectory() )
|
||||
--
|
||||
1.8.1.4
|
||||
|
@@ -10,11 +10,12 @@
|
||||
|
||||
<property name="project.groupId" value="org.apache.maven.shared"/>
|
||||
<property name="project.artifactId" value="maven-invoker"/>
|
||||
<property name="project.version" value="3.1.0"/>
|
||||
<property name="project.version" value="3.3.0"/>
|
||||
<property name="project.name" value="Apache Maven Invoker"/>
|
||||
<property name="project.organization.name" value="The Apache Software Foundation"/>
|
||||
|
||||
<property name="compiler.source" value="1.8"/>
|
||||
<property name="compiler.release" value="8"/>
|
||||
<property name="compiler.source" value="1.${compiler.release}"/>
|
||||
<property name="compiler.target" value="${compiler.source}"/>
|
||||
|
||||
<property name="build.finalName" value="${project.artifactId}-${project.version}"/>
|
||||
@@ -54,6 +55,7 @@
|
||||
debug="true"
|
||||
optimize="false"
|
||||
deprecation="true"
|
||||
release="${compiler.release}"
|
||||
target="${compiler.target}"
|
||||
verbose="false"
|
||||
fork="false"
|
||||
|
@@ -1,3 +1,46 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 27 08:39:38 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Upgrade to upstream version 3.3.0
|
||||
* New features and improvements
|
||||
+ MSHARED-1040: Require Java 8
|
||||
+ MSHARED-1019: Allow pass raw cli option to Maven process
|
||||
+ MSHARED-1018: Allow for using the -ntp ,--no-transfer-progress
|
||||
flag in Maven invocations
|
||||
+ MSHARED-1009: Allow providing Maven executable from workspace
|
||||
+ MSHARED-649: Allow Pom file outside base directory
|
||||
+ MSHARED-1007: Add MavenHome and MavenExecutable options to
|
||||
InvocationRequest
|
||||
+ MINVOKER-233: Improve DefaultInvoker with a timeout.
|
||||
+ MSHARED-1390: Deprecate InvocationRequest#setGoals
|
||||
+ MSHARED-1382: support a possibility to disable snapshots
|
||||
update.
|
||||
+ MSHARED-1150: Add ps1 as detectable file type for PowerShell
|
||||
* Bug Fixes
|
||||
+ MSHARED-1008: Set builder id in proper way
|
||||
+ MSHARED-971: Add test for inherited environment
|
||||
* Maintenance
|
||||
+ MSHARED-577: Remove usage of M2_HOME environment variable
|
||||
+ MSHARED-1006: Deprecate not thread safe methods on Invoker
|
||||
+ Unit test MavenCommandLineBuilderTest refactor
|
||||
+ remove --no-module-directories from javadoc configuration
|
||||
+ remove unused property
|
||||
+ remove deprecated class and use up to date JUnit fixtures
|
||||
+ MSHARED-1152: Remove public modifier for JUnit5 tests
|
||||
+ MSHARED-1391: Code cleanups
|
||||
+ MSHARED-1389: Refresh download page
|
||||
+ MSHARED-1307: systemProperties is deprecated:
|
||||
systemPropertyVariables instead
|
||||
+ MSHARED-1306: Use fixtures to reduce duplicate code
|
||||
+ MSHARED-1306: don't log from passing tests
|
||||
+ MNG-6829: Replace any StringUtils#isEmpty(String) and
|
||||
#isNotEmpty(String)
|
||||
+ MSHARED-1152: Migrate tests to JUnit5
|
||||
+ MSHARED-1145: remove rendundant error message
|
||||
- Removed patch:
|
||||
* maven-invoker-MSHARED-279.patch
|
||||
+ rejected upstream
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 21 14:55:53 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
|
@@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
Name: maven-invoker
|
||||
Version: 3.1.0
|
||||
Version: 3.3.0
|
||||
Release: 0
|
||||
Summary: An API for firing a maven build in a clean environment
|
||||
License: Apache-2.0
|
||||
@@ -25,8 +25,6 @@ Group: Development/Libraries/Java
|
||||
URL: https://maven.apache.org/shared/maven-invoker/
|
||||
Source0: https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
|
||||
Source1: %{name}-build.xml
|
||||
# Patch rejected upstream
|
||||
Patch1: %{name}-MSHARED-279.patch
|
||||
BuildRequires: ant
|
||||
BuildRequires: atinject
|
||||
BuildRequires: fdupes
|
||||
@@ -34,8 +32,6 @@ BuildRequires: javapackages-local >= 6
|
||||
BuildRequires: maven-shared-utils >= 3.3.3
|
||||
BuildRequires: sisu-inject
|
||||
BuildRequires: unzip
|
||||
Requires: mvn(org.apache.maven.shared:maven-shared-utils)
|
||||
Requires: mvn(org.eclipse.sisu:org.eclipse.sisu.inject)
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
@@ -58,13 +54,7 @@ API documentation for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
sed -i 's/\r$//' src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
|
||||
cp %{SOURCE1} build.xml
|
||||
%patch -P 1 -p1
|
||||
%pom_change_dep javax.inject:javax.inject:1 org.eclipse.sisu:org.eclipse.sisu.inject
|
||||
|
||||
%pom_remove_parent .
|
||||
%pom_xpath_inject pom:project "<groupId>org.apache.maven.shared</groupId>" .
|
||||
|
||||
%build
|
||||
mkdir -p lib
|
||||
|
Reference in New Issue
Block a user