Skip to content

Commit 9c12120

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents 89bfc14 + 859f1b6 commit 9c12120

File tree

185 files changed

+9463
-1845
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

185 files changed

+9463
-1845
lines changed

RELEASE.md

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ And before you proceed, do the following steps:
2828
version=$VERSION
2929
* change the samza_executable variable in samza-test/src/main/python/configs/tests.json to $VERSION w/o the suffix '-SNAPSHOT'.
3030
* change the samza-test versions in samza-test/src/main/config/join/README to $VERSION w/o the suffix '-SNAPSHOT'.
31+
* change the executable version in samza-test/src/main/python/stream_processor.py to $VERSION w/o the suffix '-SNAPSHOT'.
3132
* push the changes to the $VERSION branch
3233

3334
Validate Samza using all our supported build matrix.
@@ -49,17 +50,34 @@ Alternatively, you can make a fresh clone of the repository to a separate direct
4950
git clone http://git-wip-us.apache.org/repos/asf/samza.git samza-release
5051
cd samza-release
5152

52-
Then build the tarball:
53+
Then build the source and samza-tools tarballs:
5354

54-
./gradlew clean sourceRelease
55+
./gradlew clean sourceRelease && ./gradlew releaseToolsTarGz
5556

56-
Then sign it:
57+
Then sign them:
5758

58-
gpg --sign --armor --detach-sig build/distribution/source/apache-samza-*.tgz
59+
gpg --sign --armor --detach-sig ./build/distribution/source/apache-samza-*.tgz
60+
gpg --sign --armor --detach-sig ./samza-tools/build/distributions/samza-tools-*.tgz
61+
62+
Create MD5 signatures:
5963

60-
Create SHA1 signature:
64+
gpg --print-md MD5 ./build/distribution/source/apache-samza-*.tgz > ./build/distribution/source/apache-samza-*.tgz.md5
65+
gpg --print-md MD5 ./samza-tools/build/distributions/samza-tools-*.tgz > ./samza-tools/build/distributions/samza-tools-*.tgz.md5
66+
67+
Create SHA1 signatures:
6168

6269
gpg --print-md SHA1 ./build/distribution/source/apache-samza-*.tgz > ./build/distribution/source/apache-samza-*.tgz.sha1
70+
gpg --print-md SHA1 ./samza-tools/build/distributions/samza-tools-*.tgz > ./samza-tools/build/distributions/samza-tools-*.tgz.sha1
71+
72+
Upload the build artifacts to your Apache home directory:
73+
74+
sftp <apache-username>@home.apache.org
75+
cd public_html
76+
mkdir samza-$VERSION-rc0
77+
cd samza-$VERSION-rc0
78+
put ./build/distribution/source/apache-samza-$VERSION-src.* .
79+
put ./samza-tools/build/distributions/samza-tools-$VERSION.* .
80+
bye
6381

6482
Make a signed git tag for the release candidate:
6583

@@ -69,23 +87,7 @@ Push the release tag to remote repository:
6987

7088
git push origin release-$VERSION-rc0
7189

72-
Build the tarball for samza-tool:
73-
74-
./gradlew releaseToolsTarGz
75-
76-
Then sign it:
77-
78-
gpg --sign --armor --detach-sig ./samza-tools/build/distributions/samza-tools-*.tgz
79-
80-
Create MD5 signature:
81-
82-
gpg --print-md MD5 ./samza-tools/build/distributions/samza-tools-*.tgz > ./samza-tools/build/distributions/samza-tools-*.tgz.md5
83-
84-
Create SHA1 signature:
85-
86-
gpg --print-md SHA1 ./build/distribution/source/apache-samza-*.tgz > ./build/distribution/source/apache-samza-*.tgz.sha1
87-
88-
Edit `$HOME/.gradle/gradle.properties` and add your GPG key information:
90+
Edit `$HOME/.gradle/gradle.properties` and add your GPG key information (without the comments):
8991

