Skip to content

Commit 7b2742c

Browse files
committed
Bintray publishing for all modules.
1 parent eae5d07 commit 7b2742c

7 files changed

Lines changed: 374 additions & 37 deletions

File tree

auth-stub-http/build.gradle

Lines changed: 72 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
group = project(':').group
1+
def packageName = 'flywheel-auth-stub-http'
22
version = project(':').version
33

4-
def packageName = 'flywheel-auth-proxy-http'
5-
64
dependencies {
75
compile project(':')
86
compile 'org.apache.httpcomponents:httpclient:4.5.3'
@@ -14,4 +12,74 @@ dependencies {
1412

1513
testRuntime 'org.slf4j:slf4j-log4j12:1.7.25'
1614
testRuntime 'log4j:log4j:1.2.17'
17-
}
15+
}
16+
17+
jar {
18+
baseName packageName
19+
}
20+
21+
task javadocJar(type: Jar, dependsOn: javadoc) {
22+
baseName packageName
23+
classifier = 'javadoc'
24+
from "$buildDir/docs/javadoc"
25+
}
26+
27+
task sourcesJar(type: Jar) {
28+
baseName packageName
29+
from sourceSets.main.allSource
30+
classifier = 'sources'
31+
}
32+
33+
artifacts {
34+
archives jar
35+
archives javadocJar
36+
archives sourcesJar
37+
}
38+
39+
publishing {
40+
publications {
41+
mavenJava(MavenPublication) {
42+
groupId project(':').group
43+
artifactId packageName
44+
version project(':').version
45+
from components.java
46+
artifact sourcesJar
47+
artifact javadocJar
48+
}
49+
}
50+
repositories {
51+
maven {
52+
url "${project(':').projectDir}/../repo"
53+
}
54+
}
55+
}
56+
57+
def envUser = 'BINTRAY_USER'
58+
def envKey = 'BINTRAY_KEY'
59+
def packageDesc = 'HTTP stub authenticator for Flywheel'
60+
def repoName = 'flywheel'
61+
bintray {
62+
user = System.getenv(envUser)
63+
key = System.getenv(envKey)
64+
publications = ['mavenJava']
65+
pkg {
66+
repo = "${repoName}"
67+
name = packageName
68+
userOrg = 'william-hill-community'
69+
desc = packageDesc
70+
websiteUrl = "https://github.com/william-hill-community/${repoName}"
71+
licenses = ['BSD New']
72+
vcsUrl = "https://github.com/william-hill-community/${repoName}"
73+
issueTrackerUrl = "https://github.com/william-hill-community/${repoName}/issues"
74+
publicDownloadNumbers = true
75+
githubRepo = "william-hill-community/${repoName}"
76+
override = true
77+
publish = false
78+
version {
79+
name = project(':').version
80+
desc = packageDesc
81+
released = new Date()
82+
vcsTag = project(':').version
83+
}
84+
}
85+
}

backplane-kafka/build.gradle

Lines changed: 67 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
group = project(':').group
2-
version = project(':').version
3-
41
def packageName = 'flywheel-backplane-kafka'
2+
version = project(':').version
53

