Skip to content

Commit 49b5990

Browse files
authored
ISSUE-32 Integration with Confluent Hub Release (#33)
* ISSUE-32 Integration with Confluent Hub Release * build script change to create confluent release package * docs folder rename to doc to be in sync with confluent release structue * adobe logo added for release * update github actions to include confluent release zip as release resources * ISSUE-32 update owner name as "Adobe Inc."
1 parent 4216072 commit 49b5990

File tree

11 files changed

+134
-16
lines changed

11 files changed

+134
-16
lines changed

.dockerignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212

1313
.idea/
1414
.git/
15-
docs/
15+
doc/
1616
config/
1717
full-stack/

.github/workflows/build-release-master.yml

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
jobs:
99
build:
1010
runs-on: ubuntu-latest
11-
name: Build for ${{ matrix.Java }}
11+
name: Build for 8 and 11
1212
steps:
1313
- uses: actions/checkout@v2
1414
- name: Set up JDK 11
@@ -18,17 +18,18 @@ jobs:
1818
distribution: 'adopt'
1919
- name: Grant execute permission for gradlew
2020
run: chmod +x gradlew
21-
- name: Build with Gradle
22-
run: |
23-
export JAVA_COMPILATION_VERSION=11
24-
./gradlew build
25-
export JAVA_COMPILATION_VERSION=8
26-
./gradlew build
2721
- name: Bump Release Version
2822
id: tag_version
2923
uses: mathieudutour/[email protected]
3024
with:
3125
github_token: ${{ secrets.GITHUB_TOKEN }}
26+
- name: Build with Gradle
27+
run: |
28+
export JAVA_COMPILATION_VERSION=8
29+
export PROJECT_VERSION=${{ steps.tag_version.outputs.new_version }}
30+
./gradlew build
31+
export JAVA_COMPILATION_VERSION=11
32+
./gradlew build kafkaConnectPublish
3233
- name: Create Release
3334
id: create_release
3435
uses: softprops/action-gh-release@v1
@@ -37,7 +38,20 @@ jobs:
3738
with:
3839
tag_name: ${{ steps.tag_version.outputs.new_tag }}
3940
name: ${{ steps.tag_version.outputs.new_tag }}
40-
body: ${{ steps.tag_version.outputs.changelog }}
41+
body: |
42+
${{ steps.tag_version.outputs.changelog }}
43+
## Confluent Archive Zip
44+
Attached to this release is the adobe-streaming-connect-sink-${{ steps.tag_version.outputs.new_version }}.zip confluent archive - see the [confluent documentation](https://docs.confluent.io/home/connect/install.html) about installing a connector manually for more information.
45+
46+
## All-In-One Dependency JAR
47+
All in one dependency JAR could be used in place of multiple jars.
48+
Following all-in-one AEP sink connector JAR are attached in release :
49+
1. streaming-connect-sink-${{ steps.tag_version.outputs.new_version }}-java-8.jar : Compiled with java 8
50+
2. streaming-connect-sink-${{ steps.tag_version.outputs.new_version }}-java-11.jar : Compiled with java 11
51+
52+
For connector properties and sample connector configuration please refer : [Developer Guide](https://github.com/adobe/experience-platform-streaming-connect/blob/master/DEVELOPER_GUIDE.md)
4153
draft: true
4254
prerelease: false
43-
files: ./streaming-connect-sink/build/libs/streaming-connect-sink-*.jar
55+
files: |
56+
./streaming-connect-sink/build/libs/streaming-connect-sink-*.jar
57+
./build/distributions/adobe-streaming-connect-sink-*.zip

DEVELOPER_GUIDE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ For reference, more details are in oracle documentation on configuring proxy set
311311
The docker setup comes with Topics UI to view the topic and messages within.
312312
Open a browser and go to http://localhost:8000 and view the connect-test topic
313313
314-
![Topics UI](./docs/resources/topics-ui.png)
314+
![Topics UI](./doc/resources/topics-ui.png)
315315
316316
In order to test the flow, you can use the following curl command to post a message into the Kafka topic using the
317317
Kafka rest proxy. Please ensure that the curl command uses your inlet endpoint, and the schema of the XDM message

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Adobe Experience Platform Stream connector is based on Kafka Connect. Use this l
2222

2323
AEP sink connector delivers data from Kafka topics to a registered endpoint of the Adobe Experience Platform.
2424

25-
![AEP Sink Connector](./docs/resources/aep_sink_connector.png)
25+
![AEP Sink Connector](./doc/resources/aep_sink_connector.png)
2626

2727
#### Features
2828

@@ -58,7 +58,7 @@ We have included a quick-start script which automates configuration by creating
5858

5959
Following figure illustrates steps simulated by setup script.
6060

61-
![AEP Sink Connector setup](./docs/resources/aep_sink_connector_setup.png)
61+
![AEP Sink Connector setup](./doc/resources/aep_sink_connector_setup.png)
6262

6363
#### Prerequisite
6464
* Install [Java 8][java-8]

build.gradle

Lines changed: 105 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,25 @@ repositories {
3838
mavenCentral()
3939
}
4040

41+
def connectProperties = [
42+
title : 'Adobe Experience Platform Sink Connector',
43+
componentName : 'streaming-connect-sink',
44+
documentationUrl : 'https://github.com/adobe/experience-platform-streaming-connect',
45+
sourceUrl : 'https://github.com/adobe/experience-platform-streaming-connect',
46+
description : 'Adobe Experience Platform Stream connector is based on Kafka Connect. Use this library to stream JSON events from Kafka topics in your datacenter directly into a Adobe Experience Platform in real-time.',
47+
logo : 'doc/resources/adobe.png',
48+
version : System.getenv("PROJECT_VERSION") ?: "${versionMain}${versionQualifier}",
49+
ownerUsername : 'adobeinc',
50+
ownerName : 'Adobe Inc.',
51+
ownerLogo : 'doc/resources/adobe.png',
52+
componentType : 'sink',
53+
tags : ['"Adobe"', '"Kafka Connect"', '"Sink"'],
54+
supportProviderName: 'Adobe Inc.',
55+
supportUrl : 'https://github.com/adobe/experience-platform-streaming-connect/issues',
56+
supportLogo : 'doc/resources/adobe.png',
57+
supportSummary : 'Please file issues, suggest changes or feature requests and question at https://github.com/adobe/experience-platform-streaming-connect/issues'
58+
]
59+
4160
subprojects {
4261
apply plugin: 'project-report'
4362
apply plugin: 'base'
@@ -48,7 +67,7 @@ subprojects {
4867
apply plugin: 'idea'
4968
apply plugin: 'jacoco'
5069

51-
version = System.getenv("PROJECT_VERSION") ?: "${versionMain}${versionQualifier}"
70+
version = connectProperties.version
5271

5372
checkstyle {
5473
configFile = rootProject.file('config/checkstyle/checkstyle.xml')
@@ -188,6 +207,91 @@ sonarqube {
188207
}
189208
}
190209

210+
def basePackage = "build/package"
211+
212+
task copyDependencies(type: Copy) {
213+
from subprojects.configurations.default
214+
into "$basePackage/lib"
215+
216+
from "streaming-connect-sink/build/libs/streaming-connect-sink-${connectProperties.version}.jar"
217+
into "$basePackage/lib"
218+
219+
doLast {
220+
delete fileTree('streaming-connect-sink/build/libs/') {
221+
include "streaming-connect-sink-${connectProperties.version}.jar"
222+
}
223+
copy {
224+
from projectDir.getAbsolutePath() + "/doc/resources/adobe.png"
225+
into "$basePackage/assets"
226+
}
227+
228+
copy {
229+
from projectDir.getAbsolutePath() + "/LICENSE"
230+
into "$basePackage/doc"
231+
}
232+
233+
copy {
234+
from projectDir.getAbsolutePath() + "/README.md"
235+
into "$basePackage/doc"
236+
}
237+
238+
new File(projectDir, "/$basePackage/manifest.json").text = """{
239+
"component_types": [ "$connectProperties.componentType" ],
240+
"description": "$connectProperties.description",
241+
"docker_image": {
242+
"tag": "$connectProperties.version",
243+
"name": "$connectProperties.componentName",
244+
"namespace": "",
245+
"registry": ""
246+
},
247+
"documentation_url": "$connectProperties.documentationUrl",
248+
"features": {
249+
"confluent_control_center_integration": true,
250+
"delivery_guarantee": [ "at_least_once"],
251+
"kafka_connect_api": true,
252+
"single_message_transforms": true,
253+
"supported_encodings": [ "json" ]
254+
},
255+
"license": [
256+
{
257+
"name": "Apache License, Version 2.0",
258+
"url": "http://www.apache.org/licenses/LICENSE-2.0",
259+
"logo": "assets/apache_logo.gif"
260+
}
261+
],
262+
"logo": "$connectProperties.logo",
263+
"name": "$connectProperties.componentName",
264+
"owner": {
265+
"logo": "$connectProperties.ownerLogo",
266+
"name": "$connectProperties.ownerName",
267+
"type": "organization",
268+
"username": "$connectProperties.ownerUsername"
269+
},
270+
"requirements": [ "AEP Platform Account" ],
271+
"support": {
272+
"logo": "$connectProperties.supportLogo",
273+
"provider_name": "$connectProperties.supportProviderName",
274+
"summary": "$connectProperties.supportSummary",
275+
"url": "$connectProperties.supportUrl"
276+
},
277+
"tags": $connectProperties.tags,
278+
"title": "$connectProperties.title",
279+
"version": "$connectProperties.version"
280+
}
281+
"""
282+
}
283+
284+
}
285+
286+
task kafkaConnectPublish(type: Zip) {
287+
dependsOn(copyDependencies)
288+
289+
archiveName "$connectProperties.ownerUsername-$connectProperties.componentName-$connectProperties.version" + ".zip"
290+
from "$basePackage/"
291+
include '*'
292+
include '*/*'
293+
}
294+
191295
configurations.all {
192296
exclude module: 'slf4j-log4j12'
193297
}

doc/resources/adobe.png

28.2 KB
Loading
File renamed without changes.
File renamed without changes.

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
##
1212

1313
group=com.adobe.platform.streaming
14-
versionMain=0.0.9
14+
versionMain=0.0.10
1515
versionQualifier=
1616

1717
param_artifactory_user=

0 commit comments

Comments
 (0)