[javapackages] mvn_artifact: improve error messages
by Stanislav Ochotnicky
commit ef48c69abdafc3fc571b65ee01d564b2dd7e04cd
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Thu Oct 3 11:40:50 2013 +0200
mvn_artifact: improve error messages
java-utils/mvn_artifact.py | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/java-utils/mvn_artifact.py b/java-utils/mvn_artifact.py
index eb9be9d..4d2bd6a 100644
--- a/java-utils/mvn_artifact.py
+++ b/java-utils/mvn_artifact.py
@@ -43,7 +43,7 @@ class SaneParser(optparse.OptionParser):
def format_epilog(self, formatter):
return self.epilog
-usage="usage: %prog [options] <MVN spec | POM path> [JAR path]"
+usage="usage: %prog [options] <MVN spec | POM path> [artifact path]"
epilog="""
MVN spec:
Specification of Maven artifact in following format:
@@ -63,8 +63,8 @@ commons-lang:commons-lang:war:test-jar:3.1
POM path:
Path where POM file is located.
-JAR path:
-Path where JAR file is located.
+Artifact path:
+Path where Artifact file (usually JAR) is located.
"""
config = ".xmvn-reactor"
@@ -86,7 +86,8 @@ if __name__ == "__main__":
orig = Artifact.from_mvn_str(args[0])
orig.validate(allow_backref=False)
if len(args) == 1:
- parser.error("JAR path must be specified")
+ parser.error("When using artifact specification artifact path must be "
+ "provided")
except (ArtifactFormatException):
orig = POM(args[0])
pom_path = args[0]
10 years, 7 months
[javapackages] Modify testcase for #1014301
by Stanislav Ochotnicky
commit 05992db760fc9ceb6b26c5fe5682cd162af2888a
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Thu Oct 3 11:29:58 2013 +0200
Modify testcase for #1014301
We expect colons in artifact definitions at all times, but let's check for more
descriptive error message
test/mvn_alias_test.py | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/test/mvn_alias_test.py b/test/mvn_alias_test.py
index c3b8a89..fef739b 100644
--- a/test/mvn_alias_test.py
+++ b/test/mvn_alias_test.py
@@ -232,7 +232,10 @@ class TestMvnmvn_alias(unittest.TestCase):
# for rhbz#1014301
@xmvnconfig('mvn_alias',[':{woodstox-core}-asl', '@1-lgpl' ])
def test_rhbz1014301(self, stdout, stderr, return_value):
- self.assertEqual(return_value, 0)
+ self.assertNotEqual(return_value, 0)
+ self.assertEqual(stderr.count("Artifact string '@1-lgpl' does not "
+ "contain ':' character. Can not parse"),
+ 1)
if __name__ == '__main__':
unittest.main()
10 years, 7 months
[junit] Remove unused files from git
by Stanislav Ochotnicky
commit 6b3d9d3342a7faf325c45357497ae31a84fdadc5
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Thu Oct 3 10:52:43 2013 +0200
Remove unused files from git
junit-4.10.pom | 69 --------------------------
junit-removed-test.patch | 49 -------------------
junit3.8.2-build.xml | 119 ----------------------------------------------
3 files changed, 0 insertions(+), 237 deletions(-)
10 years, 7 months
[javapackages] [artifact] Improve error messages for from_mvn_str
by Stanislav Ochotnicky
commit b03a355ada533ec104fbcce27ea8bed5eab45fa7
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Thu Oct 3 11:24:20 2013 +0200
[artifact] Improve error messages for from_mvn_str
python/javapackages/artifact.py | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/python/javapackages/artifact.py b/python/javapackages/artifact.py
index 6b041d4..f0414d9 100644
--- a/python/javapackages/artifact.py
+++ b/python/javapackages/artifact.py
@@ -221,9 +221,13 @@ class Artifact(object):
tup = mvnstr.split(":")
# groupId and artifactId are always present
- if not (2 <= len(tup) <= 5):
- raise ArtifactFormatException("Unable to create Artifact from "
- "supplied arguments ({mvnstr})".format(mvnstr=mvnstr))
+ if len(tup) < 2:
+ raise ArtifactFormatException("Artifact string '{mvnstr}' does not "
+ "contain ':' character. Can not parse".format(mvnstr=mvnstr))
+
+ if len(tup) > 5:
+ raise ArtifactFormatException("Artifact string '{mvnstr}' contains "
+ "too many colons. Can not parse".format(mvnstr=mvnstr))
groupId = tup[0]
artifactId = tup[1]
10 years, 7 months
[woodstox-core] Fix usage of %mvn_alias
by Mikolaj Izdebski
commit 5f0e40faa129bb887a497d01655880d047f76d7a
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Thu Oct 3 11:24:47 2013 +0200
Fix usage of %mvn_alias
woodstox-core.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/woodstox-core.spec b/woodstox-core.spec
index 4450942..43260b1 100644
--- a/woodstox-core.spec
+++ b/woodstox-core.spec
@@ -4,7 +4,7 @@
Name: %{core_name}
Version: 4.2.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: High-performance XML processor
License: ASL 2.0 or LGPLv2+ or BSD
URL: http://%{base_name}.codehaus.org/
@@ -66,7 +66,7 @@ rm -rf src/test/stax2
<testSourceDirectory>src/test</testSourceDirectory>
</build>"
-%mvn_alias ":{woodstox-core}-asl" @1-lgpl
+%mvn_alias ":{woodstox-core}-asl" :@1-lgpl
%mvn_file : %{name}{,-asl,-lgpl}
%build
@@ -83,6 +83,9 @@ rm -rf src/test/stax2
%doc release-notes/asl release-notes/lgpl release-notes/bsd
%changelog
+* Thu Oct 3 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 4.2.0-3
+- Fix usage of %%mvn_alias
+
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4.2.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
10 years, 7 months
[javapackages] Add testcase for rhbz#1012980
by Michael Šimáček
commit 5c25b861cc294d6b88ab305403a0afea65801804
Author: Michael Simacek <msimacek(a)redhat.com>
Date: Thu Oct 3 11:03:25 2013 +0200
Add testcase for rhbz#1012980
test/depmaps/require_skipped/fragment.xml | 29 ++++++++++++++++++++++++++
test/depmaps/require_skipped/fragment3.xml | 19 +++++++++++++++++
test/depmaps/require_skipped/require.xml | 31 ++++++++++++++++++++++++++++
test/maven_req_test.py | 10 +++++++++
4 files changed, 89 insertions(+), 0 deletions(-)
---
diff --git a/test/depmaps/require_skipped/fragment.xml b/test/depmaps/require_skipped/fragment.xml
new file mode 100644
index 0000000..671d978
--- /dev/null
+++ b/test/depmaps/require_skipped/fragment.xml
@@ -0,0 +1,29 @@
+<dependencies>
+<skippedArtifact>
+<groupId>org.codehaus.plexus</groupId>
+<artifactId>plexus-ant-factory</artifactId>
+<version>1.0</version>
+<namespace>ns</namespace>
+<!--<jpp>
+<groupId>JPP/plexus</groupId>
+<artifactId>ant-factory</artifactId>
+<version>1.0</version>
+<namespace>ns</namespace>
+</jpp>-->
+</skippedArtifact>
+<dependency>
+<maven>
+<groupId>org.apache.maven.plugins</groupId>
+<artifactId>maven-idea-plugin</artifactId>
+<version>1.4</version>
+<namespace>ns</namespace>
+</maven>
+<jpp>
+<groupId>JPP/maven-idea-plugin</groupId>
+<artifactId>maven-idea-plugin</artifactId>
+<version>1.5</version>
+<namespace>ns</namespace>
+</jpp>
+</dependency>
+
+</dependencies>
diff --git a/test/depmaps/require_skipped/fragment3.xml b/test/depmaps/require_skipped/fragment3.xml
new file mode 100644
index 0000000..1b82647
--- /dev/null
+++ b/test/depmaps/require_skipped/fragment3.xml
@@ -0,0 +1,19 @@
+<depset>
+<dependency>
+<maven>
+<groupId>codehaus</groupId>
+<artifactId>plexus-utils</artifactId>
+<version>1.2</version>
+<namespace>ns</namespace>
+</maven>
+<jpp>
+<groupId>JPP/plexus-utils</groupId>
+<artifactId>plexus-utils</artifactId>
+<namespace>ns</namespace>
+</jpp>
+</dependency>
+<autoRequires>
+<groupId>org.apache.maven</groupId>
+<artifactId>maven-project</artifactId>
+</autoRequires>
+</depset>
diff --git a/test/depmaps/require_skipped/require.xml b/test/depmaps/require_skipped/require.xml
new file mode 100644
index 0000000..b3c0813
--- /dev/null
+++ b/test/depmaps/require_skipped/require.xml
@@ -0,0 +1,31 @@
+<dependencies>
+<dependency>
+<maven>
+<groupId>org.mortbay.jetty</groupId>
+<artifactId>jsp-2.1-glassfish</artifactId>
+<version>9.1.1.B60.25.p2</version>
+<namespace>ns</namespace>
+</maven>
+<jpp>
+<groupId>JPP</groupId>
+<artifactId>tomcat6-jsp-2.1-api</artifactId>
+<version>6.0.18</version>
+<namespace>ns</namespace>
+</jpp>
+</dependency>
+<autoRequires>
+<groupId>org.codehaus.plexus</groupId>
+<artifactId>plexus-ant-factory</artifactId>
+<namespace>ns</namespace>
+</autoRequires>
+<autoRequires>
+<groupId>codehaus</groupId>
+<artifactId>plexus-utils</artifactId>
+<namespace>ns</namespace>
+</autoRequires>
+<autoRequires>
+<groupId>org.apache.maven.wagon</groupId>
+<artifactId>wagon-provider-api</artifactId>
+<classifier>test-jar</classifier>
+</autoRequires>
+</dependencies>
diff --git a/test/maven_req_test.py b/test/maven_req_test.py
index 4cec8b7..c75f7af 100644
--- a/test/maven_req_test.py
+++ b/test/maven_req_test.py
@@ -42,3 +42,13 @@ class TestMavenReq(unittest.TestCase):
def test_mixed(self, stdout, stderr, return_value):
self.assertEquals(return_value, 0)
self.assertEquals(stdout, "jpackage-utils\nns-mvn(org.codehaus.plexus:plexus-ant-factory) = 1.0\nns-mvn(codehaus:plexus-utils) = 1.2\nmvn(org.apache.maven.wagon:wagon-provider-api::test-jar:)\nmvn(org.apache.maven.plugins:maven-idea-plugin) = 1.4\n")
+
+ #test for rhbz#1012980
+ @mavenreq(["require_skipped/require.xml"])
+ def test_require_skipped(self, stdout, stderr, return_value):
+ self.assertNotEqual(return_value, 0)
+ self.assertNotEqual(stderr, '')
+ lines = stderr.split('\n');
+ self.assertGreater(len(lines), 1)
+ self.assertEquals(lines[-2], '%mvn_package org.codehaus.plexus:plexus-ant-factory:::1.0 <package_name>')
+
10 years, 7 months