Skip to content
This repository has been archived by the owner on Mar 3, 2023. It is now read-only.

Joshfischer/3774/pom dependencies #3778

Merged
merged 12 commits into from
May 2, 2022
Merged

Joshfischer/3774/pom dependencies #3778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2984ab0
adding pom deps
joshfischer1108 Feb 26, 2022
fc24a50
adding missed dependency block
joshfischer1108 Feb 26, 2022
5b6b2e8
clean up
joshfischer1108 Feb 26, 2022
677f8d2
Revert "clean up"
joshfischer1108 Feb 26, 2022
556ce51
Revert "adding missed dependency block"
joshfischer1108 Feb 26, 2022
c86109e
Revert "adding pom deps"
joshfischer1108 Feb 26, 2022
ea7c1e9
first pass. Still needs refinement
joshfischer1108 Feb 28, 2022
66133ca
adding deps for kafka clients. first pass for review.
joshfischer1108 Apr 5, 2022
1ac8697
add heron-api to heron-storm dep list
joshfischer1108 Apr 5, 2022
9a95a68
adding heron-api dep where needed.
joshfischer1108 Apr 5, 2022
23d69c3
Merge branch 'master' into joshfischer/3774/pom-dependencies
nicknezis Apr 16, 2022
49f862d
Referenced the unshaded jar
nicknezis Apr 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions release/maven/heron-kafka.template.pom
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<artifactId>kafka-clients</artifactId>
<version>2.2.0</version>
</dependency>
DEPS
</dependencies>

<mailingLists>
Expand Down
4 changes: 4 additions & 0 deletions release/maven/heron-no-kryo.template.pom
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
</license>
</licenses>

<dependencies>
DEPS
</dependencies>

<mailingLists>
<mailingList>
<name>Heron user mailing list</name>
Expand Down
1 change: 1 addition & 0 deletions release/maven/heron-with-kryo.template.pom
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<version>5.2.0</version>
<scope>compile</scope>
</dependency>
DEPS
</dependencies>

<mailingLists>
Expand Down
111 changes: 105 additions & 6 deletions release/maven/maven-pom-version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,40 +27,139 @@ cat ./maven/heron-no-kryo.template.pom | \
sed "s/VERSION/$1/g" | \
sed "s/ARTIFACT_ID/heron-api/g" | \
sed "s/NAME/heron-api/g" | \
sed "s/DESCRIPTION/Heron API/g" \
sed "s/DESCRIPTION/Heron API/g" | \
awk '{gsub("DEPS", "<dependency>\
<groupId>org.apache.commons</groupId>\
<artifactId>commons-lang3</artifactId>\
<version>3.12.0</version>\
</dependency>\
<dependency>\
<groupId>org.glassfish.jersey.media</groupId>\
<artifactId>jersey-media-jaxb</artifactId>\
<version>2.25.1</version>\
</dependency>", $0); print}' | \
xmllint --format - \
>> ./heron-api-$1.pom

cat ./maven/heron-no-kryo.template.pom | \
sed "s/VERSION/$1/g" | \
sed "s/ARTIFACT_ID/heron-spi/g" | \
sed "s/NAME/heron-spi/g" | \
sed "s/DESCRIPTION/Heron SPI/g" \
sed "s/DESCRIPTION/Heron SPI/g" | \
awk '{gsub("DEPS", "<dependency>\
<groupId>org.apache.heron</groupId>\
<artifactId>heron-api</artifactId>\
<version>HERON_API_VERSION</version>\
</dependency>\
<dependency>\
<groupId>com.google.protobuf</groupId>\
<artifactId>protobuf-java</artifactId>\
<version>3.19.1</version>\
</dependency>\
<dependency>\
<groupId>com.google.guava</groupId>\
<artifactId>guava</artifactId>\
<version>23.6-jre</version>\
</dependency>\
<dependency>\
<groupId>org.yaml</groupId>\
<artifactId>snakeyaml</artifactId>\
<version>1.29</version>\
</dependency>", $0); print}' | \
sed "s/HERON_API_VERSION/$1/g" | \
xmllint --format - \
>> ./heron-spi-$1.pom

cat ./maven/heron-with-kryo.template.pom | \
sed "s/VERSION/$1/g" | \
sed "s/ARTIFACT_ID/heron-storm/g" | \
sed "s/NAME/heron-storm/g" | \
sed "s/DESCRIPTION/Heron Storm/g" \
sed "s/DESCRIPTION/Heron Storm/g" | \
awk '{gsub("DEPS", "<dependency>\
<groupId>org.apache.heron</groupId>\
<artifactId>heron-api</artifactId>\
<version>HERON_API_VERSION</version>\
</dependency>\
<dependency>\
<groupId>org.apache.commons</groupId>\
<artifactId>commons-lang3</artifactId>\
<version>3.12.0</version>\
</dependency>\
<dependency>\
<groupId>org.yaml</groupId>\
<artifactId>snakeyaml</artifactId>\
<version>1.29</version>\
</dependency>\
<dependency>\
<groupId>com.googlecode.json-simple</groupId>\
<artifactId>json-simple</artifactId>\
<version>1.1</version>\
</dependency>", $0); print}' | \
sed "s/HERON_API_VERSION/$1/g" | \
xmllint --format - \
>> ./heron-storm-$1.pom

