java-sig-commits November 2013

java-sig-commits@lists.fedoraproject.org

18 participants
410 discussions

[jdom2] use objectweb-asm3
by gil 14 Nov '13

14 Nov '13

commit 59e8589a22cfa7c3ca23abe85d657b462ea5794a Author: gil <puntogil(a)libero.it> Date: Thu Nov 14 04:48:05 2013 +0100 use objectweb-asm3 jdom2.spec | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) --- diff --git a/jdom2.spec b/jdom2.spec index 2ec7037..fc7cfb9 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -1,6 +1,6 @@ Name: jdom2 Version: 2.0.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java manipulation of XML made easy License: ASL 1.1 or BSD URL: http://www.jdom.org/ @@ -25,7 +25,7 @@ BuildRequires: isorelax BuildRequires: jakarta-oro BuildRequires: jaxen BuildRequires: log4j -BuildRequires: objectweb-asm +BuildRequires: objectweb-asm3 BuildRequires: xalan-j2 BuildRequires: xerces-j2 BuildRequires: xml-commons-apis @@ -62,6 +62,7 @@ find . -name "*.class" -print -delete find . -name "*.jar" -print -delete %patch0 -p0 +sed -i "s|%{_javadir}/objectweb-asm|%{_javadir}/objectweb-asm3|" build.xml cp -p %{SOURCE1} maven/contrib.pom cp -p %{SOURCE2} maven/junit.pom @@ -102,5 +103,8 @@ cp -rp build/apidocs %{buildroot}%{_javadocdir}/%{name} %doc LICENSE.txt %changelog +* Thu Nov 14 2013 gil cattaneo <puntogil(a)libero.it> 2.0.5-2 +- use objectweb-asm3 + * Thu Sep 12 2013 gil cattaneo <puntogil(a)libero.it> 2.0.5-1 - initial rpm \ No newline at end of file

1 0

[mqtt-client] use objectweb-asm3
by gil 14 Nov '13

14 Nov '13

commit 757a036d74848e8689dde22245c9c20acdf15a00 Author: gil <puntogil(a)libero.it> Date: Thu Nov 14 04:33:57 2013 +0100 use objectweb-asm3 mqtt-client.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --- diff --git a/mqtt-client.spec b/mqtt-client.spec index f0ba92e..cac0d09 100644 --- a/mqtt-client.spec +++ b/mqtt-client.spec @@ -8,7 +8,7 @@ Source0: https://github.com/fusesource/mqtt-client/archive/%{name}-project BuildRequires: java-devel -BuildRequires: mvn(asm:asm-tree:3) +BuildRequires: mvn(asm:asm-tree) BuildRequires: mvn(org.fusesource:fusesource-pom) BuildRequires: mvn(org.fusesource.hawtbuf:hawtbuf) BuildRequires: mvn(org.fusesource.hawtdispatch:hawtdispatch-transport)

1 0

[mqtt-client] use objectweb-asm3
by gil 14 Nov '13

14 Nov '13

