Skip to content

Commit 2c3ddad

Browse files
committed
fix(datahub-ranger-plugin): add support to publish jars
1 parent 4062385 commit 2c3ddad

File tree

2 files changed

+18
-58
lines changed

2 files changed

+18
-58
lines changed

.github/workflows/publish-datahub-jars.yml

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Publish Datahub Java Jars (Client, Spark Lineage, Protobuf)
1+
name: Publish Datahub Java Jars (Client, Spark Lineage, Protobuf, Ranger)
22

33
on:
44
push:
@@ -142,7 +142,8 @@ jobs:
142142
echo signingKey=$SIGNING_KEY >> gradle.properties
143143
./gradlew -PreleaseVersion=${{ needs.setup.outputs.tag }} :metadata-integration:java:datahub-protobuf:publish
144144
./gradlew :metadata-integration:java:datahub-protobuf:closeAndReleaseRepository --info
145-
- name: build and publish datahub-ranger-plugin
145+
- name: publish datahub-ranger-plugin snapshot jar
146+
if: ${{ github.event_name != 'release' }}
146147
env:
147148
RELEASE_USERNAME: ${{ secrets.RELEASE_USERNAME }}
148149
RELEASE_PASSWORD: ${{ secrets.RELEASE_PASSWORD }}
@@ -152,6 +153,18 @@ jobs:
152153
NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
153154
run: |
154155
echo signingKey=$SIGNING_KEY >> gradle.properties
155-
# Publish apache ranger plugin to maven
156156
./gradlew :datahub-ranger-plugin:printVersion
157-
./gradlew :datahub-ranger-plugin:publishMavenJavaPublicationToMavenLocal
157+
./gradlew :datahub-ranger-plugin:publish
158+
- name: release datahub-ranger-plugin jar
159+
if: ${{ github.event_name == 'release' }}
160+
env:
161+
RELEASE_USERNAME: ${{ secrets.RELEASE_USERNAME }}
162+
RELEASE_PASSWORD: ${{ secrets.RELEASE_PASSWORD }}
163+
SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
164+
SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
165+
NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }}
166+
NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
167+
run: |
168+
echo signingKey=$SIGNING_KEY >> gradle.properties
169+
./gradlew -PreleaseVersion=${{ needs.setup.outputs.tag }} :datahub-ranger-plugin:publish
170+
./gradlew :datahub-ranger-plugin:closeAndReleaseRepository --info

datahub-ranger-plugin/build.gradle

Lines changed: 1 addition & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
1-
import org.apache.tools.ant.filters.ReplaceTokens
2-
3-
41
apply plugin: 'java'
52
apply plugin: 'signing'
63
apply plugin: 'maven-publish'
74
apply plugin: 'io.codearte.nexus-staging'
8-
9-
10-
11-
import org.apache.tools.ant.filters.ReplaceTokens
5+
apply from: '../metadata-integration/java/versioning.gradle'
126

137

148
repositories {
@@ -31,53 +25,6 @@ dependencies {
3125
testCompile externalDependency.testng
3226
}
3327

34-
def detailedVersionString = "0.0.0-unknown-SNAPSHOT"
35-
def snapshotVersion = false
36-
if (project.hasProperty("releaseVersion")) {
37-
version = releaseVersion
38-
detailedVersionString = releaseVersion
39-
} else {
40-
try {
41-
// apply this plugin in a try-catch block so that we can handle cases without .git directory
42-
apply plugin: "com.palantir.git-version"
43-
def details = versionDetails()
44-
detailedVersionString = gitVersion()
45-
version = details.lastTag
46-
version = version.startsWith("v")? version.substring(1): version
47-
def suffix = details.isCleanTag? "": "-SNAPSHOT"
48-
snapshotVersion = ! details.isCleanTag
49-
}
50-
catch (Exception e) {
51-
e.printStackTrace()
52-
// last fall back
53-
version = detailedVersionString
54-
}
55-
}
56-
// trim version if it is of size 4 to size 3
57-
def versionParts = version.tokenize(".")
58-
if (versionParts.size() > 3) {
59-
// at-least 4 part version
60-
// we check if the 4th part is a .0 in which case we want to create a release
61-
if (versionParts[3] != '0') {
62-
snapshotVersion = true
63-
}
64-
versionParts = versionParts[0..2]
65-
version = versionParts[0..2].join('.')
66-
}
67-
68-
if (snapshotVersion) {
69-
if (versionParts[versionParts.size()-1].isInteger()) {
70-
version = versionParts[0..versionParts.size()-2].join('.') + '.' + (versionParts[versionParts.size()-1].toInteger()+1).toString() + "-SNAPSHOT"
71-
} else {
72-
// we are unable to part the last token as an integer, so we just append SNAPSHOT to this version
73-
version = versionParts[0..versionParts.size()-1].join('.') + '-SNAPSHOT'
74-
}
75-
}
76-
77-
processResources {
78-
filter(ReplaceTokens, tokens:[fullVersion: detailedVersionString])
79-
}
80-
8128

8229
publishing {
8330
publications {

0 commit comments

Comments
 (0)