[maven/f20] (6 commits) ...Merge branch 'master' into f20
by Stanislav Ochotnicky
Summary of changes:
9b71af3... Update to upstream version 3.1.1 (*)
81679b6... Add dependencies of wagon-http-shaded to plexus.core (*)
a104903... Rebuild to regenerate broken POM files (*)
995d315... Add explicit requires (*)
5f933c9... Add OrderWithRequires: xmvn (*)
5fa1581... Merge branch 'master' into f20 (*)
(*) This commit already existed in another branch; no separate mail sent
10 years, 5 months
[Bug 1023015] New: [heads-up] Upcoming jline change in rawhide
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=1023015
Bug ID: 1023015
Summary: [heads-up] Upcoming jline change in rawhide
Product: Fedora
Version: rawhide
Component: lucene
Assignee: akurtako(a)redhat.com
Reporter: sgehwolf(a)redhat.com
QA Contact: extras-qa(a)fedoraproject.org
CC: akurtako(a)redhat.com, hicham.haouari(a)gmail.com,
java-sig-commits(a)lists.fedoraproject.org,
jerboaa(a)gmail.com, kdaniel(a)redhat.com
This bug is filed because lucene in rawhide lists jline as R/BR in its spec
file. Please see bug 1022897 for more info. Note that jline will become version
2.x. It would be strongly preferred if lucene could be made to work with jline
2.x. If this is not possible please change the R/BR to jline1 (see bug
1022908). Note that jline1 might get retired in a future version of Fedora. As
such jline 2.x should be used if at all possible.
Thanks for your cooperation!
--
You are receiving this mail because:
You are on the CC list for the bug.
Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=ranqbqyucA&a=cc_unsubscribe
10 years, 5 months
[lucene] Remove unneeded BR jline. Resolves RHBZ#1023015.
by jerboaa
commit 40ef0600b2e445370c7f4f7a34d6b6acb533b1e5
Author: Severin Gehwolf <sgehwolf(a)redhat.com>
Date: Wed Nov 6 11:54:39 2013 +0100
Remove unneeded BR jline. Resolves RHBZ#1023015.
lucene.spec | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/lucene.spec b/lucene.spec
index fc85e27..c1eaa64 100644
--- a/lucene.spec
+++ b/lucene.spec
@@ -31,7 +31,7 @@
Summary: High-performance, full-featured text search engine
Name: lucene
Version: 3.6.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Epoch: 0
License: ASL 2.0
URL: http://lucene.apache.org/
@@ -52,7 +52,6 @@ BuildRequires: ant-junit >= 0:1.6
BuildRequires: junit
BuildRequires: javacc
BuildRequires: java-javadoc
-BuildRequires: jline
BuildRequires: jtidy
BuildRequires: regexp
BuildRequires: apache-commons-digester
@@ -131,7 +130,7 @@ sed -i -e "s|jakarta-regexp|regexp|g" contrib/queries/ivy.xml
mkdir -p docs
mkdir -p lib
export OPT_JAR_LIST="ant/ant-junit junit"
-export CLASSPATH=$(build-classpath jline jtidy regexp commons-digester apache-commons-compress ivy)
+export CLASSPATH=$(build-classpath jtidy regexp commons-digester apache-commons-compress ivy)
ant -Divy.settings.file=ivy-conf.xml -Dbuild.sysclasspath=first \
@@ -145,7 +144,7 @@ ant -Divy.settings.file=ivy-conf.xml -Dbuild.sysclasspath=first \
jar-lucene-core docs javadocs-core
%if 0%{?fedora}
-export CLASSPATH=$(build-classpath jline jtidy regexp commons-digester apache-commons-compress icu4j ivy)
+export CLASSPATH=$(build-classpath jtidy regexp commons-digester apache-commons-compress icu4j ivy)
ant -Divy.settings.file=ivy-conf.xml -Dbuild.sysclasspath=first \
-Djavacc.home=%{_bindir}/javacc \
-Djavacc.jar=%{_javadir}/javacc.jar \
@@ -246,6 +245,9 @@ cp -pr build/docs/api/* \
%endif
%changelog
+* Wed Nov 06 2013 Severin Gehwolf <sgehwolf(a)redhat.com> 0:3.6.2-4
+- Remove unneeded BR jline. Resolves RHBZ#1023015.
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:3.6.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
10 years, 5 months
[maven: 4/4] Merge branch 'master' into f20
by Stanislav Ochotnicky
commit 5fa15811e9ed76604b5c36b597863a7c3529e499
Merge: 911334b 5f933c9
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Nov 5 17:43:42 2013 +0100
Merge branch 'master' into f20
Conflicts:
maven.spec
.gitignore | 1 +
0001-Migrate-from-easymock-1-to-easymock-3.patch | 22 ++++++++--------
0001-Update-Aether-to-0.9.0.M3.patch | 24 ++++++++--------
0005-Use-generics-in-modello-generated-code.patch | 22 ++++++++--------
maven.spec | 29 ++++++++++++++------
sources | 2 +-
6 files changed, 56 insertions(+), 44 deletions(-)
---
diff --cc maven.spec
index 64e4b8a,533fa4f..832e08a
--- a/maven.spec
+++ b/maven.spec
@@@ -1,6 -1,6 +1,6 @@@
Name: maven
- Version: 3.1.0
- Release: 11%{?dist}
+ Version: 3.1.1
-Release: 5%{?dist}
++Release: 12%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Tools
@@@ -267,16 -264,25 +264,30 @@@ ln -sf $(build-classpath plexus/classwo
%changelog
- * Mon Oct 21 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.1.0-11
++* Tue Nov 5 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.1.1-6
++- Update F20 to upstream bugfix release 3.1.1
++
+ * Tue Nov 5 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.1.1-5
- Add OrderWithRequires: xmvn
- Related: rhbz#1014355
+ * Tue Oct 29 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.1.1-4
+ - Add explicit requires
+
+ * Wed Oct 23 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.1.1-3
+ - Rebuild to regenerate broken POM files
+ - Related: rhbz#1021484
+
-* Mon Oct 21 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.1.1-2
+* Mon Oct 21 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.1.0-10
- Add dependencies of wagon-http-shaded to plexus.core
- Remove objectweb-asm from plexus.core
+- Add explicit requires
+- Resolves: rhbz#1023872
+ * Mon Oct 7 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.1.1-1
+ - Update to upstream version 3.1.1
+ - Remove patch for MNG-5503 (included upstream)
+
* Mon Sep 23 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.1.0-9
- Synchronize JAR list in lib/ with upstream release
- Remove test dependencies on aopalliance and cglib
10 years, 5 months
[maven] (4 commits) ...Merge branch 'master' into f20
by Stanislav Ochotnicky
Summary of changes:
9d97ab3... Add dependencies of wagon-http-shaded to plexus.core (*)
2287fc1... Add explicit requires (*)
911334b... Add OrderWithRequires: xmvn (*)
5fa1581... Merge branch 'master' into f20
(*) This commit already existed in another branch; no separate mail sent
10 years, 5 months
[maven-hpi-plugin] Update to upstream version 1.106
by Michal Srb
commit e28e38dfd31dc61a0cab5c0cb55f07124e6b48f7
Author: Michal Srb <msrb(a)redhat.com>
Date: Wed Nov 6 07:38:39 2013 +0100
Update to upstream version 1.106
.gitignore | 1 +
maven-hpi-plugin.spec | 11 ++++++++---
sources | 2 +-
3 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2eb965e..e12f919 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/maven-hpi-plugin-1.98.tar.gz
/maven-hpi-plugin-1.99.tar.gz
/maven-hpi-plugin-1.100.tar.gz
+/maven-hpi-plugin-1.106.tar.gz
diff --git a/maven-hpi-plugin.spec b/maven-hpi-plugin.spec
index 5bdec30..d2c555d 100644
--- a/maven-hpi-plugin.spec
+++ b/maven-hpi-plugin.spec
@@ -1,5 +1,5 @@
Name: maven-hpi-plugin
-Version: 1.100
+Version: 1.106
Release: 1%{?dist}
Summary: Maven plugin to build Jenkins plugins
@@ -38,6 +38,8 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
BuildRequires: mvn(org.jenkins-ci:version-number)
BuildRequires: mvn(org.kohsuke.stapler:stapler-groovy)
BuildRequires: ant-apache-regexp
+BuildRequires: maven-dependency-plugin
+BuildRequires: icu4j
%description
@@ -57,12 +59,12 @@ This package contains the API documentation for %{name}.
cp %{SOURCE1} LICENSE-ASL
cp %{SOURCE2} LICENSE-MIT
-%patch0 -p1
+%patch0 -p1 -F2
# Replace bundled class from org.jenkins-ci:version-number with proper dependency
rm ./src/main/java/org/jenkinsci/maven/plugins/hpi/VersionNumber.java
%pom_add_dep org.jenkins-ci:version-number
-%patch1 -p1
+%patch1 -p1 -F2
# Fix groupId for ant-apache-regexp
%pom_xpath_replace "pom:dependency[pom:artifactId[text()='ant-apache-regexp']]/pom:groupId" \
@@ -100,6 +102,9 @@ rm src/main/java/org/jenkinsci/maven/plugins/hpi/CreateMojo.java
%changelog
+* Wed Nov 06 2013 Michal Srb <msrb(a)redhat.com> - 1.106-1
+- Update to upstream version 1.106
+
* Wed Oct 30 2013 Michal Srb <msrb(a)redhat.com> - 1.100-1
- Update to upstream version 1.100
diff --git a/sources b/sources
index 6123410..3cc8805 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt
0f3abd1e8ab49fa980c02e7b8e543fc3 LICENSE-MIT.txt
-a95a64c55b5d10d3a54aa8be38fa7ab3 maven-hpi-plugin-1.100.tar.gz
+a7b116e93704814aa6618c31d13eeaba maven-hpi-plugin-1.106.tar.gz
10 years, 5 months
[javapackages-tools] Update to upstream bugfix release 3.4.1
by Stanislav Ochotnicky
commit 7865f437c4349b46fa5b4639ebd9a89049dc2a5b
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Nov 5 16:50:56 2013 +0100
Update to upstream bugfix release 3.4.1
.gitignore | 1 +
...x-XMvn-configuration-for-native-JNI-repos.patch | 35 --------------------
javapackages-tools.spec | 11 +++---
sources | 2 +-
4 files changed, 7 insertions(+), 42 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fd627a9..6c014e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,3 +56,4 @@
/javapackages-3.3.0.tar.xz
/javapackages-3.3.1.tar.xz
/javapackages-3.4.0.tar.xz
+/javapackages-3.4.1.tar.xz
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 0b34beb..b1f8039 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -1,6 +1,6 @@
Name: javapackages-tools
-Version: 3.4.0
-Release: 3%{?dist}
+Version: 3.4.1
+Release: 1%{?dist}
Summary: Macros and scripts for Java packaging support
@@ -8,9 +8,6 @@ License: BSD
URL: https://fedorahosted.org/javapackages/
Source0: https://fedorahosted.org/released/javapackages/javapackages-%{version}.ta...
-# For for rhbz#1021608, backported from upstream commit 5cf973e
-Patch0001: 0001-Fix-XMvn-configuration-for-native-JNI-repos.patch
-
BuildArch: noarch
BuildRequires: jpackage-utils
@@ -91,7 +88,6 @@ Requires: fedora-review
%prep
%setup -q -n javapackages-%{version}
-%patch0001 -p1
%build
%configure
@@ -132,6 +128,9 @@ popd
%changelog
+* Tue Nov 05 2013 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 3.4.1-1
+- Update to upstream bugfix release 3.4.1
+
* Mon Oct 21 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.4.0-3
- Fix XMvn configuration for native JNI repos
- Resolves: rhbz#1021608
diff --git a/sources b/sources
index 452ab4b..94815dc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-685c7aae7d070418d3a9d60d82c7b270 javapackages-3.4.0.tar.xz
+6abef7f7bf08c84fc62f03f8d03f8959 javapackages-3.4.1.tar.xz
10 years, 5 months
[maven/f20] Add OrderWithRequires: xmvn
by Mikolaj Izdebski
commit 911334bb1ec770c5c3a7268e48eb6d83f52f8d45
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Nov 5 17:10:31 2013 +0100
Add OrderWithRequires: xmvn
- Related: rhbz#1014355
maven.spec | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/maven.spec b/maven.spec
index f10fee0..64e4b8a 100644
--- a/maven.spec
+++ b/maven.spec
@@ -1,6 +1,6 @@
Name: maven
Version: 3.1.0
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Tools
@@ -25,6 +25,10 @@ Patch300: 0001-MNG-5503-Fix-for-the-issue-where-Maven-3.1.0-fails-t.patch
BuildArch: noarch
+# If XMvn is part of the same RPM transaction then it should be
+# installed first to avoid triggering rhbz#1014355.
+OrderWithRequires: xmvn
+
BuildRequires: maven-local
BuildRequires: aether-api >= 1:0
@@ -263,6 +267,10 @@ ln -sf $(build-classpath plexus/classworlds) \
%changelog
+* Mon Oct 21 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.1.0-11
+- Add OrderWithRequires: xmvn
+- Related: rhbz#1014355
+
* Mon Oct 21 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.1.0-10
- Add dependencies of wagon-http-shaded to plexus.core
- Remove objectweb-asm from plexus.core
10 years, 5 months