Compare commits
No commits in common. "c8-stream-201902" and "c9-beta" have entirely different histories.
c8-stream-
...
c9-beta
|
@ -0,0 +1,25 @@
|
|||
From fd5749e9b8d47cf350527c4831a4ee53cefc60aa Mon Sep 17 00:00:00 2001
|
||||
From: Mat Booth <mat.booth@redhat.com>
|
||||
Date: Mon, 20 Jul 2020 22:51:52 +0100
|
||||
Subject: [PATCH 1/2] plexus languages 1.0
|
||||
|
||||
---
|
||||
.../java/org/apache/maven/plugin/compiler/CompilerMojo.java | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java b/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java
|
||||
index 8bc437b..326f9f9 100644
|
||||
--- a/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java
|
||||
+++ b/src/main/java/org/apache/maven/plugin/compiler/CompilerMojo.java
|
||||
@@ -50,7 +50,7 @@ import org.codehaus.plexus.languages.java.jpms.JavaModuleDescriptor;
|
||||
import org.codehaus.plexus.languages.java.jpms.LocationManager;
|
||||
import org.codehaus.plexus.languages.java.jpms.ResolvePathsRequest;
|
||||
import org.codehaus.plexus.languages.java.jpms.ResolvePathsResult;
|
||||
-import org.codehaus.plexus.languages.java.jpms.ResolvePathsResult.ModuleNameSource;
|
||||
+import org.codehaus.plexus.languages.java.jpms.ModuleNameSource;
|
||||
|
||||
/**
|
||||
* Compiles application sources
|
||||
--
|
||||
2.26.2
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
From 8ef296b291e7ef1e1e4ab4fa4b520a80bde48a9f Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?J=C3=B6rg=20Hohwiller?= <hohwille@users.noreply.github.com>
|
||||
Date: Tue, 17 Dec 2019 19:05:57 +0100
|
||||
Subject: [PATCH 2/2] MCOMPILER-359: Fix for NPE
|
||||
|
||||
---
|
||||
.../java/org/apache/maven/plugin/compiler/TestCompilerMojo.java | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java b/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java
|
||||
index f8b9ba1..203dd07 100644
|
||||
--- a/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java
|
||||
+++ b/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java
|
||||
@@ -250,7 +250,7 @@ public class TestCompilerMojo
|
||||
|
||||
for ( Entry<String, Exception> pathException : result.getPathExceptions().entrySet() )
|
||||
{
|
||||
- Throwable cause = pathException.getValue().getCause();
|
||||
+ Throwable cause = pathException.getValue();
|
||||
while ( cause.getCause() != null )
|
||||
{
|
||||
cause = cause.getCause();
|
||||
--
|
||||
2.26.2
|
||||
|
|
@ -1,19 +1,33 @@
|
|||
%bcond_with bootstrap
|
||||
|
||||
Name: maven-compiler-plugin
|
||||
Version: 3.8.1
|
||||
Release: 2%{?dist}
|
||||
Release: 12%{?dist}
|
||||
Summary: Maven Compiler Plugin
|
||||
License: ASL 2.0
|
||||
URL: http://maven.apache.org/plugins/maven-compiler-plugin
|
||||
URL: https://maven.apache.org/plugins/maven-compiler-plugin
|
||||
BuildArch: noarch
|
||||
|
||||
Source0: http://archive.apache.org/dist/maven/plugins/%{name}-%{version}-source-release.zip
|
||||
Source0: https://archive.apache.org/dist/maven/plugins/%{name}-%{version}-source-release.zip
|
||||
|
||||
# port to plexus-languages 1.0.3
|
||||
Patch0: 0001-plexus-languages-1.0.patch
|
||||
|
||||
# Taken from upstream commit: https://github.com/apache/maven-compiler-plugin/commit/116b98153ef5ce7b13c0275324baa28bca8bc887
|
||||
Patch1: 0002-MCOMPILER-359-Fix-for-NPE.patch
|
||||
|
||||
BuildRequires: maven-local
|
||||
%if %{with bootstrap}
|
||||
BuildRequires: javapackages-bootstrap
|
||||
%else
|
||||
BuildRequires: mvn(junit:junit)
|
||||
BuildRequires: mvn(org.apache.maven:maven-artifact)
|
||||
BuildRequires: mvn(org.apache.maven:maven-compat)
|
||||
BuildRequires: mvn(org.apache.maven:maven-core)
|
||||
BuildRequires: mvn(org.apache.maven:maven-plugin-api)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:)
|
||||
BuildRequires: mvn(org.apache.maven.plugin-testing:maven-plugin-testing-harness)
|
||||
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
|
||||
BuildRequires: mvn(org.apache.maven.shared:maven-shared-incremental)
|
||||
BuildRequires: mvn(org.apache.maven.shared:maven-shared-utils)
|
||||
|
@ -22,6 +36,8 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-javac)
|
|||
BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-manager)
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata)
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-java)
|
||||
BuildRequires: mvn(org.mockito:mockito-core)
|
||||
%endif
|
||||
|
||||
%description
|
||||
The Compiler Plugin is used to compile the sources of your project.
|
||||
|
@ -34,9 +50,14 @@ API documentation for %{name}.
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
# Replace path to junit in a test case with the system wide .jar
|
||||
sed -i 's|localRepository,\ "junit/junit/3.8.1/junit-3.8.1.jar"|"%(find-jar junit || find-jar javapackages-bootstrap/junit)"|' src/test/java/org/apache/maven/plugin/compiler/CompilerMojoTestCase.java
|
||||
|
||||
%build
|
||||
%mvn_build -f
|
||||
%mvn_build
|
||||
|
||||
%install
|
||||
%mvn_install
|
||||
|
@ -48,9 +69,47 @@ API documentation for %{name}.
|
|||
%license LICENSE NOTICE
|
||||
|
||||
%changelog
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.8.1-12
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.8.1-11
|
||||
- Rebuild to workaround DistroBaker issue
|
||||
|
||||
* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.8.1-10
|
||||
- Bootstrap Maven for CentOS Stream 9
|
||||
|
||||
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.8.1-9
|
||||
- Bootstrap build
|
||||
- Non-bootstrap build
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.1-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.1-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Mon Jul 20 2020 Mat Booth <mat.booth@redhat.com> - 3.8.1-6
|
||||
- Add patch for NPE during testCompile
|
||||
|
||||
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 3.8.1-5
|
||||
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
|
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.8.1-2
|
||||
- Mass rebuild for javapackages-tools 201902
|
||||
|
||||
* Tue Oct 15 2019 Fabio Valentini <decathorpe@gmail.com> - 3.8.1-3
|
||||
- Port to plexus-languages 1.0.
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Sat Jun 08 2019 Fabio Valentini <decathorpe@gmail.com> - 3.8.1-1
|
||||
- Update to version 3.8.1.
|
||||
|
||||
* Tue Jun 04 2019 Marian Koncek <mkoncek@redhat.com> - 3.8.1-1
|
||||
- Update to upstream version 3.8.1
|
||||
|
||||
|
@ -60,6 +119,15 @@ API documentation for %{name}.
|
|||
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.7.0-3
|
||||
- Mass rebuild for javapackages-tools 201901
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Mon Aug 06 2018 Michael Simacek <msimacek@redhat.com> - 3.8.0-1
|
||||
- Update to upstream version 3.8.0
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
|
|
Loading…
Reference in New Issue