January 2014 - java-sig-commits - Fedora Mailing-Lists

[javapackages/pom_editor.py] install new pom_editor

by Michael Šimáček

commit e623f7be919522ce95af980c8fa5c24b46c656c4 Author: Michael Simacek <msimacek(a)redhat.com> Date: Sun Jan 5 00:03:05 2014 +0100 install new pom_editor install | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --- diff --git a/install b/install index fd24e97..0cbaafa 100755 --- a/install +++ b/install @@ -120,7 +120,7 @@ inst_config target/java.conf "${javaconfdir}" inst_data target/java-functions "${javadir}-utils" inst_data java-utils/maven_depmap.py "${javadir}-utils" -inst_data java-utils/pom_editor.sh "${javadir}-utils" +inst_data java-utils/pom_editor.py "${javadir}-utils" inst_data target/macros.jpackage "${sysconfdir}/rpm" inst_data target/macros.fjava "${sysconfdir}/rpm"

10 years, 4 months

1
0
0 / 0

[javapackages/pom_editor.py] [test] more tests for pom_editor

by Michael Šimáček

commit b7c9e01c5594622ddd6ad5f71f4b618a5b5bd0cf Author: Michael Simacek <msimacek(a)redhat.com> Date: Thu Dec 19 15:40:49 2013 +0100 [test] more tests for pom_editor test/data/pom_macros/pom_xpath_inject_multiple.xml | 31 +++++++++++ .../pom_macros/pom_xpath_inject_multiple.xml-want | 37 +++++++++++++ .../data/pom_macros/pom_xpath_replace_multiple.xml | 31 +++++++++++ .../pom_macros/pom_xpath_replace_multiple.xml-want | 35 +++++++++++++ test/data/pom_macros/pom_xpath_set_multiple.xml | 27 ++++++++++ .../pom_macros/pom_xpath_set_multiple.xml-want | 43 ++++++++++++++++ test/pom_macros_test.py | 54 ++++++++++++-------- 7 files changed, 237 insertions(+), 21 deletions(-) --- diff --git a/test/data/pom_macros/pom_xpath_inject_multiple.xml b/test/data/pom_macros/pom_xpath_inject_multiple.xml new file mode 100644 index 0000000..0e47efa --- /dev/null +++ b/test/data/pom_macros/pom_xpath_inject_multiple.xml @@ -0,0 +1,31 @@ +<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"> + <parent> + <groupId>org.apache.commons</groupId> + <artifactId>commons-parent</artifactId> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.6</version> + <name>Commons Lang</name> + + <prerequisities> + <maven>3.0</maven> + <maven-old>2.0</maven-old> + </prerequisities> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>1.2</version> + </dependency> + </dependencies> + +</project> diff --git a/test/data/pom_macros/pom_xpath_inject_multiple.xml-want b/test/data/pom_macros/pom_xpath_inject_multiple.xml-want new file mode 100644 index 0000000..346fa32 --- /dev/null +++ b/test/data/pom_macros/pom_xpath_inject_multiple.xml-want @@ -0,0 +1,37 @@ +<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"> + <parent> + <groupId>org.apache.commons</groupId> + <artifactId>commons-parent</artifactId> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.6</version> + <name>Commons Lang</name> + + <prerequisities> + <maven>3.0</maven> + <maven-old>2.0</maven-old> + </prerequisities> + + <dependencies> + <dependency> +  + <classifier>test</classifier> +  + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> +  + <classifier>test</classifier> +  + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>1.2</version> + </dependency> + </dependencies> + +</project> diff --git a/test/data/pom_macros/pom_xpath_replace_multiple.xml b/test/data/pom_macros/pom_xpath_replace_multiple.xml new file mode 100644 index 0000000..0e47efa --- /dev/null +++ b/test/data/pom_macros/pom_xpath_replace_multiple.xml @@ -0,0 +1,31 @@ +<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"> + <parent> + <groupId>org.apache.commons</groupId> + <artifactId>commons-parent</artifactId> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.6</version> + <name>Commons Lang</name> + + <prerequisities> + <maven>3.0</maven> + <maven-old>2.0</maven-old> + </prerequisities> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>1.2</version> + </dependency> + </dependencies> + +</project> diff --git a/test/data/pom_macros/pom_xpath_replace_multiple.xml-want b/test/data/pom_macros/pom_xpath_replace_multiple.xml-want new file mode 100644 index 0000000..4363544 --- /dev/null +++ b/test/data/pom_macros/pom_xpath_replace_multiple.xml-want @@ -0,0 +1,35 @@ +<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"> + <parent> + <groupId>org.apache.commons</groupId> + <artifactId>commons-parent</artifactId> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.6</version> + <name>Commons Lang</name> + + <prerequisities> + <maven>3.0</maven> + <maven-old>2.0</maven-old> + </prerequisities> + + <dependencies> + <dependency> +  + <groupId>a</groupId> +  + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> +  + <groupId>a</groupId> +  + <artifactId>commons-io</artifactId> + <version>1.2</version> + </dependency> + </dependencies> + +</project> diff --git a/test/data/pom_macros/pom_xpath_set_multiple.xml b/test/data/pom_macros/pom_xpath_set_multiple.xml new file mode 100644 index 0000000..b5f4f83 --- /dev/null +++ b/test/data/pom_macros/pom_xpath_set_multiple.xml @@ -0,0 +1,27 @@ +<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"> + <parent> + <groupId>org.apache.commons</groupId> + <artifactId>commons-parent</artifactId> + <version>2.6</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.6</version> + <name>Commons Lang</name> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>1.2</version> + </dependency> + </dependencies> + +</project> diff --git a/test/data/pom_macros/pom_xpath_set_multiple.xml-want b/test/data/pom_macros/pom_xpath_set_multiple.xml-want new file mode 100644 index 0000000..aa2c5bd --- /dev/null +++ b/test/data/pom_macros/pom_xpath_set_multiple.xml-want @@ -0,0 +1,43 @@ +<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"> + <parent> + <groupId> +  + commons +  + </groupId> + <artifactId>commons-parent</artifactId> + <version>2.6</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId> +  + commons +  + </groupId> + <artifactId>commons-lang</artifactId> + <version>2.6</version> + <name>Commons Lang</name> + + <dependencies> + <dependency> + <groupId> +  + commons +  + </groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId> +  + commons +  + </groupId> + <artifactId>commons-io</artifactId> + <version>1.2</version> + </dependency> + </dependencies> + +</project> diff --git a/test/pom_macros_test.py b/test/pom_macros_test.py index 8b0b6da..0a2ba08 100644 --- a/test/pom_macros_test.py +++ b/test/pom_macros_test.py @@ -91,9 +91,6 @@ class PomMacrosTest(unittest.TestCase): self.assertEqual(returncode, 1, stderr) self.assertIn("Error in processing", stderr) - report, res = check_result(pom_path) - self.assertEqual(res, True, report) - @exec_macro("pom_remove_plugin :my-plugin", "pom_remove_plugin.xml") def test_remove_plugin(self, stdin, stderr, returncode, pom_path): self.assertEqual(returncode, 0, stderr) @@ -121,9 +118,6 @@ class PomMacrosTest(unittest.TestCase): self.assertEqual(returncode, 1) self.assertIn("Error in processing", stderr) - report, res = check_result(pom_path) - self.assertEqual(res, True, report) - @exec_macro("pom_disable_module module", "pom_disable_module.xml") def test_disable_module(self, stdin, stderr, returncode, pom_path): self.assertEqual(returncode, 0, stderr) @@ -144,9 +138,6 @@ class PomMacrosTest(unittest.TestCase): self.assertEqual(returncode, 1) self.assertIn("Error in processing", stderr) - report, res = check_result(pom_path) - self.assertEqual(res, True, report) - @exec_macro("pom_add_dep gdep:adep:3.2:test", "pom_add_dep.xml") def test_add_dep(self, stdin, stderr, returncode, pom_path): self.assertEqual(returncode, 0, stderr) @@ -276,9 +267,6 @@ class PomMacrosTest(unittest.TestCase): self.assertEqual(returncode, 1, stderr) self.assertIn("Error in processing", stderr) - report, res = check_result(pom_path) - self.assertEqual(res, True, report) - @exec_macro("pom_xpath_remove pom:maven-old", "pom_xpath_remove.xml") def test_xpath_remove(self, stdin, stderr, returncode, pom_path): self.assertEqual(returncode, 0, stderr) @@ -309,9 +297,6 @@ class PomMacrosTest(unittest.TestCase): self.assertEqual(returncode, 1, stderr) self.assertIn("Error in processing", stderr) - report, res = check_result(pom_path) - self.assertEqual(res, True, report) - @exec_macro("pom_xpath_inject pom:parent '<version>1.2</version>'", "pom_xpath_inject.xml") def test_xpath_inject(self, stdin, stderr, returncode, pom_path): @@ -320,6 +305,15 @@ class PomMacrosTest(unittest.TestCase): report, res = check_result(pom_path) self.assertEqual(res, True, report) + @exec_macro("pom_xpath_inject pom:dependencies/pom:dependency " + "'<classifier>test</classifier>'", + "pom_xpath_inject_multiple.xml") + def test_xpath_inject_multiple(self, stdin, stderr, returncode, pom_path): + self.assertEqual(returncode, 0, stderr) + + report, res = check_result(pom_path) + self.assertEqual(res, True, report) + @exec_macro("pom_xpath_inject pom:parent '<version>1.2</version>'", "pom_xpath_inject_whitespace.xml") def test_xpath_inject_whitespace(self, stdin, stderr, returncode, pom_path): @@ -362,9 +356,6 @@ class PomMacrosTest(unittest.TestCase): self.assertEqual(returncode, 1, stderr) self.assertIn("Error in processing", stderr) - report, res = check_result(pom_path) - self.assertEqual(res, True, report) - @exec_macro("pom_xpath_replace pom:parent/pom:groupId \ '<groupId>commons</groupId>'", "pom_xpath_replace.xml") @@ -374,6 +365,22 @@ class PomMacrosTest(unittest.TestCase): report, res = check_result(pom_path) self.assertEqual(res, True, report) + @exec_macro("pom_xpath_replace //pom:dependency/pom:groupId " + "'<groupId>a</groupId>'", + "pom_xpath_replace_multiple.xml") + def test_xpath_replace_multiple(self, stdin, stderr, returncode, pom_path): + self.assertEqual(returncode, 0, stderr) + + report, res = check_result(pom_path) + self.assertEqual(res, True, report) + + @exec_macro("pom_xpath_replace //pom:dependency/pom:groupId " + "'<groupId>a/groupId>'", + "pom_xpath_replace_multiple.xml") + def test_xpath_replace_invalid(self, stdin, stderr, returncode, pom_path): + self.assertEqual(returncode, 1) + self.assertIn("Error in processing", stderr) + @exec_macro("pom_xpath_replace pom:parent/pom:groupId \ '<groupId>commons</groupId>'", "pom_xpath_replace_whitespace.xml") @@ -420,9 +427,6 @@ class PomMacrosTest(unittest.TestCase): self.assertEqual(returncode, 1, stderr) self.assertIn("Error in processing", stderr) - report, res = check_result(pom_path) - self.assertEqual(res, True, report) - @exec_macro("pom_xpath_set pom:project/pom:groupId 'commons'", "pom_xpath_set.xml") def test_xpath_set(self, stdin, stderr, returncode, pom_path): @@ -431,6 +435,14 @@ class PomMacrosTest(unittest.TestCase): report, res = check_result(pom_path) self.assertEqual(res, True, report) + @exec_macro("pom_xpath_set pom:groupId 'commons'", + "pom_xpath_set_multiple.xml") + def test_xpath_set_multiple(self, stdin, stderr, returncode, pom_path): + self.assertEqual(returncode, 0, stderr) + + report, res = check_result(pom_path) + self.assertEqual(res, True, report) + @exec_macro("pom_xpath_set \"pom:build/pom:plugins/pom:plugin[pom:groupId\ [text()='org.codehaus.mojo']]/pom:version\" 2", "pom_xpath_set2.xml")

