[maven-dependency-tree] Add missing BuildRequires
by Mikolaj Izdebski
commit 7d4faf6371370425190d5fc6b74bd3a0b5621a32
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Thu Oct 3 14:44:08 2013 +0200
Add missing BuildRequires
maven-dependency-tree.spec | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
---
diff --git a/maven-dependency-tree.spec b/maven-dependency-tree.spec
index c6642e2..c584bc3 100644
--- a/maven-dependency-tree.spec
+++ b/maven-dependency-tree.spec
@@ -1,7 +1,7 @@
Name: maven-dependency-tree
Version: 2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Maven dependency tree artifact
Group: Development/Libraries
License: ASL 2.0
@@ -11,12 +11,18 @@ BuildArch: noarch
Patch0001: 0001-Port-to-Maven-3.1.0-and-Eclipse-Aether.patch
-BuildRequires: maven-local
-BuildRequires: aether-api >= 1:0
-BuildRequires: aether-util >= 1:0
-BuildRequires: maven-invoker-plugin
-BuildRequires: plexus-containers-component-metadata
-BuildRequires: plexus-containers-component-annotations
+BuildRequires: maven-local
+BuildRequires: mvn(org.apache.maven:maven-artifact:2.2.1)
+BuildRequires: mvn(org.apache.maven:maven-compat)
+BuildRequires: mvn(org.apache.maven:maven-core)
+BuildRequires: mvn(org.apache.maven:maven-project)
+BuildRequires: mvn(org.apache.maven.plugins:maven-invoker-plugin)
+BuildRequires: mvn(org.apache.maven.shared:maven-plugin-testing-harness)
+BuildRequires: mvn(org.apache.maven.shared:maven-shared-components)
+BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations)
+BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata)
+BuildRequires: mvn(org.eclipse.aether:aether-api)
+BuildRequires: mvn(org.eclipse.aether:aether-util)
Provides: maven-shared-dependency-tree = %{version}-%{release}
Obsoletes: maven-shared-dependency-tree < %{version}-%{release}
@@ -51,6 +57,9 @@ This package contains javadoc for %{name}.
%doc LICENSE NOTICE
%changelog
+* Thu Oct 3 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.1-3
+- Add missing BuildRequires
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
10 years, 7 months
[javapackages] man: update mvn_package __default use
by Stanislav Ochotnicky
commit 7502c018859730fa9cdd91c791acb0773beb55f6
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Thu Oct 3 14:21:47 2013 +0200
man: update mvn_package __default use
man/mvn_package.txt | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/man/mvn_package.txt b/man/mvn_package.txt
index acde2c9..1a72c1a 100644
--- a/man/mvn_package.txt
+++ b/man/mvn_package.txt
@@ -10,7 +10,7 @@ mvn_package - specify target package for Maven artifact(s)
SYNOPSIS
--------
-*%mvn_package* artifact-coordinates target-package
+*%mvn_package* artifact-coordinates [target-package]
DESCRIPTION
-----------
@@ -39,9 +39,9 @@ OPERANDS
installed. Backreferences are supported in form *@n*, where *n*
is an integer corresponding to brace in *artifact-coordinates*. A
special value of *__noinstall* means that matching artifact(s)
- should not be installed to any package. Special value of empty
- string (*""*) means that matching artifact(s) should be installed
- into main package.
+ should not be installed to any package. Special value of *__default*
+ means that matching artifact(s) should be installed into main package.
+ If target-package is omitted value of *__default* is assumed.
AUTHOR
------
10 years, 7 months
[javapackages] mvn_package: assume __default when package name is not provided
by Stanislav Ochotnicky
commit a688bb058312a8a7a08d91ef89b49217c48e3220
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Thu Oct 3 14:19:59 2013 +0200
mvn_package: assume __default when package name is not provided
From now on mvn_package will by default set artifact to be installed into main
package (__default) if subpackage name is not provided on commandline
java-utils/mvn_package.py | 11 ++++++++---
test/data/mvn_package/single_00001.xml | 16 ++++++++++++++++
test/mvn_package_test.py | 11 +++++++++--
3 files changed, 33 insertions(+), 5 deletions(-)
---
diff --git a/java-utils/mvn_package.py b/java-utils/mvn_package.py
index 8effce0..2662ae5 100644
--- a/java-utils/mvn_package.py
+++ b/java-utils/mvn_package.py
@@ -41,7 +41,7 @@ class SaneParser(optparse.OptionParser):
def format_epilog(self, formatter):
return self.epilog
-usage="usage: %prog [options] <MVN spec> <package>"
+usage="usage: %prog [options] <MVN spec> [<package>]"
epilog="""
MVN spec:
Specification of Maven artifact in following format:
@@ -65,8 +65,13 @@ if __name__ == "__main__":
sys.argv[index] = arg.decode(sys.getfilesystemencoding())
(options, args) = parser.parse_args()
- if len(args) != 2:
- parser.error("Exactly 2 arguments are required")
+
+ if len(args) == 0:
+ parser.error("At least one argument required")
+ elif len(args) > 2:
+ parser.error("At most 2 arguments are expected")
+ elif len(args) == 1:
+ args.append("__default")
try:
orig = Artifact.from_mvn_str(args[0])
diff --git a/test/data/mvn_package/single_00001.xml b/test/data/mvn_package/single_00001.xml
new file mode 100644
index 0000000..2fe49d9
--- /dev/null
+++ b/test/data/mvn_package/single_00001.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" ?>
+<configuration xmlns="http://fedorahosted.org/xmvn/CONFIG/0.6.0">
+
+
+
+ <!--XMvn configuration file generated by javapackages.xmvn_config (part of javapackages-tools)-->
+ <artifactManagement>
+ <rule>
+ <artifactGlob>
+ <artifactId>bbb</artifactId>
+ <groupId>aaa</groupId>
+ </artifactGlob>
+ <targetPackage>__default</targetPackage>
+ </rule>
+ </artifactManagement>
+</configuration>
diff --git a/test/mvn_package_test.py b/test/mvn_package_test.py
index 95de076..7b17e3a 100644
--- a/test/mvn_package_test.py
+++ b/test/mvn_package_test.py
@@ -107,8 +107,15 @@ class TestMvnmvn_package(unittest.TestCase):
@xmvnconfig('mvn_package',['aaa:bbb', ])
def test_single(self, stdout, stderr, return_value):
- self.assertNotEqual(return_value, 0)
- self.assertTrue(stderr)
+ self.assertEqual(return_value, 0)
+ filelist = get_config_file_list()
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_package',
+ 'single'))
+ for file in filelist:
+ self.assertEquals(get_actual_config(file),
+ get_expected_config(file,
+ 'mvn_package',
+ 'single'))
@xmvnconfig('mvn_package',['aaa:bbb', 'pack', 'evil', ])
def test_more(self, stdout, stderr, return_value):
10 years, 7 months
[tycho] Adjust to latest Xmvn (workaround for 1015038).
by Krzysztof Daniel
commit bb878905575e1f9e6e9e955df8bb605191b7f199
Author: Krzysztof Daniel <kdaniel(a)redhat.com>
Date: Thu Oct 3 13:29:19 2013 +0200
Adjust to latest Xmvn (workaround for 1015038).
tycho-use-custom-resolver.patch | 2 +-
tycho.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/tycho-use-custom-resolver.patch b/tycho-use-custom-resolver.patch
index 68313e8..07bc0c0 100644
--- a/tycho-use-custom-resolver.patch
+++ b/tycho-use-custom-resolver.patch
@@ -177,7 +177,7 @@ index 8d36462..eb05eff 100644
+ Object plexus = pclazz.newInstance();
+
+ // The resolver
-+ Class rclazz = Class.forName("org.fedoraproject.maven.resolver.DefaultResolver");
++ Class rclazz = Class.forName("org.fedoraproject.maven.resolver.impl.DefaultResolver");
+
+ // Add the resolver to the plexus container
+ Method mAdd = pclazz.getMethod("addComponent", Object.class, String.class);
diff --git a/tycho.spec b/tycho.spec
index 23f4926..0b28bac 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -9,7 +9,7 @@
Name: tycho
Version: 0.18.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries
@@ -67,6 +67,7 @@ BuildRequires: plexus-containers-component-metadata
BuildRequires: decentxml
BuildRequires: easymock3
BuildRequires: ecj
+BuildRequires: maven-plugin-testing-harness
%if ! %{bootstrap}
BuildRequires: osgi(org.eclipse.jdt)
BuildRequires: %{name}
@@ -308,6 +309,9 @@ sed -i 's|<maven>|&<extension>zip</extension>|' \
%{_javadocdir}/%{name}
%changelog
+* Thu Oct 3 2013 Krzysztof Daniel <kdaniel(a)redhat.com> 0.18.1-6
+- Adjust to latest Xmvn (workaround for 1015038).
+
* Mon Sep 9 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0.18.1-5
- Add workaround for rhbz#1004310
10 years, 7 months
[javapackages] Cleanup pom_macros_test
by Stanislav Ochotnicky
commit 3dfd450c1a6c9b64a189040f4daea49f7aa4dae1
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Thu Oct 3 12:06:59 2013 +0200
Cleanup pom_macros_test
Now it works with proper paths instead of relying on being run from current
directory
test/pom_macros_test.py | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
---
diff --git a/test/pom_macros_test.py b/test/pom_macros_test.py
index a9c0aa7..65853de 100644
--- a/test/pom_macros_test.py
+++ b/test/pom_macros_test.py
@@ -7,9 +7,16 @@ from shutil import rmtree
from lxml import etree
from formencode import doctest_xml_compare
-pe = '. ../java-utils/pom_editor.sh; '
ns = dict(a='http://maven.apache.org/POM/4.0.0')
-data_dir = 'data/_pomtestdir/'
+dirpath = os.path.dirname(os.path.realpath(__file__))
+
+pepath = os.path.abspath(os.path.join(dirpath, "..",
+ "java-utils/pom_editor.sh"))
+pe = '. {pepath}; '.format(pepath=pepath)
+
+datadir = os.path.join(dirpath, "data", "pom_macros")
+workdir = os.path.join(datadir, "..", 'pom_macros_workdir')
+
def exec_macro(command = "", pom = "pom.xml"):
def test_decorator(fn):
@@ -17,22 +24,35 @@ def exec_macro(command = "", pom = "pom.xml"):
bash = subprocess.Popen(['bash'],
stdout=subprocess.PIPE, stderr=subprocess.PIPE,
stdin=subprocess.PIPE)
- stdin, stderr = bash.communicate("%s %s %s%s" % (pe, command, data_dir, pom))
+ pompath = os.path.join(workdir, pom)
+ stdin, stderr = bash.communicate("%s %s %s" % (pe, command,
+ pompath))
- fn(self, stdin, stderr, bash.returncode, os.path.join(data_dir, pom))
+ fn(self, stdin, stderr, bash.returncode, pompath)
return test_decorated
return test_decorator
class PomMacrosTest(unittest.TestCase):
+ olddir = os.getcwd()
@classmethod
def setUpClass(cls):
- copytree('data/pom_macros', data_dir)
+ cls.tearDownClass()
+ try:
+ cls.olddir = os.getcwd()
+ copytree(datadir, workdir)
+ os.chdir(workdir)
+ except OSError:
+ pass
@classmethod
def tearDownClass(cls):
- rmtree('data/_pomtestdir')
+ try:
+ rmtree(workdir)
+ os.chdir(cls.olddir)
+ except OSError:
+ pass
def xml_compare_reporter(self, report):
print report
10 years, 7 months
[maven-verifier] Add missing BR: maven-shared
by Mikolaj Izdebski
commit b822aeb4c65927f498afaa2e75f5084ac05a10ef
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Thu Oct 3 11:59:48 2013 +0200
Add missing BR: maven-shared
maven-verifier.spec | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/maven-verifier.spec b/maven-verifier.spec
index 33043e0..5b715e2 100644
--- a/maven-verifier.spec
+++ b/maven-verifier.spec
@@ -1,6 +1,6 @@
Name: maven-verifier
Version: 1.4
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Maven verifier
License: ASL 2.0
URL: http://maven.apache.org/shared/maven-verifier
@@ -10,10 +10,9 @@ Patch1: 0001-Update-to-maven-shared-utils-0.3.patch
BuildArch: noarch
-BuildRequires: java-devel
BuildRequires: maven-local
-BuildRequires: maven-surefire-provider-junit
-BuildRequires: maven-shared-utils
+BuildRequires: mvn(org.apache.maven.shared:maven-shared-components)
+BuildRequires: mvn(org.apache.maven.shared:maven-shared-utils)
Obsoletes: maven-shared-verifier < %{version}-%{release}
Provides: maven-shared-verifier = %{version}-%{release}
@@ -49,6 +48,9 @@ API documentation for %{name}.
%changelog
+* Thu Oct 3 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.4-6
+- Add missing BR: maven-shared
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
10 years, 7 months
[httpcomponents-client] Don't try to remove maven-notice-plugin from POM
by Mikolaj Izdebski
commit e753c7f9c992d03f010facd408a71b7fc75dc205
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Thu Oct 3 11:56:55 2013 +0200
Don't try to remove maven-notice-plugin from POM
httpcomponents-client.spec | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec
index 2de078b..f1da43a 100644
--- a/httpcomponents-client.spec
+++ b/httpcomponents-client.spec
@@ -3,7 +3,7 @@
Name: httpcomponents-client
Summary: HTTP agent implementation based on httpcomponents HttpCore
Version: 4.3
-Release: 1%{?dist}
+Release: 2%{?dist}
License: ASL 2.0
URL: http://hc.apache.org/
Source0: http://archive.apache.org/dist/httpcomponents/httpclient/source/%{name}-%...
@@ -47,7 +47,6 @@ Summary: API documentation for %{name}
%pom_disable_module httpclient-cache
%pom_disable_module httpclient-osgi
%pom_disable_module fluent-hc
-%pom_remove_plugin :maven-notice-plugin
%pom_remove_plugin :docbkx-maven-plugin
%pom_remove_plugin :clirr-maven-plugin
%pom_remove_plugin :maven-checkstyle-plugin
@@ -116,6 +115,9 @@ done
%doc LICENSE.txt NOTICE.txt
%changelog
+* Thu Oct 3 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 4.3-2
+- Don't try to remove maven-notice-plugin from POM
+
* Fri Sep 13 2013 Michal Srb <msrb(a)redhat.com> - 4.3-1
- Update to upstream version 4.3
- Drop group tag
10 years, 7 months
[javapackages] Add test case for rhbz#1012982
by Michael Šimáček
commit e428abf5e6e076a9ddc04a74bf93218ed17ccc68
Author: Michael Simacek <msimacek(a)redhat.com>
Date: Thu Oct 3 11:50:29 2013 +0200
Add test case for rhbz#1012982
.../test_compare_jar_class_ext-want.war | Bin 0 -> 671 bytes
test/maven_depmap_test.py | 9 +++++++++
2 files changed, 9 insertions(+), 0 deletions(-)
---
diff --git a/test/data/maven_depmap/test_compare_jar_class_ext-want.war b/test/data/maven_depmap/test_compare_jar_class_ext-want.war
new file mode 100644
index 0000000..6595ed7
Binary files /dev/null and b/test/data/maven_depmap/test_compare_jar_class_ext-want.war differ
diff --git a/test/maven_depmap_test.py b/test/maven_depmap_test.py
index d73eaff..e6f8081 100644
--- a/test/maven_depmap_test.py
+++ b/test/maven_depmap_test.py
@@ -12,6 +12,7 @@ from formencode import doctest_xml_compare
class TestMavenDepmap(unittest.TestCase):
def setUp(self):
+ self.maxDiff = 2048
try:
dirpath = os.path.dirname(os.path.realpath(__file__))
self.olddir = os.getcwd()
@@ -230,6 +231,14 @@ class TestMavenDepmap(unittest.TestCase):
'usr/foo/share/java/.out_archive.jar')
self.assertEqual(got, want)
+ #test case for rhbz#1012982
+ @mvn_depmap('x:y:war:z:0.1', 'usr/foo/share/java/.out_archive-z.war')
+ def test_compare_jar_class_ext(self, stdout, stderr, return_value, depmap):
+ self.assertEqual(return_value, 0, stderr)
+ got, want = self.check_archive(inspect.currentframe().f_code.co_name,
+ 'usr/foo/share/java/.out_archive-z.war')
+ self.assertEqual(got, want)
+
@mvn_depmap('a:b:12', 'usr/share/java/already-has-pom-properties.jar')
def test_compare_jar_unmodified(self, stdout, stderr, return_value, depmap):
self.assertEqual(return_value, 0, stderr)
10 years, 7 months