mirror of
https://github.com/corda/corda.git
synced 2024-12-19 21:17:58 +00:00
Temp remove usage of java modularity plugin.
This commit is contained in:
josecoll
parent
bce94164a8
commit
a56ef580b2
52
build.gradle
52
build.gradle
@ -125,16 +125,19 @@ buildscript {
|
||||
classpath "net.i2p.crypto:eddsa:$eddsa_version" // Needed for ServiceIdentityGenerator in the build environment.
|
||||
classpath "org.owasp:dependency-check-gradle:${dependency_checker_version}"
|
||||
classpath "org.jfrog.buildinfo:build-info-extractor-gradle:$artifactory_plugin_version"
|
||||
classpath "org.javamodularity:moduleplugin:$gradle_modules_plugin_version"
|
||||
// Capsule gradle plugin forked and maintained locally to support Gradle 5.x
|
||||
// See https://github.com/corda/gradle-capsule-plugin
|
||||
classpath "us.kirchmeier:gradle-capsule-plugin:1.0.4_r3"
|
||||
// classpath "org.javamodularity:moduleplugin:$gradle_modules_plugin_version"
|
||||
}
|
||||
}
|
||||
|
||||
plugins {
|
||||
// Add the shadow plugin to the plugins classpath for the entire project.
|
||||
id 'com.github.johnrengelman.shadow' version '2.0.4' apply false
|
||||
id "com.gradle.build-scan" version "1.16"
|
||||
|
||||
// id 'org.javamodularity.moduleplugin' version '1.5.0' apply true
|
||||
id "com.gradle.build-scan" version "2.2.1"
|
||||
}
|
||||
|
||||
@ -153,7 +156,7 @@ apply plugin: 'com.jfrog.artifactory'
|
||||
// with the run configurations. It also doesn't realise that the project is a Java 8 project and misconfigures
|
||||
// the resulting import. This fixes it.
|
||||
apply plugin: 'java'
|
||||
apply plugin: 'org.javamodularity.moduleplugin'
|
||||
//apply plugin: 'org.javamodularity.moduleplugin'
|
||||
|
||||
sourceCompatibility = VERSION_1_8
|
||||
targetCompatibility = VERSION_1_8
|
||||
@ -161,12 +164,47 @@ println "Java version: " + JavaVersion.current()
|
||||
println "Java source compatibility: " + sourceCompatibility
|
||||
println "Java target compatibility: " + targetCompatibility
|
||||
|
||||
|
||||
// allprojects not allowed ???
|
||||
// Could not find method kotlinCompile() for arguments [build_1cxylkaspro03mtms9c9xoxft$_run_closure2$_closure16@2dd8b9f2] on root project 'corda-project' of type org.gradle.api.Project.
|
||||
//subprojects {
|
||||
// // inlined usage of compileJava with moduleOptions not allowed ???
|
||||
// // Could not find method moduleOptions() for arguments [build_1cxylkaspro03mtms9c9xoxft$_run_closure2$_closure16$_closure18@afb78c] on task ':client:compileJava' of type org.gradle.api.tasks.compile.JavaCompile.
|
||||
// apply plugin: 'java'
|
||||
// apply plugin: 'kotlin'
|
||||
// apply plugin: "org.javamodularity.moduleplugin"
|
||||
// kotlinCompile {
|
||||
// moduleOptions {
|
||||
// addExports = [
|
||||
// 'java.base/sun.security.util': 'ALL-UNNAMED',
|
||||
// 'java.base/sun.security.x509': 'ALL-UNNAMED'
|
||||
// ]
|
||||
// }
|
||||
// }
|
||||
// compileJava {
|
||||
// moduleOptions {
|
||||
// addExports = [
|
||||
// 'java.base/sun.security.util': 'ALL-UNNAMED',
|
||||
// 'java.base/sun.security.x509': 'ALL-UNNAMED'
|
||||
// ]
|
||||
// }
|
||||
// }
|
||||
// test {
|
||||
// moduleOptions {
|
||||
// addExports = [
|
||||
// 'java.base/sun.security.util': 'ALL-UNNAMED',
|
||||
// 'java.base/sun.security.x509': 'ALL-UNNAMED'
|
||||
// ]
|
||||
// }
|
||||
// }
|
||||
//}
|
||||
|
||||
allprojects {
|
||||
apply plugin: 'kotlin'
|
||||
apply plugin: 'jacoco'
|
||||
apply plugin: 'org.owasp.dependencycheck'
|
||||
apply plugin: 'kotlin-allopen'
|
||||
apply plugin: 'org.javamodularity.moduleplugin'
|
||||
// apply plugin: 'org.javamodularity.moduleplugin'
|
||||
|
||||
allOpen {
|
||||
annotations(
|
||||
@ -196,6 +234,13 @@ allprojects {
|
||||
tasks.withType(JavaCompile) {
|
||||
options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" << "-Xlint:-options" << "-parameters"
|
||||
options.encoding = 'UTF-8'
|
||||
options.verbose = true
|
||||
// moduleOptions {
|
||||
// addExports = [
|
||||
// 'java.base/sun.security.util': 'ALL-UNNAMED',
|
||||
// 'java.base/sun.security.x509': 'ALL-UNNAMED'
|
||||
// ]
|
||||
// }
|
||||
}
|
||||
|
||||
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
|
||||
@ -260,6 +305,7 @@ allprojects {
|
||||
maven { url "$artifactory_contextUrl/corda-dependencies" }
|
||||
maven { url 'https://jitpack.io' }
|
||||
maven { url 'https://repo.gradle.org/gradle/libs-releases' }
|
||||
maven { url "https://plugins.gradle.org/m2/" }
|
||||
}
|
||||
|
||||
configurations {
|
||||
|
||||
@ -1,3 +1,6 @@
|
||||
//plugins {
|
||||
// id 'org.javamodularity.moduleplugin'
|
||||
//}
|
||||
apply plugin: 'kotlin'
|
||||
apply plugin: 'kotlin-jpa'
|
||||
apply plugin: 'net.corda.plugins.quasar-utils'
|
||||
@ -9,6 +12,56 @@ description 'Corda core'
|
||||
|
||||
evaluationDependsOn(':node:capsule')
|
||||
|
||||
//subprojects {
|
||||
// apply plugin: 'java'
|
||||
// apply plugin: "org.javamodularity.moduleplugin"
|
||||
// kotlinCompile {
|
||||
// moduleOptions {
|
||||
// addExports = [
|
||||
// 'java.base/sun.security.util': 'ALL-UNNAMED',
|
||||
// 'java.base/sun.security.x509': 'ALL-UNNAMED'
|
||||
// ]
|
||||
// }
|
||||
// }
|
||||
// compileJava {
|
||||
// moduleOptions {
|
||||
//// addModules = []
|
||||
//// addReads = [:]
|
||||
//// addOpens = [:]
|
||||
// addExports = [
|
||||
// 'java.base/sun.security.util': 'ALL-UNNAMED',
|
||||
// 'java.base/sun.security.x509': 'ALL-UNNAMED'
|
||||
//// 'java.base/sun.security.util.BitArray': 'ALL-UNNAMED',
|
||||
//// 'java.base/sun.security.util.ObjectIdentifier': 'ALL-UNNAMED',
|
||||
//// 'java.base/sun.security.x509.AlgorithmId': 'ALL-UNNAMED',
|
||||
//// 'java.base/sun.security.x509.X509Key': 'ALL-UNNAMED'
|
||||
// ]
|
||||
//// addExports = [:]
|
||||
// }
|
||||
// }
|
||||
// test {
|
||||
// moduleOptions {
|
||||
// addExports = [
|
||||
// 'java.base/sun.security.util': 'ALL-UNNAMED',
|
||||
// 'java.base/sun.security.x509': 'ALL-UNNAMED'
|
||||
// ]
|
||||
// }
|
||||
// }
|
||||
//}
|
||||
|
||||
//allprojects {
|
||||
// apply plugin: 'java'
|
||||
// apply plugin: "org.javamodularity.moduleplugin"
|
||||
// compileJava {
|
||||
// moduleOptions {
|
||||
// addExports = [
|
||||
// 'java.base/sun.security.util': 'ALL-UNNAMED',
|
||||
// 'java.base/sun.security.x509': 'ALL-UNNAMED'
|
||||
// ]
|
||||
// }
|
||||
// }
|
||||
//}
|
||||
|
||||
configurations {
|
||||
integrationTestCompile.extendsFrom testCompile
|
||||
integrationTestRuntimeOnly.extendsFrom testRuntimeOnly
|
||||
@ -130,6 +183,15 @@ dependencies {
|
||||
compile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.0'
|
||||
}
|
||||
|
||||
//compileJava {
|
||||
// moduleOptions {
|
||||
// addExports = [
|
||||
// 'java.base/sun.security.util': 'ALL-UNNAMED',
|
||||
// 'java.base/sun.security.x509': 'ALL-UNNAMED'
|
||||
// ]
|
||||
// }
|
||||
//}
|
||||
|
||||
// TODO Consider moving it to quasar-utils in the future (introduced with PR-1388)
|
||||
task copyQuasarJar(type: Copy) {
|
||||
from configurations.quasar
|
||||
|
||||
@ -1,9 +1,15 @@
|
||||
apply plugin: 'kotlin'
|
||||
apply plugin: 'net.corda.plugins.publish-utils'
|
||||
apply plugin: 'com.jfrog.artifactory'
|
||||
//apply plugin: "org.javamodularity.moduleplugin"
|
||||
|
||||
description 'Corda serialization'
|
||||
|
||||
repositories {
|
||||
mavenLocal()
|
||||
maven { url "https://plugins.gradle.org/m2/" }
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile project(":core")
|
||||
|
||||
@ -40,6 +46,25 @@ dependencies {
|
||||
testCompile project(':node-driver')
|
||||
}
|
||||
|
||||
// allprojects not allowed ???
|
||||
//subprojects {
|
||||
// // inlined usage of compileJava with moduleOptions not allowed ???
|
||||
// compileJava {
|
||||
// moduleOptions {
|
||||
// addExports = [
|
||||
// 'java.base/sun.security.util' : 'ALL-UNNAMED'
|
||||
// ]
|
||||
// }
|
||||
// }
|
||||
// kotlinCompile {
|
||||
// moduleOptions {
|
||||
// addExports = [
|
||||
// 'java.base/sun.security.util': 'ALL-UNNAMED'
|
||||
// ]
|
||||
// }
|
||||
// }
|
||||
//}
|
||||
|
||||
configurations {
|
||||
testArtifacts.extendsFrom testRuntimeClasspath
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user