10 years, 4 months

1
0
0 / 0

[Bug 652183] Java SIG tracker bug

by Red Hat Bugzilla

https://bugzilla.redhat.com/show_bug.cgi?id=652183 Alexander Kurtakov <akurtako(a)redhat.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Depends On|1011705 (datanucleus-core) | Referenced Bugs: https://bugzilla.redhat.com/show_bug.cgi?id=1011705 [Bug 1011705] Review Request: datanucleus-core - Java persistence abstraction layer -- You are receiving this mail because: You are the QA Contact for the bug. You are the assignee for the bug.

10 years, 5 months

1
0
0 / 0

[datanucleus-rdbms/f20] added missing asm BR

by Peter MacKinnon

commit 28857684ba2583e270c0d6754e5b70ce9b70615c Author: Peter MacKinnon <pmackinn(a)redhat.com> Date: Fri Jan 3 13:07:55 2014 -0500 added missing asm BR datanucleus-rdbms.spec | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) --- diff --git a/datanucleus-rdbms.spec b/datanucleus-rdbms.spec index 5218ce8..326e6d2 100644 --- a/datanucleus-rdbms.spec +++ b/datanucleus-rdbms.spec @@ -18,6 +18,7 @@ BuildRequires: mvn(javax.transaction:jta) BuildRequires: mvn(org.datanucleus:datanucleus-core) BuildRequires: mvn(org.sonatype.oss:oss-parent) BuildRequires: mvn(proxool:proxool) +BuildRequires: mvn(org.ow2.asm:asm) # TODO BuildRequires: mvn(org.apache.tomcat:tomcat-jdbc) BuildRequires: tomcat-lib # Test deps

