Skip to content
This repository has been archived by the owner on Jan 27, 2025. It is now read-only.

Commit

Permalink
[oersi] Depend on metafacture-core oersi branch via mavenLocal
Browse files Browse the repository at this point in the history
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).
  • Loading branch information
fsteeg committed Dec 8, 2020
1 parent 5cbb6a4 commit fedea40
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 21 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
language: java

before_install: sh install_core_snapshot.sh
before_script:
- ./gradlew installServer
- cd org.metafacture.fix.vsc/
Expand Down
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -49,6 +49,7 @@ subprojects {

repositories {
jcenter()
mavenLocal()
}

dependencies {
Expand Down
5 changes: 5 additions & 0 deletions install_core_snapshot.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
cd ..
git clone https://github.com/metafacture/metafacture-core.git -b oersi
cd metafacture-core
./gradlew install
cd ../metafacture-fix
12 changes: 6 additions & 6 deletions org.metafacture.fix.web/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions org.metafacture.fix/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
11 changes: 0 additions & 11 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -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'

0 comments on commit fedea40

Please sign in to comment.