Skip to content

Commit c5190dc

Browse files
authored
Some refactoring to how we determine the Data Prepper version to allow other builds to modify the Data Prepper version. Log the current Data Prepper version on start up. (opensearch-project#6196)
Signed-off-by: David Venable <dlv@amazon.com>
1 parent 13def65 commit c5190dc

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

data-prepper-core/build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ plugins {
77
id 'data-prepper.publish'
88
}
99

10+
def dataPrepperVersion = version
1011
def generatedSourcesDir = "${project.buildDir}/generated/sources/version/java"
1112

1213
sourceSets {
@@ -87,7 +88,7 @@ configurations {
8788
}
8889

8990
task generateVersionProvider {
90-
inputs.property('version', version)
91+
inputs.property('version', dataPrepperVersion)
9192
inputs.file('src/main/java/org/opensearch/dataprepper/core/CoreVersionProvider.java.template')
9293
outputs.dir(generatedSourcesDir)
9394

@@ -97,7 +98,7 @@ task generateVersionProvider {
9798

9899
def templateFile = file('src/main/java/org/opensearch/dataprepper/core/CoreVersionProvider.java.template')
99100
def versionProviderFile = file("$outputDir/CoreVersionProvider.java")
100-
versionProviderFile.text = templateFile.text.replace('${version}', version)
101+
versionProviderFile.text = templateFile.text.replace('${version}', dataPrepperVersion)
101102
}
102103
}
103104

data-prepper-main/src/main/java/org/opensearch/dataprepper/DataPrepperExecute.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package org.opensearch.dataprepper;
77

88
import org.opensearch.dataprepper.core.DataPrepper;
9+
import org.opensearch.dataprepper.model.configuration.DataPrepperVersion;
910
import org.slf4j.Logger;
1011
import org.slf4j.LoggerFactory;
1112
import org.springframework.context.annotation.ComponentScan;
@@ -20,6 +21,7 @@ public class DataPrepperExecute {
2021
private static final Logger LOG = LoggerFactory.getLogger(DataPrepperExecute.class);
2122

2223
public static void main(final String ... args) {
24+
LOG.info("Data Prepper {}", DataPrepperVersion.getCurrentVersion());
2325
java.security.Security.setProperty("networkaddress.cache.ttl", "60");
2426
System.setProperty("software.amazon.awssdk.http.service.impl", "software.amazon.awssdk.http.apache.ApacheSdkHttpService");
2527

0 commit comments

Comments
 (0)