commit 31f5f5ebec7d637f0caae3c76845689d52b3859a
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri Apr 4 09:01:46 2014 +0200
Use jline1
groovy needs jline1 so this patch for Jenkins causes only trouble for
now.
jenkins.spec | 16 ++++++++++------
use-jline2.patch | 34 ----------------------------------
2 files changed, 10 insertions(+), 40 deletions(-)
---
diff --git a/jenkins.spec b/jenkins.spec
index e833aae..268361d 100644
--- a/jenkins.spec
+++ b/jenkins.spec
@@ -5,7 +5,7 @@
Name: jenkins
Version: 1.557
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: An extendable open source continuous integration server
# The project's primary license is MIT
@@ -42,8 +42,6 @@ Patch4: fix-objectweb-asm-namespace.patch
Patch5: remove-solaris-support-in-su.patch
# jna-posix library is not in Fedora, we use jnr-posix
Patch6: drop-jna-posix-compatibility.patch
-# move to jline2
-Patch7: use-jline2.patch
# build against newer commons fileupload
Patch8: use-commons-fileupload-1.3.patch
# newer args4j
@@ -92,7 +90,7 @@ BuildRequires: mvn(javax.mail:mail)
BuildRequires: mvn(javax.servlet:jstl)
BuildRequires: mvn(javax.servlet:servlet-api)
BuildRequires: mvn(jaxen:jaxen)
-BuildRequires: mvn(jline:jline)
+BuildRequires: mvn(jline:jline:1)
BuildRequires: mvn(junit:junit)
BuildRequires: mvn(net.java.dev.jna:jna)
BuildRequires: mvn(net.java.sezpoz:sezpoz)
@@ -221,7 +219,7 @@ Requires: apache-sshd
Requires: xpp3-minimal
Requires: bouncycastle
Requires: easymock
-Requires: jline
+Requires: jline1
Requires: objectweb-asm
Requires: jaxen
Requires: jnr-constants
@@ -378,7 +376,6 @@ This package contains API documentation for %{name}.
%patch4 -p1
%patch5 -p1
%patch6 -p1
-%patch7 -p1
%patch8 -p1
%patch10 -p1
#%%patch11 -p1
@@ -497,6 +494,10 @@ cp %{SOURCE3} LICENSE-BSD.txt
%pom_remove_dep org.jvnet.hudson:commons-jelly-tags-define core
%pom_add_dep commons-jelly:commons-jelly-tags-define core
+# jline 1.x is a compat package
+%pom_remove_dep jline:jline core
+%pom_add_dep jline:jline:1 core
+
%build
%mvn_build -f
@@ -586,6 +587,9 @@ cp -p %{SOURCE5} %{buildroot}/%{homedir}/webapp/META-INF/context.xml
%doc LICENSE.txt
%changelog
+* Fri Apr 04 2014 Michal Srb <msrb(a)redhat.com> - 1.557-5
+- Use jline1
+
* Thu Apr 03 2014 Michal Srb <msrb(a)redhat.com> - 1.557-4
- Symlink remoting and cli JAR
Show replies by date