Skip to content
This repository was archived by the owner on Feb 15, 2022. It is now read-only.

Commit 0845725

Browse files
authored
Merge pull request #292 from kowshikn/v0.7.x
Modify release names and bump to 0.7.1.
2 parents e88c97f + 24a2b27 commit 0845725

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apply from: file("${rootDir}/build-resources.gradle")
22
allprojects {
33
group = 'com.amazon'
4-
version = '0.7.0-alpha'
4+
version = '0.7.1-alpha'
55
repositories {
66
mavenCentral()
77
maven { url "https://jitpack.io" }

release/archives/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ To build all archives, check out the corresponding branch for the version and fo
1919
4. Generated archives includes a script file which can be used to execute the data prepper using
2020

2121
```
22-
tar -xzf data-prepper-jdk-v<VERSION>-<PLATFORM>-<ARCHITECTURE>.tar.gz
23-
./data-prepper-jdk-v<VERSION>-<PLATFORM>-<ARCHITECTURE>/data-prepper-tar-install.sh <CONFIG FILE LOCATION>
22+
tar -xzf opendistroforelasticsearch-data-prepper-jdk-v<VERSION>-<PLATFORM>-<ARCHITECTURE>.tar.gz
23+
./opendistroforelasticsearch-data-prepper-jdk-v<VERSION>-<PLATFORM>-<ARCHITECTURE>/data-prepper-tar-install.sh <CONFIG FILE LOCATION>
2424
```
2525

2626
#### For platform specific archive
@@ -42,10 +42,10 @@ gradle linuxTar -Prelease
4242
4343
cd release/archives/linux/build/distributions/
4444
45-
tar -xzf data-prepper-jdk-v<VERSION>-linux-<ARCHITECTURE>.tar.gz
46-
//e.g tar -xzf data-prepper-jdk-v0.1.0-linux-x64.tar.gz
45+
tar -xzf opendistroforelasticsearch-data-prepper-jdk-<VERSION>-linux-<ARCHITECTURE>.tar.gz
46+
//e.g tar -xzf opendistroforelasticsearch-data-prepper-jdk-0.1.0-linux-x64.tar.gz
4747
48-
./data-prepper-jdk-v<VERSION>-linux-<ARCHITECTURE>/data-prepper-tar-install.sh <CONFIG FILE LOCATION>
48+
./opendistroforelasticsearch-data-prepper-jdk-<VERSION>-linux-<ARCHITECTURE>/data-prepper-tar-install.sh <CONFIG FILE LOCATION>
4949
5050
```
5151

release/archives/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ subprojects {
3838
// incl. linuxarm64DistZip, linuxarm64WithJDKDistZip
3939
distributions {
4040
"${distName}" {
41-
distributionBaseName = "${project.rootProject.name}-v${project.rootProject.version}-${platform}-${architecture}"
41+
distributionBaseName = "${project.rootProject.name}-${project.rootProject.version}-${platform}-${architecture}"
4242
contents {
4343
with archiveToTar()
4444
into('') {
@@ -48,7 +48,7 @@ subprojects {
4848
}
4949
}
5050
"${distNameWithJDK}" {
51-
distributionBaseName = "${project.rootProject.name}-jdk-v${project.rootProject.version}-${platform}-${architecture}"
51+
distributionBaseName = "${project.rootProject.name}-jdk-${project.rootProject.version}-${platform}-${architecture}"
5252
contents {
5353
with archiveToTar()
5454
into('openjdk') {

release/docker/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ plugins {
33
}
44

55
docker {
6-
name "data-prepper/${project.rootProject.name}:${project.version}"
6+
name "${project.rootProject.name}:${project.version}"
77
tag "${project.rootProject.name}", "${project.version}"
88
files project(':data-prepper-core').jar.archivePath
99
buildArgs(['JAR_FILE' : project(':data-prepper-core').jar.archiveName,
1010
'CONFIG_FILEPATH': '/usr/share/data-prepper/data-prepper.yml'])
11-
dockerfile file('data-prepper-v0.1.0-all.Dockerfile')
11+
dockerfile file('opendistroforelasticsearch-data-prepper-0.7.1-alpha.Dockerfile')
1212
}
1313

1414
dockerPrepare.dependsOn ':release:releasePrerequisites'

release/docker/data-prepper-v0.1.0-all.Dockerfile renamed to release/docker/opendistroforelasticsearch-data-prepper-0.7.1-alpha.Dockerfile

File renamed without changes.

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
rootProject.name = 'data-prepper'
1+
rootProject.name = 'opendistroforelasticsearch-data-prepper'
22

33
if(startParameter.getProjectProperties().containsKey("release")){
44
include 'release'

0 commit comments

Comments
 (0)