[zookeeper] Update to push back to jline 1.
by tstclair
commit a504250284f2d95409394c1a30200b2e4887566c
Author: Timothy St. Clair <tstclair(a)redhat.com>
Date: Mon Jan 27 15:40:13 2014 -0600
Update to push back to jline 1.
zookeeper.spec | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/zookeeper.spec b/zookeeper.spec
index e956388..ad4a5d3 100644
--- a/zookeeper.spec
+++ b/zookeeper.spec
@@ -45,7 +45,7 @@ BuildRequires: ant
BuildRequires: ant-junit
BuildRequires: apache-ivy
BuildRequires: checkstyle
-BuildRequires: jline
+BuildRequires: jline1
BuildRequires: jtoaster
BuildRequires: junit
BuildRequires: log4j
@@ -96,7 +96,7 @@ Summary: Zookeeper Java client library
# Requires: felix-framework
# Requires: felix-osgi-compendium
Requires: checkstyle
-Requires: jline
+Requires: jline1
Requires: jtoaster
Requires: junit
Requires: log4j
@@ -168,7 +168,7 @@ find -name "*.dll" -delete
%patch7 -p1
%patch8 -p0
-sed -i "s|<version>0.9.94</version>|<version>2.10</version>|" dist-maven/%{name}-%{version}.pom
+sed -i "s|<version>0.9.94</version>|<version>1.0</version>|" dist-maven/%{name}-%{version}.pom
sed -i "s|<version>3.2.2.Final</version>|<version>3.6.6.Final</version>|" dist-maven/%{name}-%{version}.pom
sed -i "s|org.jboss.netty|io.netty|" dist-maven/%{name}-%{version}.pom
@@ -374,7 +374,7 @@ getent passwd zookeeper >/dev/null || \
%changelog
* Fri Jan 24 2014 Timothy St. Clair <tstclair(a)redhat.com> - 3.4.5-15
-- Update dependencies to jline and netty3
+- Update jline and netty3 for f21 builds
* Fri Oct 25 2013 Timothy St. Clair <tstclair(a)redhat.com> - 3.4.5-14
- Update dependencies to jline1
10 years, 4 months
[zookeeper] Remove ivy resolver for netty and jline
by tstclair
commit 01a44854caf1b0c8f162d127c33e6935bd2b46f0
Author: Timothy St. Clair <tstclair(a)redhat.com>
Date: Mon Jan 27 15:06:02 2014 -0600
Remove ivy resolver for netty and jline
zookeeper-3.4.4-build.patch | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/zookeeper-3.4.4-build.patch b/zookeeper-3.4.4-build.patch
index efc6e2f..b6e2380 100644
--- a/zookeeper-3.4.4-build.patch
+++ b/zookeeper-3.4.4-build.patch
@@ -410,9 +410,10 @@ diff -Nru zookeeper-3.4.4/ivy.xml zookeeper-3.4.4-gil/ivy.xml
- <dependency org="org.jboss.netty" name="netty" conf="default" rev="3.2.2.Final">
- <artifact name="netty" type="jar" conf="default"/>
-+ <dependency org="io.netty" name="netty" conf="default" rev="">
+- </dependency>
++ <!--<dependency org="io.netty" name="netty" conf="default" rev="">
+ <artifact name="netty3-3" type="jar" conf="default"/>
- </dependency>
++ </dependency> -->
- <dependency org="org.vafer" name="jdeb" rev="0.8" conf="package->master"/>
+ <!--dependency org="org.vafer" name="jdeb" rev="0.8" conf="package->master"/-->
10 years, 4 months
[zookeeper] Fix for netty3 change
by tstclair
commit 8e2027eb98d9c24ac291b8614b82cd1d9b236e13
Author: Timothy St. Clair <tstclair(a)redhat.com>
Date: Mon Jan 27 14:52:30 2014 -0600
Fix for netty3 change
zookeeper-3.4.4-build.patch | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/zookeeper-3.4.4-build.patch b/zookeeper-3.4.4-build.patch
index 65002fe..efc6e2f 100644
--- a/zookeeper-3.4.4-build.patch
+++ b/zookeeper-3.4.4-build.patch
@@ -409,8 +409,9 @@ diff -Nru zookeeper-3.4.4/ivy.xml zookeeper-3.4.4-gil/ivy.xml
+ <!--<dependency org="jline" name="jline" rev="" transitive="false" conf="default"/>-->
- <dependency org="org.jboss.netty" name="netty" conf="default" rev="3.2.2.Final">
+- <artifact name="netty" type="jar" conf="default"/>
+ <dependency org="io.netty" name="netty" conf="default" rev="">
- <artifact name="netty" type="jar" conf="default"/>
++ <artifact name="netty3-3" type="jar" conf="default"/>
</dependency>
- <dependency org="org.vafer" name="jdeb" rev="0.8" conf="package->master"/>
10 years, 4 months
[zookeeper] Update to build f21-rawhide against jline 2.10 and netty3
by tstclair
commit 671bd1786baf1b22ea8f681a6a4aa9b76a59d8f6
Author: Timothy St. Clair <tstclair(a)redhat.com>
Date: Mon Jan 27 14:15:30 2014 -0600
Update to build f21-rawhide against jline 2.10 and netty3
zookeeper-3.4.4-build.patch | 4 ++--
zookeeper.spec | 16 ++++++++++++----
2 files changed, 14 insertions(+), 6 deletions(-)
---
diff --git a/zookeeper-3.4.4-build.patch b/zookeeper-3.4.4-build.patch
index 609c76e..65002fe 100644
--- a/zookeeper-3.4.4-build.patch
+++ b/zookeeper-3.4.4-build.patch
@@ -406,10 +406,10 @@ diff -Nru zookeeper-3.4.4/ivy.xml zookeeper-3.4.4-gil/ivy.xml
- <dependency org="log4j" name="log4j" rev="1.2.15" transitive="false" conf="default"/>
- <dependency org="jline" name="jline" rev="0.9.94" transitive="false" conf="default"/>
+ <dependency org="log4j" name="log4j" rev="" transitive="false" conf="default"/>
-+ <dependency org="jline" name="jline" rev="" transitive="false" conf="default"/>
++ <!--<dependency org="jline" name="jline" rev="" transitive="false" conf="default"/>-->
- <dependency org="org.jboss.netty" name="netty" conf="default" rev="3.2.2.Final">
-+ <dependency org="org.jboss.netty" name="netty" conf="default" rev="">
++ <dependency org="io.netty" name="netty" conf="default" rev="">
<artifact name="netty" type="jar" conf="default"/>
</dependency>
diff --git a/zookeeper.spec b/zookeeper.spec
index 24f9d01..e956388 100644
--- a/zookeeper.spec
+++ b/zookeeper.spec
@@ -1,7 +1,8 @@
%global _hardened_build 1
+
Name: zookeeper
Version: 3.4.5
-Release: 14%{?dist}
+Release: 15%{?dist}
Summary: A high-performance coordination service for distributed applications
#Group: Development/Libraries
License: ASL 2.0 and BSD
@@ -44,12 +45,12 @@ BuildRequires: ant
BuildRequires: ant-junit
BuildRequires: apache-ivy
BuildRequires: checkstyle
-BuildRequires: jline1
+BuildRequires: jline
BuildRequires: jtoaster
BuildRequires: junit
BuildRequires: log4j
BuildRequires: mockito
-BuildRequires: netty
+BuildRequires: netty3
BuildRequires: slf4j
BuildRequires: xerces-j2
BuildRequires: xml-commons-apis
@@ -100,7 +101,7 @@ Requires: jtoaster
Requires: junit
Requires: log4j
Requires: mockito
-Requires: netty
+Requires: netty3
Requires: slf4j
Requires: java
@@ -167,6 +168,10 @@ find -name "*.dll" -delete
%patch7 -p1
%patch8 -p0
+sed -i "s|<version>0.9.94</version>|<version>2.10</version>|" dist-maven/%{name}-%{version}.pom
+sed -i "s|<version>3.2.2.Final</version>|<version>3.6.6.Final</version>|" dist-maven/%{name}-%{version}.pom
+sed -i "s|org.jboss.netty|io.netty|" dist-maven/%{name}-%{version}.pom
+
sed -i "s|<packaging>pom</packaging>|<packaging>jar</packaging>|" dist-maven/%{name}-%{version}.pom
sed -i "s|<groupId>checkstyle</groupId>|<groupId>com.puppycrawl.tools</groupId>|" dist-maven/%{name}-%{version}.pom
sed -i "s|<artifactId>mockito-all</artifactId>|<artifactId>mockito-core</artifactId>|" dist-maven/%{name}-%{version}.pom
@@ -368,6 +373,9 @@ getent passwd zookeeper >/dev/null || \
%{_unitdir}/zookeeper.service
%changelog
+* Fri Jan 24 2014 Timothy St. Clair <tstclair(a)redhat.com> - 3.4.5-15
+- Update dependencies to jline and netty3
+
* Fri Oct 25 2013 Timothy St. Clair <tstclair(a)redhat.com> - 3.4.5-14
- Update dependencies to jline1
10 years, 4 months
[plexus-utils] Update to upstream version 3.0.16
by Mikolaj Izdebski
commit a43e97af3c703183e659ca2288e662a14fd6c03b
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Jan 27 14:49:38 2014 +0100
Update to upstream version 3.0.16
.gitignore | 1 +
plexus-utils.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c0c1647..e0f6290 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ plexus-utils-3.0.tar.xz
/LICENSE-2.0.txt
/plexus-utils-3.0.9.tar.gz
/plexus-utils-3.0.14.tar.gz
+/plexus-utils-3.0.16.tar.gz
diff --git a/plexus-utils.spec b/plexus-utils.spec
index 9a728fc..3c5ba57 100644
--- a/plexus-utils.spec
+++ b/plexus-utils.spec
@@ -32,7 +32,7 @@
%global subname utils
Name: plexus-utils
-Version: 3.0.14
+Version: 3.0.16
Release: 1%{?dist}
Summary: Plexus Common Utilities
# ASL 1.1: several files in src/main/java/org/codehaus/plexus/util/
@@ -127,6 +127,9 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%doc %{_javadocdir}/%{name}
%changelog
+* Mon Jan 27 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.0.16-1
+- Update to upstream version 3.0.16
+
* Fri Aug 9 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.0.14-1
- Update to upstream version 3.0.14
diff --git a/sources b/sources
index cbeb89c..56597cc 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
+53ed6c81cd751e6793a1fe18e1adb139 plexus-utils-3.0.16.tar.gz
3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt
-ced919534891e5b0f2f3b5cd693033f1 plexus-utils-3.0.14.tar.gz
10 years, 4 months