You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polygene.apache.org by pa...@apache.org on 2016/09/12 02:13:26 UTC
[1/2] zest-java git commit: ZEST-175 Temporarily disable Jacoco when
running with Java 9
Repository: zest-java
Updated Branches:
refs/heads/develop e6133864e -> ce9938d45
ZEST-175 Temporarily disable Jacoco when running with Java 9
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/575e0293
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/575e0293
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/575e0293
Branch: refs/heads/develop
Commit: 575e029362b2e0714e9ac2ce779bcc03f10b19d1
Parents: e613386
Author: Paul Merlin <pa...@apache.org>
Authored: Sun Sep 11 19:08:02 2016 -0700
Committer: Paul Merlin <pa...@apache.org>
Committed: Sun Sep 11 19:08:02 2016 -0700
----------------------------------------------------------------------
build.gradle | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-java/blob/575e0293/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 56c4c4f..4493880 100644
--- a/build.gradle
+++ b/build.gradle
@@ -294,7 +294,9 @@ allprojects {
if( ext.javaDir.isDirectory() || ext.scalaDir.isDirectory() || ext.groovyDir.isDirectory() ||
ext.testJavaDir.isDirectory() || ext.testScalaDir.isDirectory() || ext.testGroovyDir.isDirectory() )
{
- apply plugin: 'jacoco'
+ if( JavaVersion.current() < JavaVersion.VERSION_1_9 ) {
+ apply plugin: 'jacoco'
+ }
apply plugin: 'osgi'
apply plugin: VersionClass
apply plugin: AsciidocBuildInfo
@@ -378,8 +380,10 @@ allprojects {
}
}
}
- jacoco {
- toolVersion = '0.7.5.201505241946'
+ if(JavaVersion.current() < JavaVersion.VERSION_1_9 ) {
+ jacoco {
+ toolVersion = '0.7.5.201505241946'
+ }
}
// // Create checkstyle report
@@ -480,6 +484,7 @@ dependencies {
}
// Generate a global code codeverage report
task coverageReport {
+ enabled = JavaVersion.current() < JavaVersion.VERSION_1_9
dependsOn subprojects*.test
def outputPath = "build/reports/coverage"
inputs.dir subprojects.collect { p -> "${p.buildDir.path}/jacoco" }
[2/2] zest-java git commit: ZEST-175 Remove -XX:MaxPermSize from the
Scala compiler options
Posted by pa...@apache.org.
ZEST-175 Remove -XX:MaxPermSize from the Scala compiler options
This is useless with Java >= 8 and break Java 9
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/ce9938d4
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/ce9938d4
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/ce9938d4
Branch: refs/heads/develop
Commit: ce9938d45389160cad6a013ea673e14be9147d13
Parents: 575e029
Author: Paul Merlin <pa...@apache.org>
Authored: Sun Sep 11 19:13:09 2016 -0700
Committer: Paul Merlin <pa...@apache.org>
Committed: Sun Sep 11 19:13:09 2016 -0700
----------------------------------------------------------------------
libraries/lang-scala/build.gradle | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-java/blob/ce9938d4/libraries/lang-scala/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/lang-scala/build.gradle b/libraries/lang-scala/build.gradle
index 63c6781..4400422 100644
--- a/libraries/lang-scala/build.gradle
+++ b/libraries/lang-scala/build.gradle
@@ -27,7 +27,6 @@ apply plugin: 'scala'
tasks.withType(ScalaCompile) {
configure( scalaCompileOptions.forkOptions ) {
memoryMaximumSize = '1g'
- jvmArgs = [ '-XX:MaxPermSize=512m' ]
}
}