commit 0044db069f886cd96d9fff675df9ea9b0b0ebd7c Author: gil <puntogil(a)libero.it> Date: Thu Nov 14 04:28:25 2013 +0100 use objectweb-asm3 mqtt-client.spec | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) --- diff --git a/mqtt-client.spec b/mqtt-client.spec index 96c8dc7..f0ba92e 100644 --- a/mqtt-client.spec +++ b/mqtt-client.spec @@ -1,19 +1,19 @@ Name: mqtt-client Version: 1.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A Java MQTT Client License: ASL 2.0 URL: http://mqtt-client.fusesource.org/ Source0: https://github.com/fusesource/mqtt-client/archive/%{name}-project-%{version… BuildRequires: java-devel -BuildRequires: fusesource-pom -BuildRequires: felix-osgi-compendium -BuildRequires: felix-osgi-core -BuildRequires: hawtbuf -BuildRequires: hawtdispatch-transport -BuildRequires: objectweb-asm +BuildRequires: mvn(asm:asm-tree:3) +BuildRequires: mvn(org.fusesource:fusesource-pom) +BuildRequires: mvn(org.fusesource.hawtbuf:hawtbuf) +BuildRequires: mvn(org.fusesource.hawtdispatch:hawtdispatch-transport) +BuildRequires: mvn(org.osgi:org.osgi.compendium) +BuildRequires: mvn(org.osgi:org.osgi.core) # test deps (*) %if 0 @@ -58,6 +58,8 @@ chmod 644 readme.md %pom_xpath_remove "pom:project/pom:dependencies/pom:dependency[pom:scope='test']" %{name} +%pom_xpath_set "pom:properties/pom:asm-version" 3 + %build %mvn_file :%{name} %{name} @@ -74,6 +76,9 @@ chmod 644 readme.md %doc license.txt %changelog +* Thu Nov 14 2013 gil cattaneo <puntogil(a)libero.it> 1.5-4 +- use objectweb-asm3 + * Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

1 0

[spock] use objectweb-asm3
by gil 14 Nov '13

14 Nov '13

