[javapackages] mvn_bulid: print verbose stack traces by default
by Mikolaj Izdebski
commit a948d382e8545286dbd0b6d1a07df1a153104842
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Oct 27 16:43:45 2015 +0100
mvn_bulid: print verbose stack traces by default
java-utils/mvn_build.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/java-utils/mvn_build.py b/java-utils/mvn_build.py
index dd5e004..dfc538e 100644
--- a/java-utils/mvn_build.py
+++ b/java-utils/mvn_build.py
@@ -104,10 +104,10 @@ if __name__ == "__main__":
if gradle:
base_goal = "build"
- mvn_args = ["gradle-local", "--no-daemon"]
+ mvn_args = ["gradle-local", "--stacktrace", "--no-daemon"]
else:
base_goal = "verify"
- mvn_args = ["xmvn", "--batch-mode"]
+ mvn_args = ["xmvn", "--errors", "--batch-mode"]
if not options.bootstrap:
mvn_args.append("--offline")
8 years, 6 months
[javapackages] Initial %gradle_build implementation
by Mikolaj Izdebski
commit 523cd0aa42e7f40459c1dc82ac0eb52d185e214c
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Oct 27 16:37:20 2015 +0100
Initial %gradle_build implementation
java-utils/mvn_build.py | 35 +++++++++++++++++++++++++++--------
macros.d/macros.fjava | 12 ++++++++++++
2 files changed, 39 insertions(+), 8 deletions(-)
---
diff --git a/java-utils/mvn_build.py b/java-utils/mvn_build.py
index eb40aa0..dd5e004 100644
--- a/java-utils/mvn_build.py
+++ b/java-utils/mvn_build.py
@@ -81,6 +81,9 @@ if __name__ == "__main__":
action="callback",
callback=goal_callback,
help="Run Maven goals after default XMvn goals.")
+ parser.add_option("--gradle",
+ action="store_true",
+ help="Invoke Gradle instead of Maven.")
parser.add_option("-i", "--skip-install",
action="store_true",
help="Skip artifact installation.")
@@ -99,8 +102,12 @@ if __name__ == "__main__":
(options, args) = parser.parse_args()
xc = XMvnConfig()
- base_goal = "verify"
- mvn_args = ["xmvn", "--batch-mode"]
+ if gradle:
+ base_goal = "build"
+ mvn_args = ["gradle-local", "--no-daemon"]
+ else:
+ base_goal = "verify"
+ mvn_args = ["xmvn", "--batch-mode"]
if not options.bootstrap:
mvn_args.append("--offline")
@@ -109,7 +116,7 @@ if __name__ == "__main__":
mvn_args.append("-Dxmvn.compat=20-rpmbuild-raw")
if options.debug:
- mvn_args.append("-X")
+ mvn_args.append("--debug")
if options.xmvn_debug or options.debug:
mvn_args.append("-Dorg.slf4j.simpleLogger.log.org.fedoraproject.xmvn=debug")
@@ -117,7 +124,10 @@ if __name__ == "__main__":
if options.force:
mvn_args.append("-Dmaven.test.skip=true")
xc.add_custom_option("buildSettings/skipTests", "true")
- base_goal = "package"
+ if gradle:
+ base_goal = "assemble"
+ else:
+ base_goal = "package"
if mock_socket and os.path.exists(mock_socket):
interpreter = sys.executable
@@ -133,12 +143,21 @@ if __name__ == "__main__":
mvn_args.append(base_goal)
if not options.skip_install:
- mvn_args.append("org.fedoraproject.xmvn:xmvn-mojo:install")
+ if gradle:
+ mvn_args.append("xmvnInstall")
+ else:
+ mvn_args.append("org.fedoraproject.xmvn:xmvn-mojo:install")
if not options.skip_javadoc:
- mvn_args.append("org.apache.maven.plugins:maven-javadoc-plugin:aggregate")
-
- mvn_args.append("org.fedoraproject.xmvn:xmvn-mojo:builddep")
+ if 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:
+ # Build dependency generation for Gradle is not yet implemented in XMvn
+ mvn_args.append("org.fedoraproject.xmvn:xmvn-mojo:builddep")
if options.goal_after:
mvn_args.extend(options.goal_after)
diff --git a/macros.d/macros.fjava b/macros.d/macros.fjava
index bb419ae..75969b1 100644
--- a/macros.d/macros.fjava
+++ b/macros.d/macros.fjava
@@ -134,6 +134,18 @@
%mvn_build %{pyinterpreter} %{javadir}-utils/mvn_build.py %{?xmvn_bootstrap: -b} %{?_without_javadoc: -j $(> .mfiles-javadoc)}%{?_without_tests: -f}
+# %gradle_build - build Gradle project
+#
+# Usage: %mvn_build [options]
+#
+# This macro causes Gradle project to be built (usually compiled and
+# packaged). It is intended to be placed in %build section of spec file.
+#
+# For summary of accepted options execute `mvn-build --help` command.
+#
+%gradle_build %{pyinterpreter} %{javadir}-utils/mvn_build.py --gradle %{?xmvn_bootstrap: -b} %{?_without_javadoc: -j $(> .mfiles-javadoc)}%{?_without_tests: -f}
+
+
# %mvn_install - install Maven project
#
# Usage: %mvn_install
8 years, 6 months
[javapackages] Update init.gradle for XMvn 2.5.0
by Mikolaj Izdebski
commit 9a303bb58616eaef67109443fab7b7cbde59b7a8
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Oct 27 16:20:35 2015 +0100
Update init.gradle for XMvn 2.5.0
gradle/init.gradle | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/gradle/init.gradle b/gradle/init.gradle
index 17c9afe..c523717 100644
--- a/gradle/init.gradle
+++ b/gradle/init.gradle
@@ -1,11 +1,9 @@
-allprojects {
- buildscript {
- repositories {
- xmvn()
- }
- }
-
- repositories {
- xmvn()
+initscript {
+ dependencies {
+ classpath files('/usr/share/java/xmvn/xmvn-connector-gradle.jar')
+ classpath files('/usr/share/java/xmvn/xmvn-api.jar')
+ classpath files('/usr/share/java/xmvn/xmvn-launcher.jar')
}
}
+
+apply plugin: org.fedoraproject.xmvn.connector.gradle.XMvnGradlePlugin
8 years, 6 months
[Bug 1267939] New: apache-james-project: arbitrary command execution for servers configured with file based user repositories [fedora-all]
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=1267939
Bug ID: 1267939
Summary: apache-james-project: arbitrary command execution for
servers configured with file based user repositories
[fedora-all]
Product: Fedora
Version: 22
Component: apache-james-project
Keywords: Security, SecurityTracking
Severity: high
Priority: high
Assignee: mizdebsk(a)redhat.com
Reporter: mprpic(a)redhat.com
QA Contact: extras-qa(a)fedoraproject.org
CC: java-sig-commits(a)lists.fedoraproject.org,
mizdebsk(a)redhat.com, msimacek(a)redhat.com,
msrb(a)redhat.com
Blocks: 1267938
This is an automatically created tracking bug! It was created to ensure
that one or more security vulnerabilities are fixed in affected versions
of Fedora.
For comments that are specific to the vulnerability please use bugs filed
against the "Security Response" product referenced in the "Blocks" field.
For more information see:
http://fedoraproject.org/wiki/Security/TrackingBugs
When submitting as an update, use the fedpkg template provided in the next
comment(s). This will include the bug IDs of this tracking bug as well as
the relevant top-level CVE bugs.
Please also mention the CVE IDs being fixed in the RPM changelog and the
fedpkg commit message.
NOTE: this issue affects multiple supported versions of Fedora. While only
one tracking bug has been filed, please correct all affected versions at
the same time. If you need to fix the versions independent of each other,
you may clone this bug as appropriate.
[bug automatically created by: add-tracking-bugs]
Referenced Bugs:
https://bugzilla.redhat.com/show_bug.cgi?id=1267938
[Bug 1267938] apache-james-project: arbitrary command execution for servers
configured with file based user repositories
--
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=imbUd4rIXN&a=cc_unsubscribe
8 years, 7 months
Broken dependencies: ambari
by Fedora Koji Build System
ambari has broken dependencies in the rawhide tree:
On x86_64:
ambari-server-1.5.1-5.fc23.noarch requires mvn(org.apache.directory.shared:shared-ldap)
On i386:
ambari-server-1.5.1-5.fc23.noarch requires mvn(org.apache.directory.shared:shared-ldap)
On armhfp:
ambari-server-1.5.1-5.fc23.noarch requires mvn(org.apache.directory.shared:shared-ldap)
Please resolve this as soon as possible.
8 years, 7 months
[Bug 1157983] New: maven-shared-utils: Test failures
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=1157983
Bug ID: 1157983
Summary: maven-shared-utils: Test failures
Product: Fedora
Version: rawhide
Component: maven-shared-utils
Assignee: msrb(a)redhat.com
Reporter: mizdebsk(a)redhat.com
QA Contact: extras-qa(a)fedoraproject.org
CC: java-sig-commits(a)lists.fedoraproject.org,
mizdebsk(a)redhat.com, msrb(a)redhat.com,
tradej(a)redhat.com
Description of problem:
Update of maven-shared-utils to version 0.7 introduced 2 test failures, which
shourd be investigated.
Version-Release number of selected component (if applicable):
0.7-1
Failed tests:
FileUtilsTest.isASymbolicLink:1375 null
DirectoryScannerTest.followSymlinksFalse:132 expected:<9> but was:<11>
Tests run: 843, Failures: 2, Errors: 0, Skipped: 24
isASymbolicLink(org.apache.maven.shared.utils.io.FileUtilsTest) Time elapsed:
0.011 sec <<< FAILURE!
java.lang.AssertionError: null
at org.junit.Assert.fail(Assert.java:86)
at org.junit.Assert.assertTrue(Assert.java:41)
at org.junit.Assert.assertTrue(Assert.java:52)
at
org.apache.maven.shared.utils.io.FileUtilsTest.isASymbolicLink(FileUtilsTest.java:1375)
followSymlinksFalse(org.apache.maven.shared.utils.io.DirectoryScannerTest)
Time elapsed: 0.002 sec <<< FAILURE!
java.lang.AssertionError: expected:<9> but was:<11>
at org.junit.Assert.fail(Assert.java:88)
at org.junit.Assert.failNotEquals(Assert.java:743)
at org.junit.Assert.assertEquals(Assert.java:118)
at org.junit.Assert.assertEquals(Assert.java:555)
at org.junit.Assert.assertEquals(Assert.java:542)
at
org.apache.maven.shared.utils.io.DirectoryScannerTest.followSymlinksFalse(DirectoryScannerTest.java:132)
--
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=JOXEy6pH7e&a=cc_unsubscribe
8 years, 7 months