[javapackages] [mvn_artifact] Fix "TypeError: process_raw_request() got an unexpected keyword argument 'scl'"
by Michal Srb
commit 20e013184330fa3b02340266dbe46d2660298978
Author: Michal Srb <msrb(a)redhat.com>
Date: Wed Jan 7 00:47:08 2015 +0100
[mvn_artifact] Fix "TypeError: process_raw_request() got an unexpected keyword argument 'scl'"
java-utils/mvn_artifact.py | 12 +++++-------
macros.d/macros.xmvn | 2 +-
2 files changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/java-utils/mvn_artifact.py b/java-utils/mvn_artifact.py
index 0bd97e0..52d6dac 100644
--- a/java-utils/mvn_artifact.py
+++ b/java-utils/mvn_artifact.py
@@ -88,7 +88,7 @@ class UnknownVersion(Exception):
pass
-def get_parent_pom(pom, scl=None):
+def get_parent_pom(pom):
try:
metadata = Metadata(config)
known_artifacts = metadata.get_provided_artifacts()
@@ -103,7 +103,7 @@ def get_parent_pom(pom, scl=None):
req = ResolutionRequest(pom.groupId, pom.artifactId,
extension="pom", version=pom.version)
- result = XMvnResolve.process_raw_request([req], scl=scl)[0]
+ result = XMvnResolve.process_raw_request([req])[0]
if not result:
raise Exception("Unable to resolve parent POM")
@@ -169,7 +169,7 @@ def expand_props(deps, props):
d.interpolate(props)
-def gather_dependencies(pom_path, scl=None):
+def gather_dependencies(pom_path):
if not pom_path:
return []
pom = POM(pom_path)
@@ -189,7 +189,7 @@ def gather_dependencies(pom_path, scl=None):
except PomLoadingException:
pass
if not ppom:
- ppom = get_parent_pom(parent, scl=scl)
+ ppom = get_parent_pom(parent)
parent = ppom.parent
pom_props = get_model_variables(ppom)
@@ -246,8 +246,6 @@ if __name__ == "__main__":
help="skip dependencies section in resulting metadata")
parser.add_option("-D", action="append", type="str",
help="add artifact property", metavar="property=value")
- parser.add_option("-n", "--namespace", type="str",
- help=SUPPRESS_HELP, default=None)
sys.argv = args_to_unicode(sys.argv)
@@ -300,7 +298,7 @@ if __name__ == "__main__":
if (not options.skip_dependencies and pom_path
and not is_it_ivy_file(pom_path)):
deps = []
- mvn_deps = gather_dependencies(pom_path, scl=options.namespace)
+ mvn_deps = gather_dependencies(pom_path)
for d in mvn_deps:
deps.append(MetadataDependency.from_mvn_dependency(d))
if deps:
diff --git a/macros.d/macros.xmvn b/macros.d/macros.xmvn
index 1a587fb..e7a6dda 100644
--- a/macros.d/macros.xmvn
+++ b/macros.d/macros.xmvn
@@ -118,7 +118,7 @@
#
# Usage: %mvn_artifact <pom> [<artifact-file>]
#
-%mvn_artifact %{pyinterpreter} %{javadir}-utils/mvn_artifact.py %{?scl:-n %{?scl}}
+%mvn_artifact %{pyinterpreter} %{javadir}-utils/mvn_artifact.py
# %mvn_build - build Maven project
9 years, 4 months
[solr] update to 4.10.3
by gil
commit 6fbf8777a5c3b6cc6967203dd57a7fd594e7e206
Author: gil <puntogil(a)libero.it>
Date: Tue Jan 6 20:53:13 2015 +0100
update to 4.10.3
sources | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/sources b/sources
index 2b86080..ec0201b 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
958f078ad0fe0f07b1c3a590f93b4f32 solr-4.10.3-src.tgz
+192ccf8d46c47f84c2e3f2fe79df2304 solr-poms-4.10.3.tar.xz
9 years, 4 months
[solr] update to 4.10.3
by gil
commit a779ca8a9b1ef3d0f33cbbac8ff1c83e337c8f10
Author: gil <puntogil(a)libero.it>
Date: Tue Jan 6 20:49:51 2015 +0100
update to 4.10.3
9 years, 4 months
[solr] update to 4.10.3
by gil
commit 1fae2163ad8d8e4b92cca9fbf0e393dd2e8941fe
Author: gil <puntogil(a)libero.it>
Date: Tue Jan 6 20:46:00 2015 +0100
update to 4.10.3
.gitignore | 1 +
sources | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7dd1696..e504035 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
/solr-4.10.2-src.tgz
/sorl-poms-4.10.2.tar.xz
/solr-poms-4.10.3.tar.xz
+/solr-4.10.3-src.tgz
diff --git a/sources b/sources
index 42e2667..2b86080 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-192ccf8d46c47f84c2e3f2fe79df2304 solr-poms-4.10.3.tar.xz
+958f078ad0fe0f07b1c3a590f93b4f32 solr-4.10.3-src.tgz
9 years, 4 months
[solr] update to 4.10.3
by gil
commit b80f7250816ff2b756a52e962ebdc8b9302127ea
Author: gil <puntogil(a)libero.it>
Date: Tue Jan 6 17:47:14 2015 +0100
update to 4.10.3
solr.spec | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/solr.spec b/solr.spec
index 92d0b7e..3028a5f 100644
--- a/solr.spec
+++ b/solr.spec
@@ -119,16 +119,18 @@ BuildRequires: mvn(com.typesafe:config)
BuildRequires: mvn(org.apache.hadoop:hadoop-mapreduce-client-core)
# https://bugzilla.redhat.com/show_bug.cgi?id=1087895
BuildRequires: mvn(net.sourceforge.argparse4j:argparse4j)
-# NOT available https://bugzilla.redhat.com/show_bug.cgi?id=1076620
-BuildRequires: mvn(net.sf.saxon:Saxon-HE:9.5.1-4)
# ... work in progress ... circular deps
+# https://bugzilla.redhat.com/show_bug.cgi?id=1179355
BuildRequires: mvn(org.kitesdk:kite-morphlines-avro)
BuildRequires: mvn(org.kitesdk:kite-morphlines-core)
BuildRequires: mvn(org.kitesdk:kite-morphlines-hadoop-sequencefile)
BuildRequires: mvn(org.kitesdk:kite-morphlines-json)
-BuildRequires: mvn(org.kitesdk:kite-morphlines-saxon)
BuildRequires: mvn(org.kitesdk:kite-morphlines-tika-core)
BuildRequires: mvn(org.kitesdk:kite-morphlines-tika-decompress)
+# NOT available https://bugzilla.redhat.com/show_bug.cgi?id=1076620
+BuildRequires: mvn(net.sf.saxon:Saxon-HE:9.5.1-4)
+BuildRequires: mvn(org.kitesdk:kite-morphlines-saxon)
+
BuildRequires: mvn(org.kitesdk:kite-morphlines-twitter)
%endif
9 years, 4 months