[javapackages] [test] Adjust test for rhbz#1231891 fix (5d9aff2)
by Michal Srb
commit cd75b7e3eee68a1d93d5f1bd6bb3da59a5eec7ce
Author: Michal Srb <msrb(a)redhat.com>
Date: Mon Jun 15 22:54:18 2015 +0200
[test] Adjust test for rhbz#1231891 fix (5d9aff2)
The formatting is a bit off, but that's good enough for now.
test/data/pom_macros/pom_change_dep_nover.xml-want | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/test/data/pom_macros/pom_change_dep_nover.xml-want b/test/data/pom_macros/pom_change_dep_nover.xml-want
index cd43e7e..86955f2 100644
--- a/test/data/pom_macros/pom_change_dep_nover.xml-want
+++ b/test/data/pom_macros/pom_change_dep_nover.xml-want
@@ -8,7 +8,6 @@
<dependency>
<groupId>commons-nio</groupId>
<artifactId>commons-nio</artifactId>
- <version>any</version>
- </dependency>
+ <version>any</version></dependency>
</dependencies>
</project>
8 years, 11 months
[javapackages] [pom_editor] Attempt to fix rhbz#1231891
by Michal Srb
commit 5d9aff2b8f1df111b5b6f4e6bd910e5b3eb96fa9
Author: Michal Srb <msrb(a)redhat.com>
Date: Mon Jun 15 22:52:32 2015 +0200
[pom_editor] Attempt to fix rhbz#1231891
java-utils/pom_editor.py | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/java-utils/pom_editor.py b/java-utils/pom_editor.py
index 077462d..eac7ab1 100644
--- a/java-utils/pom_editor.py
+++ b/java-utils/pom_editor.py
@@ -104,7 +104,9 @@ def MetaArtifact(specification, attributes=False, namespace=None, **defaults):
else:
child[0].text = value
elif value != '-':
- element.append(element.makeelement(name=key, text=value))
+ child = element.makeelement(key)
+ child.text = value
+ element.append(child)
def get_xpath_condition(self):
expr = "normalize-space(pom:{0})='{1}'"
8 years, 11 months
[javapackages] [test] Add test for rhbz#1231891
by Michal Srb
commit 1bdd3abe2eaf4f99a67a6f5450b698c6187df1e9
Author: Michal Srb <msrb(a)redhat.com>
Date: Mon Jun 15 22:41:22 2015 +0200
[test] Add test for rhbz#1231891
test/data/pom_macros/pom_change_dep_nover.xml | 13 +++++++++++++
test/data/pom_macros/pom_change_dep_nover.xml-want | 14 ++++++++++++++
test/pom_macros_test.py | 8 ++++++++
3 files changed, 35 insertions(+), 0 deletions(-)
---
diff --git a/test/data/pom_macros/pom_change_dep_nover.xml b/test/data/pom_macros/pom_change_dep_nover.xml
new file mode 100644
index 0000000..5d760c5
--- /dev/null
+++ b/test/data/pom_macros/pom_change_dep_nover.xml
@@ -0,0 +1,13 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.6</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/test/data/pom_macros/pom_change_dep_nover.xml-want b/test/data/pom_macros/pom_change_dep_nover.xml-want
new file mode 100644
index 0000000..cd43e7e
--- /dev/null
+++ b/test/data/pom_macros/pom_change_dep_nover.xml-want
@@ -0,0 +1,14 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.6</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>commons-nio</groupId>
+ <artifactId>commons-nio</artifactId>
+ <version>any</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/test/pom_macros_test.py b/test/pom_macros_test.py
index 08dedb4..824e8a2 100644
--- a/test/pom_macros_test.py
+++ b/test/pom_macros_test.py
@@ -582,5 +582,13 @@ class PomMacrosTest(unittest.TestCase):
self.assertEqual(returncode, 1, stderr)
assertIn(self, "Couldn't locate ", stderr)
+ @exec_macro("pom_change_dep : commons-nio:commons-nio", "pom_change_dep_nover.xml")
+ def test_change_dep_nover(self, stdin, stderr, returncode, pom_path):
+ self.assertEqual(returncode, 0, stderr)
+
+ got, want = get_result_literally(pom_path)
+ self.assertEqual(got, want)
+
+
if __name__ == '__main__':
unittest.main()
8 years, 11 months
[javapackages] [doc] Bump release
by Michal Srb
commit 67f6714fe3120e3b78510859fc0ae443986056be
Author: Michal Srb <msrb(a)redhat.com>
Date: Mon Jun 15 16:35:45 2015 +0200
[doc] Bump release
doc/index.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/doc/index.txt b/doc/index.txt
index 7a5a96a..f6c71f6 100644
--- a/doc/index.txt
+++ b/doc/index.txt
@@ -1,7 +1,7 @@
Java Packaging HOWTO
====================
-v4.5.0, 2015-04-09
+v4.6.0, 2015-06-15
include::preamble.txt[]
8 years, 11 months
[javapackages] Remove TODO
by Michal Srb
commit 0611bf770b9d481b9a19382eb2f851d2da7c99d7
Author: Michal Srb <msrb(a)redhat.com>
Date: Mon Jun 15 15:18:57 2015 +0200
Remove TODO
depgenerators/maven.req | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
---
diff --git a/depgenerators/maven.req b/depgenerators/maven.req
index db6d65d..c144c0d 100755
--- a/depgenerators/maven.req
+++ b/depgenerators/maven.req
@@ -188,8 +188,6 @@ class TagBuilder(object):
# process non-optional dependencies
for dependency in list(set(x for x in metadata.get_required_artifacts()
if not x.is_optional())):
- # TODO: optional dependencies can also be skipped/unresolvable, is
- # it a problem?
if dependency.is_skipped(self.skipped_artifacts):
skipped_but_required.append(dependency)
continue
8 years, 11 months