10 years, 5 months

1
0
0 / 0

[datanucleus-rdbms/f20] (2 commits) ...Add missing BR maven-install-plugin

by Peter MacKinnon

Summary of changes: 718f124... Initial import (#1011960) (*) e39ba55... Add missing BR maven-install-plugin (*) (*) This commit already existed in another branch; no separate mail sent

10 years, 5 months

1
0
0 / 0

[Bug 652183] Java SIG tracker bug

by Red Hat Bugzilla

https://bugzilla.redhat.com/show_bug.cgi?id=652183 Will Benton <willb(a)redhat.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Depends On| |1048299 Referenced Bugs: https://bugzilla.redhat.com/show_bug.cgi?id=1048299 [Bug 1048299] Review Request: fmpp - FreeMarker based preprocessor -- You are receiving this mail because: You are the QA Contact for the bug. You are the assignee for the bug.

10 years, 5 months

1
0
0 / 0

[datanucleus-api-jdo/f20] add missing asm BR

by Peter MacKinnon

commit 3bbda6caf14190b68c473c86a502a84454606203 Author: Peter MacKinnon <pmackinn(a)redhat.com> Date: Fri Jan 3 10:42:06 2014 -0500 add missing asm BR datanucleus-api-jdo.spec | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) --- diff --git a/datanucleus-api-jdo.spec b/datanucleus-api-jdo.spec index ce2ca80..2d01b56 100644 --- a/datanucleus-api-jdo.spec +++ b/datanucleus-api-jdo.spec @@ -1,6 +1,6 @@ Name: datanucleus-api-jdo Version: 3.2.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: DataNucleus JDO API plugin License: ASL 2.0 URL: http://www.datanucleus.org @@ -15,6 +15,7 @@ BuildRequires: java-devel BuildRequires: mvn(javax.jdo:jdo-api) BuildRequires: mvn(javax.transaction:jta) BuildRequires: mvn(org.datanucleus:datanucleus-core) +BuildRequires: mvn(org.ow2.asm:asm) # Test deps BuildRequires: mvn(junit:junit) BuildRequires: mvn(log4j:log4j) @@ -78,6 +79,9 @@ cp -p META-INF/README.txt . %doc LICENSE.txt NOTICE.txt %changelog +* Fri Jan 03 2014 Peter MacKinnon <pmackinn(a)redhat.com> 3.2.6-3 +- add missing asm BR + * Mon Dec 16 2013 Peter MacKinnon <pmackinn(a)redhat.com> 3.2.6-2 - injected missing ASL2 license text in DTD