cat ./maven/heron-with-kryo.template.pom | \
sed "s/VERSION/$1/g" | \
sed "s/ARTIFACT_ID/heron-simulator/g" | \
sed "s/NAME/heron-simulator/g" | \
sed "s/DESCRIPTION/Heron Simulator/g" \
sed "s/DESCRIPTION/Heron Simulator/g" | \
awk '{gsub("DEPS", "<dependency>\
<groupId>org.apache.heron</groupId>\
<artifactId>heron-api</artifactId>\
<version>HERON_API_VERSION</version>\
</dependency>\
<dependency>\
<groupId>org.apache.commons</groupId>\
<artifactId>commons-lang3</artifactId>\
<version>3.12.0</version>\
</dependency>\
<dependency>\
<groupId>org.yaml</groupId>\
<artifactId>snakeyaml</artifactId>\
<version>1.29</version>\
</dependency>\
<dependency>\
<groupId>org.glassfish.jersey.media</groupId>\
<artifactId>jersey-media-jaxb</artifactId>\
<version>2.25.1</version>\
</dependency>", $0); print}' | \
sed "s/HERON_API_VERSION/$1/g" | \
xmllint --format - \
>> ./heron-simulator-$1.pom

cat ./maven/heron-kafka.template.pom | \
sed "s/VERSION/$1/g" | \
sed "s/ARTIFACT_ID/heron-kafka-spout/g" | \
sed "s/NAME/heron-kafka-spout/g" | \
sed "s/DESCRIPTION/Heron Kafka Spout/g" \
sed "s/DESCRIPTION/Heron Kafka Spout/g" | \
awk '{gsub("DEPS", "<dependency>\
<groupId>org.slf4j</groupId>\
<artifactId>slf4j-jdk14</artifactId>\
<version>1.7.30</version>\
</dependency>\
<dependency>\
<groupId>org.slf4j</groupId>\
<artifactId>slf4j-api</artifactId>\
<version>1.7.30</version>\
</dependency>", $0); print}' | \
xmllint --format - \
>> ./heron-kafka-spout-$1.pom

cat ./maven/heron-kafka.template.pom | \
sed "s/VERSION/$1/g" | \
sed "s/ARTIFACT_ID/heron-kafka-bolt/g" | \
sed "s/NAME/heron-kafka-bolt/g" | \
sed "s/DESCRIPTION/Heron Kafka Bolt/g" \
sed "s/DESCRIPTION/Heron Kafka Bolt/g" | \
awk '{gsub("DEPS", "<dependency>\
<groupId>org.slf4j</groupId>\
<artifactId>slf4j-jdk14</artifactId>\
<version>1.7.30</version>\
</dependency>\
<dependency>\
<groupId>org.slf4j</groupId>\
<artifactId>slf4j-api</artifactId>\
<version>1.7.30</version>\
</dependency>", $0); print}' | \
xmllint --format - \
>> ./heron-kafka-bolt-$1.pom
2 changes: 1 addition & 1 deletion scripts/ci/build_maven_artifacts.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ mkdir -p $OUTPUT_DIR/$VERSION_TAG/heron-kafka-bolt

echo "Copy heron-api artifacts ... "
cp -p -f ./release/heron-api-$VERSION_TAG.pom $OUTPUT_DIR/$VERSION_TAG/heron-api/
cp -p -f ./bazel-bin/heron/api/src/java/api-shaded.jar $OUTPUT_DIR/$VERSION_TAG/heron-api/heron-api-$VERSION_TAG.jar
cp -p -f ./bazel-bin/heron/api/src/java/api-java-low-level-functional.jar $OUTPUT_DIR/$VERSION_TAG/heron-api/heron-api-$VERSION_TAG.jar
cp -p -f ./bazel-bin/heron/api/src/java/heron-api-javadoc.zip $OUTPUT_DIR/$VERSION_TAG/heron-api/heron-api-$VERSION_TAG-javadoc.jar
cp -p -f ./bazel-bin/heron/api/src/java/libapi-java-low-level-functional-src.jar $OUTPUT_DIR/$VERSION_TAG/heron-api/heron-api-$VERSION_TAG-sources.jar

Expand Down