[Bug 1217425] New: xmvn-builddep generates dependencies on artifacts in the reactor
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=1217425
Bug ID: 1217425
Summary: xmvn-builddep generates dependencies on artifacts in
the reactor
Product: Fedora
Version: rawhide
Component: xmvn
Assignee: mizdebsk(a)redhat.com
Reporter: msimacek(a)redhat.com
QA Contact: extras-qa(a)fedoraproject.org
CC: java-sig-commits(a)lists.fedoraproject.org,
mat.booth(a)redhat.com, mizdebsk(a)redhat.com,
msimacek(a)redhat.com, msrb(a)redhat.com
Description of problem:
xmvn-builddep sometimes unnecessarily generates dependency on artifacts from
the project itself, thus creating circular dependency.
Version-Release number of selected component (if applicable):
xmvn-2.4.0-0.28.git49333a9.noarch
How reproducible:
always
Steps to Reproduce:
1. rebuild log4j
2. run xmvn-builddep on the build.log
Actual results:
Unnecessary circular dependency:
BuildRequires: mvn(org.apache.logging.log4j:log4j-api)
BuildRequires: mvn(org.apache.logging.log4j:log4j-api::tests:)
BuildRequires: mvn(org.apache.logging.log4j:log4j-core)
BuildRequires: mvn(org.apache.logging.log4j:log4j-core::tests:)
BuildRequires: mvn(org.apache.logging.log4j:log4j:pom:)
BuildRequires: mvn(org.apache.logging.log4j:log4j-web)
Expected results:
No circular dependency.
--
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=IopQVXkuHY&a=cc_unsubscribe
8 years, 6 months
[Bug 1217422] New: xmvn-builddep: unexpanded variables in output
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=1217422
Bug ID: 1217422
Summary: xmvn-builddep: unexpanded variables in output
Product: Fedora
Version: rawhide
Component: xmvn
Assignee: mizdebsk(a)redhat.com
Reporter: msimacek(a)redhat.com
QA Contact: extras-qa(a)fedoraproject.org
CC: java-sig-commits(a)lists.fedoraproject.org,
mat.booth(a)redhat.com, mizdebsk(a)redhat.com,
msimacek(a)redhat.com, msrb(a)redhat.com
Description of problem:
xmvn-builddep sometimes outputs buildrequires with unexpanded variables
Version-Release number of selected component (if applicable):
xmvn-2.4.0-0.28.git49333a9.noarch
How reproducible:
always
Steps to Reproduce:
1. rebuild felix-bundlerepository
2. run xmvn-builddep on the build.log
Actual results:
BuildRequires: maven-local
BuildRequires: mvn(junit:junit)
BuildRequires: mvn(net.sf.kxml:kxml2)
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.apache.rat:apache-rat-plugin)
BuildRequires: mvn(org.codehaus.woodstox:woodstox-core-asl)
BuildRequires: mvn(org.easymock:easymock)
BuildRequires: mvn(org.osgi:org.osgi.compendium)
BuildRequires: mvn(org.osgi:org.osgi.core)
BuildRequires: mvn(${project.groupId}:org.apache.felix.shell)
BuildRequires: mvn(${project.groupId}:org.apache.felix.utils)
BuildRequires: mvn(${project.groupId}:org.osgi.service.obr)
BuildRequires: mvn(xpp3:xpp3)
Expected results:
BuildRequires: maven-local
BuildRequires: mvn(junit:junit)
BuildRequires: mvn(net.sf.kxml:kxml2)
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.apache.rat:apache-rat-plugin)
BuildRequires: mvn(org.codehaus.woodstox:woodstox-core-asl)
BuildRequires: mvn(org.easymock:easymock)
BuildRequires: mvn(org.osgi:org.osgi.compendium)
BuildRequires: mvn(org.osgi:org.osgi.core)
BuildRequires: mvn(org.apache.felix:org.apache.felix.shell)
BuildRequires: mvn(org.apache.felix:org.apache.felix.utils)
BuildRequires: mvn(org.apache.felix:org.osgi.service.obr)
BuildRequires: mvn(xpp3:xpp3)
--
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=PQlXaYXPad&a=cc_unsubscribe
8 years, 6 months
[Bug 1217473] New: xmvn-builddep generates buildrequires on plugins that weren't used
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=1217473
Bug ID: 1217473
Summary: xmvn-builddep generates buildrequires on plugins that
weren't used
Product: Fedora
Version: rawhide
Component: xmvn
Assignee: mizdebsk(a)redhat.com
Reporter: msimacek(a)redhat.com
QA Contact: extras-qa(a)fedoraproject.org
CC: java-sig-commits(a)lists.fedoraproject.org,
mat.booth(a)redhat.com, mizdebsk(a)redhat.com,
msimacek(a)redhat.com, msrb(a)redhat.com
Description of problem:
xmvn-builddep generates buildrequires on plugins that weren't used during the
build. Usually observed when the artifacts don't exist in Fedora.
Version-Release number of selected component (if applicable):
xmvn-2.4.0-0.28.git49333a9.noarch
How reproducible:
always
Steps to Reproduce:
1. rebuild log4j
2. run xmvn-builddep on the build.log
Actual results:
It generates buildrequires on artifact that doesn't exits in Fedora:
mvn(org.apache.maven.plugins:maven-pdf-plugin)
Expected results:
Buildrequires generated only on plugins that were actually used during the
build.
--
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=XT4t37R3cJ&a=cc_unsubscribe
8 years, 6 months
[Bug 1217462] New: xmvn-builddep always generates buildrequires on test dependencies
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=1217462
Bug ID: 1217462
Summary: xmvn-builddep always generates buildrequires on test
dependencies
Product: Fedora
Version: rawhide
Component: xmvn
Assignee: mizdebsk(a)redhat.com
Reporter: msimacek(a)redhat.com
QA Contact: extras-qa(a)fedoraproject.org
CC: java-sig-commits(a)lists.fedoraproject.org,
mat.booth(a)redhat.com, mizdebsk(a)redhat.com,
msimacek(a)redhat.com, msrb(a)redhat.com
Description of problem:
xmvn-builddep generates buildrequires on test dependencies even though tests
were disabled during the build.
Version-Release number of selected component (if applicable):
xmvn-2.4.0-0.28.git49333a9.noarch
How reproducible:
always
Steps to Reproduce:
1. rebuild log4j
2. run xmvn-builddep on the build.log
Actual results:
There's this line in the output
BuildRequires: mvn(org.mockejb:mockejb)
even though such artifact doesn't even exist in Fedora.
Expected results:
No test dependencies emitted when using %mvn_build -f
--
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=iPoFy7H4DC&a=cc_unsubscribe
8 years, 6 months
[Bug 1226251] New: RFE: xmvn-subst does not support symlinking the current reactor artifacts
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=1226251
Bug ID: 1226251
Summary: RFE: xmvn-subst does not support symlinking the
current reactor artifacts
Product: Fedora
Version: rawhide
Component: xmvn
Assignee: mizdebsk(a)redhat.com
Reporter: sgehwolf(a)redhat.com
QA Contact: extras-qa(a)fedoraproject.org
CC: java-sig-commits(a)lists.fedoraproject.org,
mat.booth(a)redhat.com, mizdebsk(a)redhat.com,
msimacek(a)redhat.com, msrb(a)redhat.com,
omajid(a)redhat.com
Description of problem:
The thermostat package needs to symlink some of its own artifacts
(com.redhat.thermostat:*) during a build. However, xmvn-subst only works if
artifacts are actually installed. It would be ideal if xmvn-subst could be used
for symlinking external deps as well as reactor artifacts.
We currently work around this problem by adding a self-BR. However this is
cumbersome for version upgrades since we need to:
- remove the self BR (or disable it via some global spec variable)
- build
- re-add self BR
- rebuild
It's especially a problem for building RPMs via CI.
--
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=xzEEJfE8Bv&a=cc_unsubscribe
8 years, 6 months
[javapackages] Revert "mvn_bulid: print verbose stack traces by default"
by Mikolaj Izdebski
commit 3ea2cc66b7b128f391d17514650a11c08f65c241
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Oct 27 17:10:48 2015 +0100
Revert "mvn_bulid: print verbose stack traces by default"
This was a bad idea after all - too verbose output may confuse users.
This reverts commit a948d382e8545286dbd0b6d1a07df1a153104842.
java-utils/mvn_build.py | 4 ++--
test/data/mvn_build/all_out | 2 +-
test/data/mvn_build/bootstrap_out | 2 +-
test/data/mvn_build/debug_out | 2 +-
test/data/mvn_build/force_out | 2 +-
test/data/mvn_build/goal_after_out | 2 +-
test/data/mvn_build/goal_before_out | 2 +-
test/data/mvn_build/more_goals_out | 2 +-
test/data/mvn_build/name1_out | 2 +-
test/data/mvn_build/run_no_args_out | 2 +-
test/data/mvn_build/singleton_out | 2 +-
test/data/mvn_build/skip_both_out | 2 +-
test/data/mvn_build/skip_install_out | 2 +-
test/data/mvn_build/skip_javadoc_out | 2 +-
test/data/mvn_build/xmvn_debug_out | 2 +-
test/mvn_macros_test.py | 10 +++++-----
16 files changed, 21 insertions(+), 21 deletions(-)
---
diff --git a/java-utils/mvn_build.py b/java-utils/mvn_build.py
index c785056..2ad9ae4 100644
--- a/java-utils/mvn_build.py
+++ b/java-utils/mvn_build.py
@@ -104,10 +104,10 @@ if __name__ == "__main__":
if options.gradle:
base_goal = "build"
- mvn_args = ["gradle-local", "--stacktrace", "--no-daemon"]
+ mvn_args = ["gradle-local", "--no-daemon"]
else:
base_goal = "verify"
- mvn_args = ["xmvn", "--errors", "--batch-mode"]
+ mvn_args = ["xmvn", "--batch-mode"]
if not options.bootstrap:
mvn_args.append("--offline")
diff --git a/test/data/mvn_build/all_out b/test/data/mvn_build/all_out
index fc7246c..a4f4177 100644
--- a/test/data/mvn_build/all_out
+++ b/test/data/mvn_build/all_out
@@ -1 +1 @@
---errors --batch-mode --offline --debug -Dorg.slf4j.simpleLogger.log.org.fedoraproject.xmvn=debug -Dmaven.test.skip=true package org.fedoraproject.xmvn:xmvn-mojo:builddep
+--batch-mode --offline --debug -Dorg.slf4j.simpleLogger.log.org.fedoraproject.xmvn=debug -Dmaven.test.skip=true package org.fedoraproject.xmvn:xmvn-mojo:builddep
diff --git a/test/data/mvn_build/bootstrap_out b/test/data/mvn_build/bootstrap_out
index 9ff4b46..f508f64 100644
--- a/test/data/mvn_build/bootstrap_out
+++ b/test/data/mvn_build/bootstrap_out
@@ -1 +1 @@
---errors --batch-mode verify org.fedoraproject.xmvn:xmvn-mojo:install org.apache.maven.plugins:maven-javadoc-plugin:aggregate org.fedoraproject.xmvn:xmvn-mojo:builddep
+--batch-mode 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/debug_out b/test/data/mvn_build/debug_out
index f28ccae..3b0f6d4 100644
--- a/test/data/mvn_build/debug_out
+++ b/test/data/mvn_build/debug_out
@@ -1 +1 @@
---errors --batch-mode --offline --debug -Dorg.slf4j.simpleLogger.log.org.fedoraproject.xmvn=debug verify org.fedoraproject.xmvn:xmvn-mojo:install org.apache.maven.plugins:maven-javadoc-plugin:aggregate org.fedoraproject.xmvn:xmvn-mojo:builddep
+--batch-mode --offline --debug -Dorg.slf4j.simpleLogger.log.org.fedoraproject.xmvn=debug 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/force_out b/test/data/mvn_build/force_out
index 2c3e551..4226278 100644
--- a/test/data/mvn_build/force_out
+++ b/test/data/mvn_build/force_out
@@ -1 +1 @@
---errors --batch-mode --offline -Dmaven.test.skip=true package org.fedoraproject.xmvn:xmvn-mojo:install org.apache.maven.plugins:maven-javadoc-plugin:aggregate org.fedoraproject.xmvn:xmvn-mojo:builddep
+--batch-mode --offline -Dmaven.test.skip=true package 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/goal_after_out b/test/data/mvn_build/goal_after_out
index cea1871..a4c0a57 100644
--- a/test/data/mvn_build/goal_after_out
+++ b/test/data/mvn_build/goal_after_out
@@ -1 +1 @@
---errors --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
+--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 71a2c48..2182bd1 100644
--- a/test/data/mvn_build/goal_before_out
+++ b/test/data/mvn_build/goal_before_out
@@ -1 +1 @@
---errors --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
+--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
index c3bac57..a81d1ad 100644
--- a/test/data/mvn_build/more_goals_out
+++ b/test/data/mvn_build/more_goals_out
@@ -1 +1 @@
---errors --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
+--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/data/mvn_build/name1_out b/test/data/mvn_build/name1_out
index f05e90e..84dd11b 100644
--- a/test/data/mvn_build/name1_out
+++ b/test/data/mvn_build/name1_out
@@ -1 +1 @@
---errors --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
diff --git a/test/data/mvn_build/run_no_args_out b/test/data/mvn_build/run_no_args_out
index f05e90e..84dd11b 100644
--- a/test/data/mvn_build/run_no_args_out
+++ b/test/data/mvn_build/run_no_args_out
@@ -1 +1 @@
---errors --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
diff --git a/test/data/mvn_build/singleton_out b/test/data/mvn_build/singleton_out
index f05e90e..84dd11b 100644
--- a/test/data/mvn_build/singleton_out
+++ b/test/data/mvn_build/singleton_out
@@ -1 +1 @@
---errors --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
diff --git a/test/data/mvn_build/skip_both_out b/test/data/mvn_build/skip_both_out
index 61044bc..0a50999 100644
--- a/test/data/mvn_build/skip_both_out
+++ b/test/data/mvn_build/skip_both_out
@@ -1 +1 @@
---errors --batch-mode --offline verify org.fedoraproject.xmvn:xmvn-mojo:builddep
+--batch-mode --offline verify org.fedoraproject.xmvn:xmvn-mojo:builddep
diff --git a/test/data/mvn_build/skip_install_out b/test/data/mvn_build/skip_install_out
index 916eb0c..73d461d 100644
--- a/test/data/mvn_build/skip_install_out
+++ b/test/data/mvn_build/skip_install_out
@@ -1 +1 @@
---errors --batch-mode --offline verify org.apache.maven.plugins:maven-javadoc-plugin:aggregate org.fedoraproject.xmvn:xmvn-mojo:builddep
+--batch-mode --offline verify org.apache.maven.plugins:maven-javadoc-plugin:aggregate org.fedoraproject.xmvn:xmvn-mojo:builddep
diff --git a/test/data/mvn_build/skip_javadoc_out b/test/data/mvn_build/skip_javadoc_out
index cf7e3ae..0121ead 100644
--- a/test/data/mvn_build/skip_javadoc_out
+++ b/test/data/mvn_build/skip_javadoc_out
@@ -1 +1 @@
---errors --batch-mode --offline verify org.fedoraproject.xmvn:xmvn-mojo:install org.fedoraproject.xmvn:xmvn-mojo:builddep
+--batch-mode --offline verify org.fedoraproject.xmvn:xmvn-mojo:install org.fedoraproject.xmvn:xmvn-mojo:builddep
diff --git a/test/data/mvn_build/xmvn_debug_out b/test/data/mvn_build/xmvn_debug_out
index dcac688..34bdf46 100644
--- a/test/data/mvn_build/xmvn_debug_out
+++ b/test/data/mvn_build/xmvn_debug_out
@@ -1 +1 @@
---errors --batch-mode --offline -Dorg.slf4j.simpleLogger.log.org.fedoraproject.xmvn=debug verify org.fedoraproject.xmvn:xmvn-mojo:install org.apache.maven.plugins:maven-javadoc-plugin:aggregate org.fedoraproject.xmvn:xmvn-mojo:builddep
+--batch-mode --offline -Dorg.slf4j.simpleLogger.log.org.fedoraproject.xmvn=debug 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/mvn_macros_test.py b/test/mvn_macros_test.py
index b98e05f..952510d 100644
--- a/test/mvn_macros_test.py
+++ b/test/mvn_macros_test.py
@@ -273,7 +273,7 @@ class MvnMacrosTest(unittest.TestCase):
self.assertEqual(return_value, 0, stderr)
argspath = os.path.join(pack.buildpath, '.xmvn', 'out')
with open(argspath, 'r') as argsfile:
- exp = '--errors --batch-mode --offline ' + \
+ exp = '--batch-mode --offline ' + \
'verify org.fedoraproject.xmvn:xmvn-mojo:install ' + \
'org.apache.maven.plugins:maven-javadoc-plugin:aggregate ' + \
'org.fedoraproject.xmvn:xmvn-mojo:builddep\n'
@@ -322,7 +322,7 @@ class MvnMacrosTest(unittest.TestCase):
self.assertEqual(return_value, 0, stderr)
argspath = os.path.join(pack.buildpath, '.xmvn', 'out')
with open(argspath, 'r') as argsfile:
- exp = '--errors --batch-mode --offline --log-file /var/log/xmvn ' + \
+ exp = '--batch-mode --offline --log-file /var/log/xmvn ' + \
'verify org.fedoraproject.xmvn:xmvn-mojo:install ' + \
'org.apache.maven.plugins:maven-javadoc-plugin:aggregate ' + \
'org.fedoraproject.xmvn:xmvn-mojo:builddep\n'
@@ -337,7 +337,7 @@ class MvnMacrosTest(unittest.TestCase):
self.assertEqual(return_value, 0, stderr)
argspath = os.path.join(pack.buildpath, '.xmvn', 'out')
with open(argspath, 'r') as argsfile:
- exp = '--errors --batch-mode ' + \
+ exp = '--batch-mode ' + \
'verify org.fedoraproject.xmvn:xmvn-mojo:install ' + \
'org.apache.maven.plugins:maven-javadoc-plugin:aggregate ' + \
'org.fedoraproject.xmvn:xmvn-mojo:builddep\n'
@@ -352,7 +352,7 @@ class MvnMacrosTest(unittest.TestCase):
self.assertEqual(return_value, 0, stderr)
argspath = os.path.join(pack.buildpath, '.xmvn', 'out')
with open(argspath, 'r') as argsfile:
- exp = '--errors --batch-mode --offline ' + \
+ exp = '--batch-mode --offline ' + \
'verify org.fedoraproject.xmvn:xmvn-mojo:install ' + \
'org.fedoraproject.xmvn:xmvn-mojo:builddep\n'
self.assertEqual(argsfile.read(), exp)
@@ -366,7 +366,7 @@ class MvnMacrosTest(unittest.TestCase):
self.assertEqual(return_value, 0, stderr)
argspath = os.path.join(pack.buildpath, '.xmvn', 'out')
with open(argspath, 'r') as argsfile:
- exp = '--errors --batch-mode --offline -Dmaven.test.skip=true ' + \
+ exp = '--batch-mode --offline -Dmaven.test.skip=true ' + \
'package org.fedoraproject.xmvn:xmvn-mojo:install ' + \
'org.apache.maven.plugins:maven-javadoc-plugin:aggregate ' + \
'org.fedoraproject.xmvn:xmvn-mojo:builddep\n'
8 years, 6 months
[javapackages] [test] Update mvn_build tests
by Mikolaj Izdebski
commit 84cdd4fe7cbc19d785a52218cd712bf3fba335ae
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Oct 27 16:55:58 2015 +0100
[test] Update mvn_build tests
test/data/mvn_build/all_out | 2 +-
test/data/mvn_build/bootstrap_out | 2 +-
test/data/mvn_build/debug_out | 2 +-
test/data/mvn_build/force_out | 2 +-
test/data/mvn_build/goal_after_out | 2 +-
test/data/mvn_build/goal_before_out | 2 +-
test/data/mvn_build/more_goals_out | 2 +-
test/data/mvn_build/name1_out | 2 +-
test/data/mvn_build/run_no_args_out | 2 +-
test/data/mvn_build/singleton_out | 2 +-
test/data/mvn_build/skip_both_out | 2 +-
test/data/mvn_build/skip_install_out | 2 +-
test/data/mvn_build/skip_javadoc_out | 2 +-
test/data/mvn_build/xmvn_debug_out | 2 +-
test/mvn_macros_test.py | 10 +++++-----
15 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/test/data/mvn_build/all_out b/test/data/mvn_build/all_out
index 9c34337..fc7246c 100644
--- a/test/data/mvn_build/all_out
+++ b/test/data/mvn_build/all_out
@@ -1 +1 @@
---batch-mode --offline -X -Dorg.slf4j.simpleLogger.log.org.fedoraproject.xmvn=debug -Dmaven.test.skip=true package org.fedoraproject.xmvn:xmvn-mojo:builddep
+--errors --batch-mode --offline --debug -Dorg.slf4j.simpleLogger.log.org.fedoraproject.xmvn=debug -Dmaven.test.skip=true package org.fedoraproject.xmvn:xmvn-mojo:builddep
diff --git a/test/data/mvn_build/bootstrap_out b/test/data/mvn_build/bootstrap_out
index f508f64..9ff4b46 100644
--- a/test/data/mvn_build/bootstrap_out
+++ b/test/data/mvn_build/bootstrap_out
@@ -1 +1 @@
---batch-mode verify org.fedoraproject.xmvn:xmvn-mojo:install org.apache.maven.plugins:maven-javadoc-plugin:aggregate org.fedoraproject.xmvn:xmvn-mojo:builddep
+--errors --batch-mode 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/debug_out b/test/data/mvn_build/debug_out
index 170e108..f28ccae 100644
--- a/test/data/mvn_build/debug_out
+++ b/test/data/mvn_build/debug_out
@@ -1 +1 @@
---batch-mode --offline -X -Dorg.slf4j.simpleLogger.log.org.fedoraproject.xmvn=debug verify org.fedoraproject.xmvn:xmvn-mojo:install org.apache.maven.plugins:maven-javadoc-plugin:aggregate org.fedoraproject.xmvn:xmvn-mojo:builddep
+--errors --batch-mode --offline --debug -Dorg.slf4j.simpleLogger.log.org.fedoraproject.xmvn=debug 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/force_out b/test/data/mvn_build/force_out
index 4226278..2c3e551 100644
--- a/test/data/mvn_build/force_out
+++ b/test/data/mvn_build/force_out
@@ -1 +1 @@
---batch-mode --offline -Dmaven.test.skip=true package org.fedoraproject.xmvn:xmvn-mojo:install org.apache.maven.plugins:maven-javadoc-plugin:aggregate org.fedoraproject.xmvn:xmvn-mojo:builddep
+--errors --batch-mode --offline -Dmaven.test.skip=true package 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/goal_after_out b/test/data/mvn_build/goal_after_out
index a4c0a57..cea1871 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 integration-test
+--errors --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 2182bd1..71a2c48 100644
--- a/test/data/mvn_build/goal_before_out
+++ b/test/data/mvn_build/goal_before_out
@@ -1 +1 @@
---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
+--errors --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
index a81d1ad..c3bac57 100644
--- a/test/data/mvn_build/more_goals_out
+++ b/test/data/mvn_build/more_goals_out
@@ -1 +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
+--errors --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/data/mvn_build/name1_out b/test/data/mvn_build/name1_out
index 84dd11b..f05e90e 100644
--- a/test/data/mvn_build/name1_out
+++ b/test/data/mvn_build/name1_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
+--errors --batch-mode --offline 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/run_no_args_out b/test/data/mvn_build/run_no_args_out
index 84dd11b..f05e90e 100644
--- a/test/data/mvn_build/run_no_args_out
+++ b/test/data/mvn_build/run_no_args_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
+--errors --batch-mode --offline 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/singleton_out b/test/data/mvn_build/singleton_out
index 84dd11b..f05e90e 100644
--- a/test/data/mvn_build/singleton_out
+++ b/test/data/mvn_build/singleton_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
+--errors --batch-mode --offline 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/skip_both_out b/test/data/mvn_build/skip_both_out
index 0a50999..61044bc 100644
--- a/test/data/mvn_build/skip_both_out
+++ b/test/data/mvn_build/skip_both_out
@@ -1 +1 @@
---batch-mode --offline verify org.fedoraproject.xmvn:xmvn-mojo:builddep
+--errors --batch-mode --offline verify org.fedoraproject.xmvn:xmvn-mojo:builddep
diff --git a/test/data/mvn_build/skip_install_out b/test/data/mvn_build/skip_install_out
index 73d461d..916eb0c 100644
--- a/test/data/mvn_build/skip_install_out
+++ b/test/data/mvn_build/skip_install_out
@@ -1 +1 @@
---batch-mode --offline verify org.apache.maven.plugins:maven-javadoc-plugin:aggregate org.fedoraproject.xmvn:xmvn-mojo:builddep
+--errors --batch-mode --offline verify org.apache.maven.plugins:maven-javadoc-plugin:aggregate org.fedoraproject.xmvn:xmvn-mojo:builddep
diff --git a/test/data/mvn_build/skip_javadoc_out b/test/data/mvn_build/skip_javadoc_out
index 0121ead..cf7e3ae 100644
--- a/test/data/mvn_build/skip_javadoc_out
+++ b/test/data/mvn_build/skip_javadoc_out
@@ -1 +1 @@
---batch-mode --offline verify org.fedoraproject.xmvn:xmvn-mojo:install org.fedoraproject.xmvn:xmvn-mojo:builddep
+--errors --batch-mode --offline verify org.fedoraproject.xmvn:xmvn-mojo:install org.fedoraproject.xmvn:xmvn-mojo:builddep
diff --git a/test/data/mvn_build/xmvn_debug_out b/test/data/mvn_build/xmvn_debug_out
index 34bdf46..dcac688 100644
--- a/test/data/mvn_build/xmvn_debug_out
+++ b/test/data/mvn_build/xmvn_debug_out
@@ -1 +1 @@
---batch-mode --offline -Dorg.slf4j.simpleLogger.log.org.fedoraproject.xmvn=debug verify org.fedoraproject.xmvn:xmvn-mojo:install org.apache.maven.plugins:maven-javadoc-plugin:aggregate org.fedoraproject.xmvn:xmvn-mojo:builddep
+--errors --batch-mode --offline -Dorg.slf4j.simpleLogger.log.org.fedoraproject.xmvn=debug 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/mvn_macros_test.py b/test/mvn_macros_test.py
index 952510d..b98e05f 100644
--- a/test/mvn_macros_test.py
+++ b/test/mvn_macros_test.py
@@ -273,7 +273,7 @@ class MvnMacrosTest(unittest.TestCase):
self.assertEqual(return_value, 0, stderr)
argspath = os.path.join(pack.buildpath, '.xmvn', 'out')
with open(argspath, 'r') as argsfile:
- exp = '--batch-mode --offline ' + \
+ exp = '--errors --batch-mode --offline ' + \
'verify org.fedoraproject.xmvn:xmvn-mojo:install ' + \
'org.apache.maven.plugins:maven-javadoc-plugin:aggregate ' + \
'org.fedoraproject.xmvn:xmvn-mojo:builddep\n'
@@ -322,7 +322,7 @@ class MvnMacrosTest(unittest.TestCase):
self.assertEqual(return_value, 0, stderr)
argspath = os.path.join(pack.buildpath, '.xmvn', 'out')
with open(argspath, 'r') as argsfile:
- exp = '--batch-mode --offline --log-file /var/log/xmvn ' + \
+ exp = '--errors --batch-mode --offline --log-file /var/log/xmvn ' + \
'verify org.fedoraproject.xmvn:xmvn-mojo:install ' + \
'org.apache.maven.plugins:maven-javadoc-plugin:aggregate ' + \
'org.fedoraproject.xmvn:xmvn-mojo:builddep\n'
@@ -337,7 +337,7 @@ class MvnMacrosTest(unittest.TestCase):
self.assertEqual(return_value, 0, stderr)
argspath = os.path.join(pack.buildpath, '.xmvn', 'out')
with open(argspath, 'r') as argsfile:
- exp = '--batch-mode ' + \
+ exp = '--errors --batch-mode ' + \
'verify org.fedoraproject.xmvn:xmvn-mojo:install ' + \
'org.apache.maven.plugins:maven-javadoc-plugin:aggregate ' + \
'org.fedoraproject.xmvn:xmvn-mojo:builddep\n'
@@ -352,7 +352,7 @@ class MvnMacrosTest(unittest.TestCase):
self.assertEqual(return_value, 0, stderr)
argspath = os.path.join(pack.buildpath, '.xmvn', 'out')
with open(argspath, 'r') as argsfile:
- exp = '--batch-mode --offline ' + \
+ exp = '--errors --batch-mode --offline ' + \
'verify org.fedoraproject.xmvn:xmvn-mojo:install ' + \
'org.fedoraproject.xmvn:xmvn-mojo:builddep\n'
self.assertEqual(argsfile.read(), exp)
@@ -366,7 +366,7 @@ class MvnMacrosTest(unittest.TestCase):
self.assertEqual(return_value, 0, stderr)
argspath = os.path.join(pack.buildpath, '.xmvn', 'out')
with open(argspath, 'r') as argsfile:
- exp = '--batch-mode --offline -Dmaven.test.skip=true ' + \
+ exp = '--errors --batch-mode --offline -Dmaven.test.skip=true ' + \
'package org.fedoraproject.xmvn:xmvn-mojo:install ' + \
'org.apache.maven.plugins:maven-javadoc-plugin:aggregate ' + \
'org.fedoraproject.xmvn:xmvn-mojo:builddep\n'
8 years, 6 months
[javapackages] mvn_build: Fix usage of gradle option variable
by Mikolaj Izdebski
commit b6972d9cb610b83bb71606851a0c7198e6ceb3d7
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Oct 27 16:47:59 2015 +0100
mvn_build: Fix usage of gradle option variable
java-utils/mvn_build.py | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/java-utils/mvn_build.py b/java-utils/mvn_build.py
index dfc538e..c785056 100644
--- a/java-utils/mvn_build.py
+++ b/java-utils/mvn_build.py
@@ -102,7 +102,7 @@ if __name__ == "__main__":
(options, args) = parser.parse_args()
xc = XMvnConfig()
- if gradle:
+ if options.gradle:
base_goal = "build"
mvn_args = ["gradle-local", "--stacktrace", "--no-daemon"]
else:
@@ -124,7 +124,7 @@ if __name__ == "__main__":
if options.force:
mvn_args.append("-Dmaven.test.skip=true")
xc.add_custom_option("buildSettings/skipTests", "true")
- if gradle:
+ if options.gradle:
base_goal = "assemble"
else:
base_goal = "package"
@@ -143,19 +143,19 @@ if __name__ == "__main__":
mvn_args.append(base_goal)
if not options.skip_install:
- if gradle:
+ if options.gradle:
mvn_args.append("xmvnInstall")
else:
mvn_args.append("org.fedoraproject.xmvn:xmvn-mojo:install")
if not options.skip_javadoc:
- if gradle:
+ if options.gradle:
# Automatic javadoc generation for Gradle is not yet implemented in XMvn
pass
else:
mvn_args.append("org.apache.maven.plugins:maven-javadoc-plugin:aggregate")
- if not gradle:
+ if not options.gradle:
# Build dependency generation for Gradle is not yet implemented in XMvn
mvn_args.append("org.fedoraproject.xmvn:xmvn-mojo:builddep")
8 years, 6 months