10 years, 5 months

1
0
0 / 0

[Bug 652183] Java SIG tracker bug

by Red Hat Bugzilla

https://bugzilla.redhat.com/show_bug.cgi?id=652183 Bug 652183 depends on bug 1011705, which changed state. Bug 1011705 Summary: Review Request: datanucleus-core - Java persistence abstraction layer https://bugzilla.redhat.com/show_bug.cgi?id=1011705 What |Removed |Added ---------------------------------------------------------------------------- Status|ON_QA |CLOSED Resolution|--- |ERRATA -- You are receiving this mail because: You are the QA Contact for the bug. You are the assignee for the bug.

10 years, 5 months

1
0
0 / 0

[Bug 1044956] New: async-http-client-1.7.23 is available

by Red Hat Bugzilla

https://bugzilla.redhat.com/show_bug.cgi?id=1044956 Bug ID: 1044956 Summary: async-http-client-1.7.23 is available Product: Fedora Version: rawhide Component: async-http-client Keywords: FutureFeature, Triaged Assignee: sochotni(a)redhat.com Reporter: upstream-release-monitoring(a)fedoraproject.org QA Contact: extras-qa(a)fedoraproject.org CC: java-sig-commits(a)lists.fedoraproject.org, mizdebsk(a)redhat.com, msrb(a)redhat.com, sochotni(a)redhat.com Latest upstream release: 1.7.23 Current version/release in Fedora Rawhide: 1.7.22-1.fc21 URL: https://github.com/AsyncHttpClient/async-http-client/tags Please consult the package updates policy before you issue an update to a stable branch: https://fedoraproject.org/wiki/Updates_Policy More information about the service that created this bug can be found at: https://fedoraproject.org/wiki/Upstream_release_monitoring -- You are receiving this mail because: You are on the CC list for the bug. Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=fFlHswaIx9&a=cc_unsubscribe

