From fedea4081d3646ec0f143ba163e70c8cbe98de97 Mon Sep 17 00:00:00 2001 From: Fabian Steeg Date: Mon, 22 Jun 2020 11:38:29 +0200 Subject: [PATCH] [oersi] Depend on metafacture-core oersi branch via mavenLocal Using source dependency here causes issues in the downstream oersi-etl, which depends on metafacture-fix. There is probably a way to solve that, but the whole oersi branch setup is temporary, and for development it's actually useful to install and depend via the local maven repository (to test changes in core or fix). --- .travis.yml | 1 + build.gradle | 3 ++- install_core_snapshot.sh | 5 +++++ org.metafacture.fix.web/build.gradle | 12 ++++++------ org.metafacture.fix/build.gradle | 6 +++--- settings.gradle | 11 ----------- 6 files changed, 17 insertions(+), 21 deletions(-) create mode 100644 install_core_snapshot.sh diff --git a/.travis.yml b/.travis.yml index 34595e4f..3e72076e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ language: java +before_install: sh install_core_snapshot.sh before_script: - ./gradlew installServer - cd org.metafacture.fix.vsc/ diff --git a/build.gradle b/build.gradle index 080c324f..01db0c04 100644 --- a/build.gradle +++ b/build.gradle @@ -29,7 +29,7 @@ subprojects { 'jquery': '3.3.1-1', 'junit_jupiter': '5.4.2', 'junit_platform': '1.4.2', - 'metafacture': 'master', + 'metafacture': 'feature-oersi-SNAPSHOT', 'mockito': '2.27.0', 'requirejs': '2.3.6', 'slf4j': '1.7.21', @@ -49,6 +49,7 @@ subprojects { repositories { jcenter() + mavenLocal() } dependencies { diff --git a/install_core_snapshot.sh b/install_core_snapshot.sh new file mode 100644 index 00000000..2553a757 --- /dev/null +++ b/install_core_snapshot.sh @@ -0,0 +1,5 @@ +cd .. +git clone https://github.com/metafacture/metafacture-core.git -b oersi +cd metafacture-core +./gradlew install +cd ../metafacture-fix diff --git a/org.metafacture.fix.web/build.gradle b/org.metafacture.fix.web/build.gradle index 3aeb89a3..1ee4fcc6 100644 --- a/org.metafacture.fix.web/build.gradle +++ b/org.metafacture.fix.web/build.gradle @@ -16,12 +16,12 @@ dependencies { providedCompile "org.eclipse.jetty:jetty-annotations:${versions.jetty}" providedCompile "org.slf4j:slf4j-simple:${versions.slf4j}" - implementation('org.metafacture:metafacture-commons') { version { branch = versions.metafacture } } - implementation('org.metafacture:metafacture-formeta') { version { branch = versions.metafacture } } - implementation('org.metafacture:metafacture-mangling') { version { branch = versions.metafacture } } - implementation('org.metafacture:metafacture-runner') { version { branch = versions.metafacture } } - implementation('org.metafacture:metafacture-xml') { version { branch = versions.metafacture } } - implementation('org.metafacture:metamorph') { version { branch = versions.metafacture } } + implementation "org.metafacture:metafacture-commons:${versions.metafacture}" + implementation "org.metafacture:metafacture-formeta:${versions.metafacture}" + implementation "org.metafacture:metafacture-mangling:${versions.metafacture}" + implementation "org.metafacture:metafacture-runner:${versions.metafacture}" + implementation "org.metafacture:metafacture-xml:${versions.metafacture}" + implementation "org.metafacture:metamorph:${versions.metafacture}" } task jettyRun(type: JavaExec) { diff --git a/org.metafacture.fix/build.gradle b/org.metafacture.fix/build.gradle index 1108f065..4f879687 100644 --- a/org.metafacture.fix/build.gradle +++ b/org.metafacture.fix/build.gradle @@ -14,9 +14,9 @@ dependencies { testRuntime "org.junit.jupiter:junit-jupiter-engine:${versions.junit_jupiter}" - implementation('org.metafacture:metafacture-commons') { version { branch = versions.metafacture } } - implementation('org.metafacture:metafacture-mangling') { version { branch = versions.metafacture } } - implementation('org.metafacture:metamorph') { version { branch = versions.metafacture } } + implementation "org.metafacture:metafacture-commons:${versions.metafacture}" + implementation "org.metafacture:metafacture-mangling:${versions.metafacture}" + implementation "org.metafacture:metamorph:${versions.metafacture}" testImplementation "org.mockito:mockito-core:${versions.mockito}" testImplementation "org.mockito:mockito-junit-jupiter:${versions.mockito}" diff --git a/settings.gradle b/settings.gradle index cf7b5829..417c3a24 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,14 +1,3 @@ -sourceControl { - gitRepository('https://github.com/metafacture/metafacture-core.git') { - producesModule('org.metafacture:metafacture-commons') - producesModule('org.metafacture:metafacture-formeta') - producesModule('org.metafacture:metafacture-mangling') - producesModule('org.metafacture:metafacture-runner') - producesModule('org.metafacture:metafacture-xml') - producesModule('org.metafacture:metamorph') - } -} - include 'org.metafacture.fix' include 'org.metafacture.fix.ide' include 'org.metafacture.fix.web'