64
dependencies {
75
compile project(':')
@@ -24,3 +22,69 @@ task integrationTest(type: Test, description: 'Runs integration tests.', group:
2422
jar {
2523
baseName packageName
2624
}
25+
26+
task javadocJar(type: Jar, dependsOn: javadoc) {
27+
baseName packageName
28+
classifier = 'javadoc'
29+
from "$buildDir/docs/javadoc"
30+
}
31+
32+
task sourcesJar(type: Jar) {
33+
baseName packageName
34+
from sourceSets.main.allSource
35+
classifier = 'sources'
36+
}
37+
38+
artifacts {
39+
archives jar
40+
archives javadocJar
41+
archives sourcesJar
42+
}
43+
44+
publishing {
45+
publications {
46+
mavenJava(MavenPublication) {
47+
groupId project(':').group
48+
artifactId packageName
49+
version project(':').version
50+
from components.java
51+
artifact sourcesJar
52+
artifact javadocJar
53+
}
54+
}
55+
repositories {
56+
maven {
57+
url "${project(':').projectDir}/../repo"
58+
}
59+
}
60+
}
61+
62+
def envUser = 'BINTRAY_USER'
63+
def envKey = 'BINTRAY_KEY'
64+
def packageDesc = 'Kafka backplane implementation for Flywheel'
65+
def repoName = 'flywheel'
66+
bintray {
67+
user = System.getenv(envUser)
68+
key = System.getenv(envKey)
69+
publications = ['mavenJava']
70+
pkg {
71+
repo = "${repoName}"
72+
name = packageName
73+
userOrg = 'william-hill-community'
74+
desc = packageDesc
75+
websiteUrl = "https://github.com/william-hill-community/${repoName}"
76+
licenses = ['BSD New']
77+
vcsUrl = "https://github.com/william-hill-community/${repoName}"
78+
issueTrackerUrl = "https://github.com/william-hill-community/${repoName}/issues"
79+
publicDownloadNumbers = true
80+
githubRepo = "william-hill-community/${repoName}"
81+
override = true
82+
publish = false
83+
version {
84+
name = project(':').version
85+
desc = packageDesc
86+
released = new Date()
87+
vcsTag = project(':').version
88+
}
89+
}
90+
}

build.gradle

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ apply plugin: 'com.jfrog.bintray'
77
allprojects {
88
apply plugin: 'java'
99
apply plugin: 'jacoco'
10+
apply plugin: 'maven-publish'
11+
apply plugin: 'com.jfrog.bintray'
1012

1113
repositories {
1214
jcenter()
@@ -26,6 +28,11 @@ allprojects {
2628
csv.enabled = false
2729
}
2830
}
31+
32+
// invoke this task when ready to publish to Bintray
33+
bintrayUpload {
34+
dependsOn ':bintrayCredentialsCheck'
35+
}
2936
}
3037

3138
subprojects {
@@ -91,10 +98,23 @@ task setBuild() {
9198
}
9299
}
93100

101+
def packageName = 'flywheel-core'
102+
94103
group = 'au.com.williamhill.flywheel'
95104
version = packageVersion
96105

97-
def packageName = 'flywheel-core'
106+
def envUser = 'BINTRAY_USER'
107+
def envKey = 'BINTRAY_KEY'
108+
task bintrayCredentialsCheck {
109+
doLast {
110+
if (System.getenv(envUser) == null) {
111+
throw new GradleException("No Bintray username specified; set with 'export ${envUser}=<username>'")
112+
}
113+
if (System.getenv(envKey) == null) {
114+
throw new GradleException("No Bintray key specified; set with 'export ${envKey}=<key>'")
115+
}
116+
}
117+
}
98118

99119
repositories {
100120
jcenter()
@@ -120,41 +140,30 @@ dependencies {
120140
testRuntime 'log4j:log4j:1.2.17'
121141
}
122142

123-
def envUser = 'BINTRAY_USER'
124-
def envKey = 'BINTRAY_KEY'
125-
task bintrayCredentialsCheck {
126-
doLast {
127-
if (System.getenv(envUser) == null) {
128-
throw new GradleException("No Bintray username specified; set with 'export ${envUser}=<username>'")
129-
}
130-
if (System.getenv(envKey) == null) {
131-
throw new GradleException("No Bintray key specified; set with 'export ${envKey}=<key>'")
132-
}
133-
}
134-
}
135-
136143
def packageDesc = 'A simple, fast, WebSocket-based IoT message broker'
144+
def repoName = 'flywheel'
137145
bintray {
138146
user = System.getenv(envUser)
139147
key = System.getenv(envKey)
140148
publications = ['mavenJava']
141149
pkg {
142-
repo = 'flywheel'
150+
repo = "${repoName}"
143151
name = packageName
144152
userOrg = 'william-hill-community'
145153
desc = packageDesc
146-
websiteUrl = 'https://github.com/william-hill-community/flywheel'
154+
websiteUrl = "https://github.com/william-hill-community/${repoName}"
147155
licenses = ['BSD New']
148-
vcsUrl = 'https://github.com/william-hill-community/flywheel.git'
156+
vcsUrl = "https://github.com/william-hill-community/${repoName}"
157+
issueTrackerUrl = "https://github.com/william-hill-community/${repoName}/issues"
149158
publicDownloadNumbers = true
150-
githubRepo = 'william-hill-community/flywheel'
159+
githubRepo = "william-hill-community/${repoName}"
151160
override = true
152161
publish = false
153162
version {
154-
name = packageVersion
163+
name = project(':').version
155164
desc = packageDesc
156165
released = new Date()
157-
vcsTag = packageVersion
166+
vcsTag = project(':').version
158167
}
159168
}
160169
}

logging-splunk/build.gradle

Lines changed: 71 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
group = project(':').group
2-
version = project(':').version
3-
41
def packageName = 'flywheel-logging-splunk'
2+
version = project(':').version
53

64
dependencies {
75
compile project(':')
@@ -12,3 +10,73 @@ dependencies {
1210
compile 'org.apache.httpcomponents:httpclient:4.5.3'
1311
compile 'org.apache.httpcomponents:httpasyncclient:4.1.3'
1412
}
13+
14+
jar {
15+
baseName packageName
16+
}
17+
18+
task javadocJar(type: Jar, dependsOn: javadoc) {
19+
baseName packageName
20+
classifier = 'javadoc'
21+
from "$buildDir/docs/javadoc"
22+
}
23+
24+
task sourcesJar(type: Jar) {
25+
baseName packageName
26+
from sourceSets.main.allSource
27+
classifier = 'sources'
28+
}
29+
30+
artifacts {
31+
archives jar
32+
archives javadocJar
33+
archives sourcesJar
34+
}
35+
36+
publishing {
37+
publications {
38+
mavenJava(MavenPublication) {
39+
groupId project(':').group
40+
artifactId packageName
41+
version project(':').version
42+
from components.java
43+
artifact sourcesJar
44+
artifact javadocJar
45+
}
46+
}
47+
repositories {
48+
maven {
49+
url "${project(':').projectDir}/../repo"
50+
}
51+
}
52+
}
53+
54+
def envUser = 'BINTRAY_USER'
55+
def envKey = 'BINTRAY_KEY'
56+
def packageDesc = 'Splunk Log4j appender with JSON layout for Flywheel'
57+
def repoName = 'flywheel'
58+
bintray {
59+
user = System.getenv(envUser)
60+
key = System.getenv(envKey)
61+
publications = ['mavenJava']
62+
pkg {
63+
repo = "${repoName}"
64+
name = packageName
65+
userOrg = 'william-hill-community'
66+
desc = packageDesc
67+
websiteUrl = "https://github.com/william-hill-community/${repoName}"
68+
licenses = ['BSD New']
69+
vcsUrl = "https://github.com/william-hill-community/${repoName}"
70+
issueTrackerUrl = "https://github.com/william-hill-community/${repoName}/issues"
71+
publicDownloadNumbers = true
72+
githubRepo = "william-hill-community/${repoName}"
73+
override = true
74+
publish = false
75+
version {
76+
name = project(':').version
77+
desc = packageDesc
78+
released = new Date()
79+
vcsTag = project(':').version
80+
}
81+
}
82+
}

logging-splunk/src/main/java/au/com/williamhill/flywheel/logging/SplunkHECAppender.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99

1010
/**
11-
* Log4j Appender for sending events to Splunk via HEC Endpoint.<p/>
11+
* Log4j Appender for sending events to Splunk via HEC Endpoint.<p>
1212
*
1313
* Adapted from https://github.com/damiendallimore/SplunkJavaLogging.
1414
*/

0 commit comments

Comments
 (0)