10 years, 5 months

1
2
0 / 0

[async-http-client] Update to upstream version 1.7.23

by Michal Srb

commit 085688282d3b568b3f4901d5235fa53d98b75234 Author: Michal Srb <msrb(a)redhat.com> Date: Fri Jan 3 07:44:46 2014 +0100 Update to upstream version 1.7.23 .gitignore | 1 + async-http-client.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) --- diff --git a/.gitignore b/.gitignore index 3b399fc..be1c00c 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /async-http-client-1.7.19.tar.gz /async-http-client-1.7.21.tar.gz /async-http-client-1.7.22.tar.gz +/async-http-client-1.7.23.tar.gz diff --git a/async-http-client.spec b/async-http-client.spec index 05044cc..c6a81bd 100644 --- a/async-http-client.spec +++ b/async-http-client.spec @@ -1,6 +1,6 @@ Name: async-http-client -Version: 1.7.22 +Version: 1.7.23 Release: 1%{?dist} Summary: Asynchronous Http Client for Java @@ -75,6 +75,9 @@ rm -Rf src/test/java/com/ning/http/client/websocket %changelog +* Fri Jan 03 2014 Michal Srb <msrb(a)redhat.com> - 1.7.23-1 +- Update to upstream version 1.7.23 + * Wed Dec 4 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.7.22-1 - Update to upstream version 1.7.22 diff --git a/sources b/sources index 88ca897..98b4ae0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -61005497c495430c49946b8893763800 async-http-client-1.7.22.tar.gz +013d5d1cbe0b3259e917f2d9f809ea23 async-http-client-1.7.23.tar.gz

10 years, 5 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

java-sig-commits January 2014