Skip to content

Commit 1ad5467

Browse files
committed

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

build.gradle

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,20 @@ buildscript {
88
dependencies {
99
classpath "org.elasticsearch.gradle:build-tools:${elasticsearchVersion}"
1010
}
11+
1112
}
1213

1314
group = 'info.johtani.elasticsearch.plugin.ingest'
1415
version = "${elasticsearchVersion}.0"
1516

17+
18+
19+
configurations.all {
20+
resolutionStrategy.dependencySubstitution {
21+
substitute project(':rest-api-spec') with module ("org.elasticsearch:rest-api-spec:${elasticsearchVersion}")
22+
}
23+
}
24+
1625
apply plugin: 'java'
1726
apply plugin: 'idea'
1827
apply plugin: 'elasticsearch.esplugin'
@@ -23,14 +32,10 @@ esplugin {
2332
name 'ingest-csv'
2433
description 'Ingest CSV processor parses CSV data and stores it as individual fields'
2534
classname 'info.johtani.elasticsearch.plugin.ingest.csv.IngestCsvPlugin'
35+
licenseFile rootProject.file('LICENSE.txt')
36+
noticeFile = rootProject.file('NOTICE.txt')
2637
}
2738

28-
project.licenseFile= file('LICENSE.txt')
29-
project.noticeFile= file('NOTICE.txt')
30-
31-
subprojects {
32-
ext.projectSubstitutions += ["info.johtani.elasticsearch.plugin.ingest:ingest-csv:${elasticsearchVersion}": ':ingest-csv:plugin']
33-
}
3439

3540
// In this section you declare the dependencies for your production and test code
3641
// Note, the two dependencies are not really needed as the buildscript dependency gets them in already
@@ -49,3 +54,5 @@ thirdPartyAudit.enabled = false
4954
if (gradle.startParameter.taskNames.contains('uploadArchives')) {
5055
apply from: 'uploadArchives.gradle'
5156
}
57+
58+

settings.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
include ':rest-api-spec'
12
rootProject.name = 'ingest-csv'

0 commit comments

Comments
 (0)