9092
signing.keyId=01234567 # Your GPG key ID, as 8 hex digits
9193
signing.secretKeyRingFile=/path/to/secring.gpg # Normally in $HOME/.gnupg/secring.gpg
@@ -112,6 +114,7 @@ repository just created, and close it. This may take a minute or so. When it
112114
finishes, the UI shows a staging repository URL. This can be used in a project
113115
that depends on Samza, to test the release candidate.
114116

117+
115118
If the VOTE has successfully passed on the release candidate, you can log in to the
116119
[repository web interface](https://repository.apache.org) (same as above) and "release"
117120
the org.apache.samza repository listed under "Staging Repositories".

build.gradle

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,34 @@ project(':samza-sql') {
336336
}
337337
}
338338

339+
project(':samza-sql-shell') {
340+
apply plugin: 'java'
341+
342+
dependencies {
343+
compile project(':samza-sql')
344+
compile project(':samza-tools')
345+
compile project(":samza-core_$scalaVersion")
346+
compile project(':samza-api')
347+
compile project(":samza-kafka_$scalaVersion")
348+
compile project(':samza-azure')
349+
compile "net.java.dev.jna:jna:$jnaVersion"
350+
compile "org.jline:jline:$jlineVersion"
351+
352+
testCompile "junit:junit:$junitVersion"
353+
}
354+
355+
tasks.create(name: "releaseSqlShellTarGz", dependsOn: configurations.archives.artifacts, type: Tar) {
356+
into "samza-sql-shell-${version}"
357+
compression = Compression.GZIP
358+
from(project.file("./scripts")) { into "scripts/" }
359+
from(project.file("./conf")) { into "conf/" }
360+
from(project(':samza-shell').file("src/main/bash/run-class.sh")) { into "scripts/" }
361+
from(configurations.runtime) { into("lib/") }
362+
from(configurations.archives.artifacts.files) { into("lib/") }
363+
duplicatesStrategy 'exclude'
364+
}
365+
}
366+
339367
project(':samza-tools') {
340368
apply plugin: 'java'
341369

checkstyle/checkstyle-suppressions.xml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0"?>
22

33
<!DOCTYPE suppressions PUBLIC
4-
"-//Puppy Crawl//DTD Suppressions 1.0//EN"
5-
"http://www.puppycrawl.com/dtds/suppressions_1_0.dtd">
4+
"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
5+
"https://checkstyle.org/dtds/suppressions_1_2.dtd">
66

77
<!--
88
// Licensed to the Apache Software Foundation (ASF) under one or more
@@ -22,15 +22,10 @@
2222
-->
2323

2424
<suppressions>
25-
<!-- example
26-
<suppress checks="Indentation"
27-
files="TestZkProcessorLatch.java"
28-
lines="91-275"/>
29-
-->
3025
<suppress checks="ConstantName"
3126
files="ApplicationStatus.java"
3227
lines="26-29"/>
33-
<suppress checks="UnusedImports"
34-
files="StreamApplication.java"/>
28+
<suppress id="preventJavadocUnusedImports"
29+
files=".*samza-api.*"/>
3530
</suppressions>
3631

checkstyle/checkstyle.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,14 @@
3434
<module name="TreeWalker">
3535

3636
<!-- code cleanup -->
37-
<module name="UnusedImports"/>
37+
<module name="UnusedImports">
38+
<property name="id" value="allowJavadocUnusedImports"/>
39+
<property name="processJavadoc" value="true"/>
40+
</module>
41+
<module name="UnusedImports"> <!-- suppressed for samza-api -->
42+
<property name="id" value="preventJavadocUnusedImports"/>
43+
<property name="processJavadoc" value="false"/>
44+
</module>
3845
<module name="FileContentsHolder"/>
3946
<module name="RedundantImport"/>
4047
<module name="IllegalImport" />

docs/_blog/2017-08-27-announcing-the-release-of-apache-samza--0.13.1.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ excerpt_separator: <!--more-->
2626
-->
2727

2828

29-
Testing the excerpt
29+
A stability release to make Samza as an embedded library production ready
30+
Samza as a library is part of Samza’s Flexible Deployment model
3031

3132
<!--more-->
3233

docs/_blog/2018-01-31-announcing-the-release-of-apache-samza--0.14.0.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@ excerpt_separator: <!--more-->
2626
-->
2727

2828

29-
Testing the excerpt
29+
A major release with following highly anticipated features:
30+
- Samza SQL
31+
- Azure EventHubs producer, consumer and checkpoint provider
32+
- AWS Kinesis consumer
3033

3134
<!--more-->
3235

docs/_blog/2018-07-19-stream_processing-meetup-summary.md

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
layout: blog
3-
title: Recap of Stream Processing with Apache Kafka & Apache Samza (July '18)
3+
title: Our July 2018 meetup - A Report
44
icon: analytics
55
authors:
66
- name:
@@ -25,18 +25,14 @@ excerpt_separator: <!--more-->
2525
limitations under the License.
2626
-->
2727

28-
A look back at July edition of quarterly stream processing meetup
28+
On July 19, 2018, we hosted a community meetup at LinkedIn focussing on Apache Kafka, Apache Samza, and related streaming technologies.
29+
The event featured technical deep dives by engineers from LinkedIn and Uber on the latest in the stream processing space...
2930

3031
<!--more-->
3132

32-
33-
On July 19th another successful stream processing meetup was hosted by LinkedIn!
34-
This event focused on Apache Kafka, Apache Samza, and related streaming technologies.
35-
This meetup was a full house and had techincal deep dives by engineers from LinkedIn and Uber on the latest
36-
and greatest in streaming tech
37-
38-
<br>
39-
33+
July 2018 - On July 19, 2018, we hosted a community meetup at LinkedIn focussing on Apache Kafka, Apache Samza, and related streaming technologies.
34+
The event featured technical deep dives by engineers from LinkedIn and Uber on the latest in the stream processing space. Here is a brief summary
35+
of the talks that were presented.
4036

4137
### [Beam me up Samza: How we built a Samza Runner for Apache Beam](https://youtu.be/o5GaifLoZho)
4238

docs/_blog/2018-09-26-stangeloop-recap.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
---
22
layout: blog
3-
title: Recap of Chasing Stream Processing Utopia
3+
title: On chasing the Stream Processing Utopia
44
icon: analytics
55
authors:
66
- name:
77
website:
88
image:
99
excerpt_separator: <!--more-->
10+
exclude_from_loop: true
1011
---
1112
<!--
1213
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -25,7 +26,8 @@ excerpt_separator: <!--more-->
2526
limitations under the License.
2627
-->
2728

28-
Strange Loop, St. Louis, MO
29+
Talk By Kartik Paramasivam (Director of Engineering, Linkedin)
30+
@Strange Loop, St. Louis, MO
2931

3032
<!--more-->
3133

docs/_case-studies/linkedin.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ title: Air Traffic Controller with Samza at LinkedIn
55
study_domain: linkedin.com # just the domain, not the protocol
66
priority: 4
77
menu_title: LinkedIn # what shows up in the menu
8+
logo_url: https://upload.wikimedia.org/wikipedia/commons/c/ca/LinkedIn_logo_initials.png
89
excerpt_separator: <!--more-->
910
---
1011
<!--

docs/_case-studies/optimizely.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
layout: case-study
33
hide_title: true # so we have control in case-study layout, but can still use page
4-
title: Real Time Session Aggregation
4+
title: On using Samza at Optimizely to compute analytics over session windows.
55
study_domain: optimizely.com
66
priority: 2
77
menu_title: Optimizely
@@ -25,7 +25,7 @@ excerpt_separator: <!--more-->
2525
limitations under the License.
2626
-->
2727

28-
Real Time Session Aggregation
28+
On using Samza at Optimizely to compute analytics over session windows
2929

3030
<!--more-->
3131

0 commit comments

Comments
 (0)