commit c96267159e4cc3124489fe0d4f45d721fa3b9dfa Author: gil <puntogil(a)libero.it> Date: Thu Nov 14 04:09:18 2013 +0100 use objectweb-asm3 spock-0.6-groovy-1.8-build.xml | 184 ----------------------------------- spock-0.6-groovy-1.8-core-pom.patch | 39 -------- spock-0.7-groovy-1.8-build.xml | 14 ++-- spock-core-0.6-groovy-1.8.pom | 83 ---------------- spock-guice-0.6-groovy-1.8.pom | 49 --------- spock.spec | 27 +++--- 6 files changed, 20 insertions(+), 376 deletions(-) --- diff --git a/spock-0.7-groovy-1.8-build.xml b/spock-0.7-groovy-1.8-build.xml index b1433da..fc1ede7 100644 --- a/spock-0.7-groovy-1.8-build.xml +++ b/spock-0.7-groovy-1.8-build.xml @@ -17,7 +17,7 @@ <path id="groovyc.classpath"> <fileset dir="/usr/share/java" includes="commons-cli.jar"/> <fileset dir="/usr/share/java" includes="groovy.jar"/> - <fileset dir="/usr/share/java" includes="objectweb-asm/asm-all.jar"/> + <fileset dir="/usr/share/java" includes="objectweb-asm3/asm-all.jar"/> <fileset dir="/usr/share/java" includes="antlr.jar"/> </path> @@ -26,10 +26,10 @@ <pathelement location="${core.build.dir}/**"/> <fileset dir="/usr/share/java" includes="ant.jar"/> <fileset dir="/usr/share/java" includes="cglib.jar"/> - <fileset dir="/usr/share/java" includes="hamcrest12/core.jar"/> - <fileset dir="/usr/share/java" includes="hamcrest12/library.jar"/> + <fileset dir="/usr/share/java" includes="hamcrest/core.jar"/> + <fileset dir="/usr/share/java" includes="hamcrest/library.jar"/> <fileset dir="/usr/share/java" includes="junit.jar"/> - <fileset dir="/usr/share/java" includes="objenesis.jar"/> + <fileset dir="/usr/share/java" includes="objenesis/objenesis.jar"/> </path> <path id="guice.classpath"> @@ -48,10 +48,10 @@ <fileset dir="/usr/share/java" includes="aopalliance.jar"/> <fileset dir="/usr/share/java" includes="cglib.jar"/> <fileset dir="/usr/share/java" includes="guice/google-guice.jar"/> - <fileset dir="/usr/share/java" includes="hamcrest12/core.jar"/> - <fileset dir="/usr/share/java" includes="hamcrest12/library.jar"/> + <fileset dir="/usr/share/java" includes="hamcrest/core.jar"/> + <fileset dir="/usr/share/java" includes="hamcrest/library.jar"/> <fileset dir="/usr/share/java" includes="junit.jar"/> - <fileset dir="/usr/share/java" includes="objenesis.jar"/> + <fileset dir="/usr/share/java" includes="objenesis/objenesis.jar"/> </path> <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpathref="groovyc.classpath"/> diff --git a/spock.spec b/spock.spec index e1a00bd..dfb18b6 100644 --- a/spock.spec +++ b/spock.spec @@ -3,7 +3,7 @@ %global nameddottag %(echo %{?namedreltag} | tr - . ) Name: spock Version: 0.7 -Release: 0.2%{?nameddottag}%{?dist} +Release: 0.3%{?nameddottag}%{?dist} Summary: A testing and specification framework Group: Development/Libraries License: ASL 2.0 @@ -24,9 +24,9 @@ BuildRequires: apache-commons-cli BuildRequires: cglib BuildRequires: google-guice BuildRequires: groovy -BuildRequires: hamcrest12 +BuildRequires: hamcrest BuildRequires: junit -BuildRequires: objectweb-asm +BuildRequires: objectweb-asm3 BuildRequires: objenesis Requires: java @@ -42,9 +42,9 @@ Summary: Spock Framework - Core Module Requires: ant Requires: cglib Requires: groovy -Requires: hamcrest12 +Requires: hamcrest Requires: junit -Requires: objectweb-asm +Requires: objectweb-asm3 Requires: objenesis %description core @@ -73,15 +73,11 @@ find . -name "*.class" -delete find . -name "*.jar" -delete cp -p %{SOURCE1} core-pom.xml %pom_add_dep org.hamcrest:hamcrest-library:1.3:compile core-pom.xml -%pom_xpath_remove "pom:dependencies/pom:dependency[pom:groupId ='junit']/pom:artifactId" core-pom.xml -%pom_xpath_inject "pom:dependencies/pom:dependency[pom:groupId ='junit']" \ - "<artifactId>junit</artifactId>" core-pom.xml -%pom_xpath_remove "pom:dependencies/pom:dependency[pom:groupId ='org.codehaus.groovy']/pom:artifactId" core-pom.xml -%pom_xpath_inject "pom:dependencies/pom:dependency[pom:groupId ='org.codehaus.groovy']" \ - "<artifactId>groovy</artifactId>" core-pom.xml -%pom_xpath_remove "pom:dependencies/pom:dependency[pom:groupId ='cglib']/pom:artifactId" core-pom.xml -%pom_xpath_inject "pom:dependencies/pom:dependency[pom:groupId ='cglib']" \ - "<artifactId>cglib</artifactId>" core-pom.xml +%pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId ='junit']/pom:artifactId" junit core-pom.xml +%pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId ='org.codehaus.groovy']/pom:artifactId" groovy core-pom.xml +%pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId ='cglib']/pom:artifactId" cglib core-pom.xml +%pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId ='asm']/pom:version" 3 core-pom.xml + cp -p %{SOURCE2} guice-pom.xml cp -p %{SOURCE3} build.xml @@ -124,6 +120,9 @@ cp -pr dist/api/* %{buildroot}%{_javadocdir}/%{name} %doc LICENSE NOTICE %changelog +* Thu Nov 14 2013 gil cattaneo <puntogil(a)libero.it> 0.7-0.3.groovy.1.8 +- use objectweb-asm3 + * Sun Aug 04 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.7-0.2.groovy.1.8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

1 0

[javapackages] [doc] Add missing word
by Michal Srb 13 Nov '13

13 Nov '13

commit 8974641cb753b9f7617b9351a22beea2b68ed8d0 Author: Michal Srb <msrb(a)redhat.com> Date: Wed Nov 13 16:07:26 2013 +0100 [doc] Add missing word doc/preamble.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --- diff --git a/doc/preamble.txt b/doc/preamble.txt index 84e849a..a4e8804 100644 --- a/doc/preamble.txt +++ b/doc/preamble.txt @@ -25,7 +25,7 @@ at https://bugzilla.redhat.com/[Red Hat Bugzilla]. Before contributing please read the https://git.fedorahosted.org/cgit/javapackages.git/plain/doc/README[README file], which among other things includes basic rules which should be -followed when working on this document. You can patches to +followed when working on this document. You can send patches to https://bugzilla.redhat.com/[Red Hat Bugzilla]. They should be in git format and should be prepared against `master` branch in git. Alternatively you can also send pull requests at

1 0

[javapackages] [test] Add tests for %mvn_install
by Michael Šimáček 13 Nov '13

13 Nov '13

commit c39a3322ba53a957187bb7b657cfac3f8f623db3 Author: Michael Simacek <msimacek(a)redhat.com> Date: Wed Nov 13 16:03:59 2013 +0100 [test] Add tests for %mvn_install test/mvn_macros_test.py | 48 +++++++++++++++++++++++++++++++++++++++++++++++ test/xmvn-install | 5 ++++ 2 files changed, 53 insertions(+), 0 deletions(-) --- diff --git a/test/mvn_macros_test.py b/test/mvn_macros_test.py index 7fa5330..7f9af7e 100644 --- a/test/mvn_macros_test.py +++ b/test/mvn_macros_test.py @@ -1,4 +1,5 @@ import os +import re import shutil import unittest @@ -391,3 +392,50 @@ class MvnMacrosTest(unittest.TestCase): report = compare_xml_files(actfile, expfile, ['artifactGlob']) self.assertEquals(report, '', report) + @rpm_test() + def test_mvn_install(self, pack): + pack.append_to_install('%mvn_install') + + _, stderr, return_value = pack.run_install() + self.assertEqual(return_value, 0, stderr) + + argspath = os.path.join('rpmbuild', 'BUILD', '.xmvn', 'install-out') + with open(argspath, 'r') as argsfile: + args = argsfile.read() + self.assertTrue(re.match(r'-R \.xmvn-reactor -n \S+ -d \S+\n', + args), args) + + @rpm_test() + def test_mvn_install_debug(self, pack): + pack.append_to_install('%mvn_install -X') + + _, stderr, return_value = pack.run_install() + self.assertEqual(return_value, 0, stderr) + + argspath = os.path.join('rpmbuild', 'BUILD', '.xmvn', 'install-out') + with open(argspath, 'r') as argsfile: + args = argsfile.read() + self.assertTrue(re.match(r'-X -R \.xmvn-reactor -n \S+ -d \S+\n', + args), args) + + @rpm_test() + def test_mvn_install_directory(self, pack): + pack.append_to_build('mkdir ../doc') + pack.append_to_build('touch ../doc/file') + pack.append_to_install('%mvn_install -J doc') + pack.append_to_install('%files -f .mfiles-javadoc') + + _, stderr, return_value = pack.run_install() + self.assertEqual(return_value, 0, stderr) + + argspath = os.path.join('rpmbuild', 'BUILD', '.xmvn', 'install-out') + with open(argspath, 'r') as argsfile: + args = argsfile.read() + self.assertTrue(re.match(r'-R \.xmvn-reactor -n \S+ -d \S+\n', + args), args) + + mfilespath = os.path.join('rpmbuild', 'BUILD', '.mfiles-javadoc') + with open(mfilespath, 'r') as mfiles: + self.assertEqual(mfiles.read(), + '/usr/share/javadoc/test_mvn_install_directory\n') + diff --git a/test/xmvn-install b/test/xmvn-install new file mode 100755 index 0000000..3dd17c9 --- /dev/null +++ b/test/xmvn-install @@ -0,0 +1,5 @@ +#!/bin/sh +#mock script for testing arguments passed to xmvn +mkdir -p .xmvn +echo "${@}">.xmvn/install-out +env >.xmvn/install-env

1 0

[javapackages] [test] Support for testing %install phase
by Michael Šimáček 13 Nov '13

13 Nov '13

commit 4ef8d82f3a3b529f76c6774681ecf281cc0a1788 Author: Michael Simacek <msimacek(a)redhat.com> Date: Wed Nov 13 16:02:59 2013 +0100 [test] Support for testing %install phase test/test_rpmbuild.py | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) --- diff --git a/test/test_rpmbuild.py b/test/test_rpmbuild.py index 325d611..11c833e 100644 --- a/test/test_rpmbuild.py +++ b/test/test_rpmbuild.py @@ -23,6 +23,7 @@ class Package(object): self.__begin = '' self.__prep = '' self.__build = '' + self.__install = '' self.buildpath = os.path.join('rpmbuild', 'BUILD', name + '-1') self.__env = dict(os.environ) self.__env['HOME'] = os.getcwd() @@ -59,6 +60,10 @@ class Package(object): """Appends given string to %build section of spec.""" self.__build += to_append + '\n' + def append_to_install(self, to_append): + """Appends given string to %install section of spec.""" + self.__install += to_append + '\n' + def run_prep(self, args=None): """Runs rpmbuild -bp (doing only prep phase) with current settings.""" self.__prepare_all() @@ -69,6 +74,11 @@ class Package(object): self.__prepare_all() return self.__invoke_rpmbuild(['-bb'] + (args or [])) + def run_install(self, args=None): + """Runs rpmbuild -bi (stop after install) with current settings.""" + self.__prepare_all() + return self.__invoke_rpmbuild(['-bi'] + (args or [])) + def __invoke_rpmbuild(self, args): outfile = open("tmpout", 'w') errfile = open("tmperr", 'w') @@ -143,11 +153,18 @@ class Package(object): """) build_section += self.__build + install_section = dedent("""\ + + %install + """) + install_section += self.__install + specpath = os.path.join('rpmbuild', 'SPECS', self.__name + '.spec') with open(specpath, 'w') as specfile: specfile.write(header) specfile.write(prep_section) specfile.write(build_section) + specfile.write(install_section) def __prepare_sources(self): destpath = os.path.join('rpmbuild', 'SOURCES')

1 0

[javapackages] [test] Add more tests for mvn_build parameters
by Michael Šimáček 13 Nov '13

13 Nov '13

commit b7193e96b10098fb61a9f691a0fd760b31f50669 Author: Michael Simacek <msimacek(a)redhat.com> Date: Wed Nov 13 12:41:55 2013 +0100 [test] Add more tests for mvn_build parameters test/data/mvn_build/goal_after_out | 2 +- test/data/mvn_build/goal_before_out | 2 +- test/data/mvn_build/more_goals_out | 1 + test/mvn_build_test.py | 11 +++++++++-- 4 files changed, 12 insertions(+), 4 deletions(-) --- diff --git a/test/data/mvn_build/goal_after_out b/test/data/mvn_build/goal_after_out index 84dd11b..a4c0a57 100644 --- a/test/data/mvn_build/goal_after_out +++ b/test/data/mvn_build/goal_after_out @@ -1 +1 @@ ---batch-mode --offline verify org.fedoraproject.xmvn:xmvn-mojo:install org.apache.maven.plugins:maven-javadoc-plugin:aggregate org.fedoraproject.xmvn:xmvn-mojo:builddep +--batch-mode --offline verify org.fedoraproject.xmvn:xmvn-mojo:install org.apache.maven.plugins:maven-javadoc-plugin:aggregate org.fedoraproject.xmvn:xmvn-mojo:builddep integration-test diff --git a/test/data/mvn_build/goal_before_out b/test/data/mvn_build/goal_before_out index 84dd11b..2182bd1 100644 --- a/test/data/mvn_build/goal_before_out +++ b/test/data/mvn_build/goal_before_out @@ -1 +1 @@ ---batch-mode --offline verify org.fedoraproject.xmvn:xmvn-mojo:install org.apache.maven.plugins:maven-javadoc-plugin:aggregate org.fedoraproject.xmvn:xmvn-mojo:builddep +--batch-mode --offline validate verify org.fedoraproject.xmvn:xmvn-mojo:install org.apache.maven.plugins:maven-javadoc-plugin:aggregate org.fedoraproject.xmvn:xmvn-mojo:builddep diff --git a/test/data/mvn_build/more_goals_out b/test/data/mvn_build/more_goals_out new file mode 100644 index 0000000..a81d1ad --- /dev/null +++ b/test/data/mvn_build/more_goals_out @@ -0,0 +1 @@ +--batch-mode --offline validate compile verify org.fedoraproject.xmvn:xmvn-mojo:install org.apache.maven.plugins:maven-javadoc-plugin:aggregate org.fedoraproject.xmvn:xmvn-mojo:builddep integration-test verify diff --git a/test/mvn_build_test.py b/test/mvn_build_test.py index 2836432..2c13fb2 100644 --- a/test/mvn_build_test.py +++ b/test/mvn_build_test.py @@ -72,13 +72,13 @@ class TestMvnBuild(unittest.TestCase): ['artifactGlob']) self.assertFalse(report, '\n' + report) - @xmvnconfig('mvn_build',['-g', ]) + @xmvnconfig('mvn_build',['-g', 'validate']) def test_goal_before(self, stdout, stderr, return_value): self.assertEquals(return_value, 0) self.assertEquals(get_actual_args(), get_expected_args('mvn_build', 'goal_before')) - @xmvnconfig('mvn_build',['-G', ]) + @xmvnconfig('mvn_build',['-G', 'integration-test']) def test_goal_after(self, stdout, stderr, return_value): self.assertEquals(return_value, 0) self.assertEquals(get_actual_args(), @@ -170,5 +170,12 @@ class TestMvnBuild(unittest.TestCase): ['artifactGlob']) self.assertFalse(report, '\n' + report) + @xmvnconfig('mvn_build',['-g', 'validate', 'compile', '-G', + 'integration-test', 'verify']) + def test_more_goals(self, stdout, stderr, return_value): + self.assertEquals(return_value, 0) + self.assertEquals(get_actual_args(), + get_expected_args('mvn_build', 'more_goals')) + if __name__ == '__main__': unittest.main()

1 0

[javapackages] [doc] Add build instructions
by Michal Srb 13 Nov '13

13 Nov '13

commit 8ed8948848bcbff67bfaa6f42e9ebd27b754f2cc Author: Michal Srb <msrb(a)redhat.com> Date: Wed Nov 13 15:52:49 2013 +0100 [doc] Add build instructions doc/README | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) --- diff --git a/doc/README b/doc/README index e02539b..cb5085a 100644 --- a/doc/README +++ b/doc/README @@ -1,3 +1,7 @@ +Build instructions: + +Simply run 'make' in project's doc/ directory. + Conventions: JAR - always capital unless mentioning filename POM - always capital unless mentioning filename

1 0

[javapackages] [doc] Remove asciidoc+html5 hack from README
by Michal Srb 13 Nov '13

13 Nov '13

commit 05bca9153410a9edd6ff834ced6803b257951547 Author: Michal Srb <msrb(a)redhat.com> Date: Wed Nov 13 15:45:13 2013 +0100 [doc] Remove asciidoc+html5 hack from README It shouldn't be needed anymore. doc/README | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) --- diff --git a/doc/README b/doc/README index a8e9b3a..e02539b 100644 --- a/doc/README +++ b/doc/README @@ -1,13 +1,3 @@ - -This needs asciidoc with html5 support so if you want to build the docs on -Fedora right now: - - hg clone https://asciidoc.googlecode.com/hg/ asciidoc - ln -s $(pwd)/asciidoc/a2x.py ~/bin/a2x - ln -s $(pwd)/asciidoc/asciidoc.py ~/bin/asciidoc - -And of course add ~/bin to your PATH before running make - Conventions: JAR - always capital unless mentioning filename POM - always capital unless mentioning filename

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

java-sig-commits November 2013