Compare commits
No commits in common. "c8-beta-stream-201801" and "c8-stream-3.6" have entirely different histories.
c8-beta-st
...
c8-stream-
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
|||||||
SOURCES/plexus-utils-3.1.0.tar.gz
|
SOURCES/plexus-utils-3.3.0.tar.gz
|
||||||
|
@ -1 +1 @@
|
|||||||
bde480ebdca31097e8a70e8c0760bb2cac34baa1 SOURCES/plexus-utils-3.1.0.tar.gz
|
31ff15c239124e2bd54dd63f39819807995a59fb SOURCES/plexus-utils-3.3.0.tar.gz
|
||||||
|
@ -1,25 +0,0 @@
|
|||||||
From 978fcb3b207d1b1a9895dadd40ba31c290c57918 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Michael Simacek <msimacek@redhat.com>
|
|
||||||
Date: Wed, 11 Jul 2018 13:15:55 +0200
|
|
||||||
Subject: [PATCH] Follow symlinks in NioFiles.copy
|
|
||||||
|
|
||||||
---
|
|
||||||
src/main/java/org/codehaus/plexus/util/NioFiles.java | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/main/java/org/codehaus/plexus/util/NioFiles.java b/src/main/java/org/codehaus/plexus/util/NioFiles.java
|
|
||||||
index 2841978..50cdeb7 100644
|
|
||||||
--- a/src/main/java/org/codehaus/plexus/util/NioFiles.java
|
|
||||||
+++ b/src/main/java/org/codehaus/plexus/util/NioFiles.java
|
|
||||||
@@ -138,7 +138,7 @@ public static File copy( File source, File target )
|
|
||||||
throws IOException
|
|
||||||
{
|
|
||||||
Path copy = Files.copy( source.toPath(), target.toPath(), StandardCopyOption.REPLACE_EXISTING,
|
|
||||||
- StandardCopyOption.COPY_ATTRIBUTES, LinkOption.NOFOLLOW_LINKS );
|
|
||||||
+ StandardCopyOption.COPY_ATTRIBUTES );
|
|
||||||
return copy.toFile();
|
|
||||||
}
|
|
||||||
|
|
||||||
--
|
|
||||||
2.17.1
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
|||||||
Name: plexus-utils
|
Name: plexus-utils
|
||||||
Version: 3.1.0
|
Version: 3.3.0
|
||||||
Release: 3%{?dist}
|
Release: 3%{?dist}
|
||||||
Summary: Plexus Common Utilities
|
Summary: Plexus Common Utilities
|
||||||
# ASL 1.1: several files in src/main/java/org/codehaus/plexus/util/
|
# ASL 1.1: several files in src/main/java/org/codehaus/plexus/util/
|
||||||
@ -17,10 +17,7 @@ BuildArch: noarch
|
|||||||
Source0: https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{version}.tar.gz
|
Source0: https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{version}.tar.gz
|
||||||
Source1: http://apache.org/licenses/LICENSE-2.0.txt
|
Source1: http://apache.org/licenses/LICENSE-2.0.txt
|
||||||
|
|
||||||
# https://github.com/codehaus-plexus/plexus-utils/issues/45
|
BuildRequires: maven-local-openjdk8
|
||||||
Patch1: 0001-Follow-symlinks-in-NioFiles.copy.patch
|
|
||||||
|
|
||||||
BuildRequires: maven-local
|
|
||||||
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
|
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
|
||||||
BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin)
|
BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin)
|
||||||
BuildRequires: mvn(org.codehaus.plexus:plexus:pom:)
|
BuildRequires: mvn(org.codehaus.plexus:plexus:pom:)
|
||||||
@ -33,17 +30,12 @@ reusable components for hibernate, form processing, jndi, i18n,
|
|||||||
velocity, etc. Plexus also includes an application server which
|
velocity, etc. Plexus also includes an application server which
|
||||||
is like a J2EE application server, without all the baggage.
|
is like a J2EE application server, without all the baggage.
|
||||||
|
|
||||||
%package javadoc
|
%{?module_package}
|
||||||
Summary: Javadoc for %{name}
|
%{?javadoc_package}
|
||||||
|
|
||||||
%description javadoc
|
|
||||||
Javadoc for %{name}.
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{name}-%{version}
|
%setup -q -n %{name}-%{name}-%{version}
|
||||||
|
|
||||||
%patch1 -p1
|
|
||||||
|
|
||||||
cp %{SOURCE1} .
|
cp %{SOURCE1} .
|
||||||
|
|
||||||
%mvn_file : plexus/utils
|
%mvn_file : plexus/utils
|
||||||
@ -70,13 +62,28 @@ cp %{SOURCE1} .
|
|||||||
%install
|
%install
|
||||||
%mvn_install
|
%mvn_install
|
||||||
|
|
||||||
%files -f .mfiles
|
%files -n %{?module_prefix}%{name} -f .mfiles
|
||||||
%doc NOTICE.txt LICENSE-2.0.txt
|
%license NOTICE.txt LICENSE-2.0.txt
|
||||||
|
|
||||||
%files javadoc -f .mfiles-javadoc
|
|
||||||
%doc NOTICE.txt LICENSE-2.0.txt
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.0-3
|
||||||
|
- Build with OpenJDK 8
|
||||||
|
|
||||||
|
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.0-2
|
||||||
|
- Mass rebuild for javapackages-tools 201902
|
||||||
|
|
||||||
|
* Wed Oct 23 2019 Marian Koncek <mkoncek@redhat.com> - 3.3.0-1
|
||||||
|
- Update to upstream verssion 3.3.0
|
||||||
|
|
||||||
|
* Mon Jul 29 2019 Marian Koncek <mkoncek@redhat.com> - 3.2.1-1
|
||||||
|
- Update to upstream version 3.2.1
|
||||||
|
|
||||||
|
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.0-2
|
||||||
|
- Mass rebuild for javapackages-tools 201901
|
||||||
|
|
||||||
|
* Sat Apr 13 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.0-1
|
||||||
|
- Update to upstream version 3.2.0
|
||||||
|
|
||||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-3
|
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-3
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user