[javapackages] [mvn_artifact] Do not overwrite existing properties when adding new one
by Michal Srb
commit 3d20239f57ee992c0309c58a06f25f9345f6ea9a
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri May 30 08:57:18 2014 +0200
[mvn_artifact] Do not overwrite existing properties when adding new one
java-utils/mvn_artifact.py | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/java-utils/mvn_artifact.py b/java-utils/mvn_artifact.py
index 57059b7..9c0d55a 100644
--- a/java-utils/mvn_artifact.py
+++ b/java-utils/mvn_artifact.py
@@ -115,17 +115,17 @@ def add_artifact_elements(root, uart, ppath=None, jpath=None):
for path in [ppath, jpath]:
if path:
a = uart.to_metadata()
+ props = []
if path is ppath:
if not is_it_ivy_file(ppath):
a.extension = "pom"
else:
a.extension = os.path.splitext(pom_path)[1][1:]
- ty = Depmap.build_property('type', 'ivy')
- a.properties = pyxb.BIND(ty)
+ props.append(Depmap.build_property('type', 'ivy'))
a.path = os.path.abspath(path)
- prop = Depmap.build_property('xmvn.resolver.disableEffectivePom', 'true')
- a.properties = pyxb.BIND(prop)
+ props.append(Depmap.build_property('xmvn.resolver.disableEffectivePom', 'true'))
+ a.properties = pyxb.BIND(*props)
artifacts.append(a)
if root.artifacts is None:
10 years
[javapackages] [artifact] Handle the properties properly
by Michal Srb
commit 5293def5a12e651485b6bfd800ea50cbe91d0e21
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri May 30 08:52:53 2014 +0200
[artifact] Handle the properties properly
python/javapackages/artifact.py | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/python/javapackages/artifact.py b/python/javapackages/artifact.py
index 51114f8..33d1583 100644
--- a/python/javapackages/artifact.py
+++ b/python/javapackages/artifact.py
@@ -149,10 +149,9 @@ class ProvidedArtifact(object):
a.aliases = pyxb.BIND(*als)
if self.properties:
- for k, v in self.properties.iteritems():
- import javapackages.depmap
- prop = javapackages.depmap.Depmap.build_property(k, v)
- a.properties = pyxb.BIND(prop)
+ import javapackages.depmap
+ prop = [javapackages.depmap.Depmap.build_property(k, v) for k, v in self.properties.iteritems()]
+ a.properties = pyxb.BIND(*prop)
return a
10 years
[javapackages] [test] Skip tests for maven_depmap and mvn_artifact for now
by Michal Srb
commit d827aa3c39daff40d9acd851edf4fcb7d48f7c31
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri May 30 07:44:37 2014 +0200
[test] Skip tests for maven_depmap and mvn_artifact for now
test/run_tests.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/test/run_tests.sh b/test/run_tests.sh
index 55d47cd..8bdc221 100755
--- a/test/run_tests.sh
+++ b/test/run_tests.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-PYTHONPATH="../python" nosetests --with-xunit --exclude=maven_prov_test_fuzzed.py
+PYTHONPATH="../python" nosetests --with-xunit --exclude="(maven_prov)|(maven_depmap)|(mvn_artifact)_test.py"
r1=$?
r2=0
10 years
[javapackages] [maven_depmap] Add xmvn.resolver.disableEffectivePom property to every metadata
by Michal Srb
commit 4f6964866c4a32845b4a340c0d6279e911c836dd
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri May 30 07:20:54 2014 +0200
[maven_depmap] Add xmvn.resolver.disableEffectivePom property to every metadata
java-utils/maven_depmap.py | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/java-utils/maven_depmap.py b/java-utils/maven_depmap.py
index 9377725..c80ff5b 100644
--- a/java-utils/maven_depmap.py
+++ b/java-utils/maven_depmap.py
@@ -280,6 +280,7 @@ if __name__ == "__main__":
if namespace:
artifact.namespace = namespace
+ artifact.properties["xmvn.resolver.disableEffectivePom"] = "true"
buildroot = os.environ.get('RPM_BUILD_ROOT')
10 years
[javapackages] [mvn_artifact] Add xmvn.resolver.disableEffectivePom property to every metadata
by Michal Srb
commit fa1024b3b82612e1f495bc2f1680b8e6080f3a0c
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri May 30 07:19:49 2014 +0200
[mvn_artifact] Add xmvn.resolver.disableEffectivePom property to every metadata
java-utils/mvn_artifact.py | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
---
diff --git a/java-utils/mvn_artifact.py b/java-utils/mvn_artifact.py
index 3b3b411..57059b7 100644
--- a/java-utils/mvn_artifact.py
+++ b/java-utils/mvn_artifact.py
@@ -120,17 +120,12 @@ def add_artifact_elements(root, uart, ppath=None, jpath=None):
a.extension = "pom"
else:
a.extension = os.path.splitext(pom_path)[1][1:]
-
- # add property "type"
- #domimpl = getDOMImplementation()
- #doc = domimpl.createDocument(None, None, None)
- #ty = doc.createElement('type')
- #te = doc.createTextNode('ivy')
- #ty.appendChild(te)
ty = Depmap.build_property('type', 'ivy')
a.properties = pyxb.BIND(ty)
a.path = os.path.abspath(path)
+ prop = Depmap.build_property('xmvn.resolver.disableEffectivePom', 'true')
+ a.properties = pyxb.BIND(prop)
artifacts.append(a)
if root.artifacts is None:
10 years
[javapackages] [artifact] Add support for properties
by Michal Srb
commit fba94448496ef7c390cbe6cc895b770b92230ed6
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri May 30 07:18:52 2014 +0200
[artifact] Add support for properties
python/javapackages/artifact.py | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/python/javapackages/artifact.py b/python/javapackages/artifact.py
index ed8e0ba..51114f8 100644
--- a/python/javapackages/artifact.py
+++ b/python/javapackages/artifact.py
@@ -130,7 +130,6 @@ class ProvidedArtifact(object):
return result
def to_metadata(self):
- # TODO: add support for properties(?)
a = m.ArtifactMetadata()
a.groupId = self.groupId
a.artifactId = self.artifactId
@@ -149,6 +148,12 @@ class ProvidedArtifact(object):
als = [alias.to_metadata() for alias in self.aliases]
a.aliases = pyxb.BIND(*als)
+ if self.properties:
+ for k, v in self.properties.iteritems():
+ import javapackages.depmap
+ prop = javapackages.depmap.Depmap.build_property(k, v)
+ a.properties = pyxb.BIND(prop)
+
return a
@classmethod
10 years