Skip to content

Commit 279d0bb

Browse files
committed
Setting up Maven publishing instead of bintray
1 parent 4301325 commit 279d0bb

File tree

2 files changed

+82
-49
lines changed

2 files changed

+82
-49
lines changed

build.gradle

Lines changed: 72 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
plugins {
22
id "groovy"
33
id "maven-publish"
4-
id "eclipse"
5-
id "idea"
6-
id "com.jfrog.bintray" version "1.8.4"
4+
id "signing"
5+
76
id "com.github.jk1.dependency-license-report" version "1.3"
87
id "com.gradle.plugin-publish" version "0.11.0"
98
id "java-gradle-plugin"
@@ -12,31 +11,38 @@ plugins {
1211
id "io.snyk.gradle.plugin.snykplugin" version "0.4"
1312
}
1413

14+
group = "com.marklogic"
15+
version = "4.2.0"
16+
1517
sourceCompatibility = "8"
1618
targetCompatibility = "8"
1719

1820
repositories {
19-
mavenLocal() // Used for local development only
21+
mavenLocal() // Used only for local development
22+
23+
mavenCentral()
24+
25+
// Needed for marklogic-unit-test-client
2026
jcenter()
2127
}
2228

2329
dependencies {
24-
compile gradleApi()
25-
compile localGroovy()
26-
compile "com.marklogic:ml-app-deployer:4.1.1"
27-
compile "com.marklogic:mlcp-util:0.9.0"
28-
compile "com.marklogic:marklogic-data-movement-components:2.2.1"
29-
compile "commons-io:commons-io:2.8.0"
30+
implementation gradleApi()
31+
implementation localGroovy()
32+
api "com.marklogic:ml-app-deployer:4.2.0"
33+
implementation "com.marklogic:mlcp-util:0.9.0"
34+
implementation "com.marklogic:marklogic-data-movement-components:2.3.0"
35+
implementation "commons-io:commons-io:2.8.0"
3036

3137
compileOnly "com.marklogic:marklogic-unit-test-client:1.0.0"
3238

33-
testCompile localGroovy()
34-
testCompile gradleTestKit()
35-
testCompile 'xmlunit:xmlunit:1.3'
39+
testImplementation localGroovy()
40+
testImplementation gradleTestKit()
41+
testImplementation 'xmlunit:xmlunit:1.3'
3642

3743
// Force spock-core to use 4.13.1 to avoid security issue in 4.11
38-
testCompile 'junit:junit:4.13.1'
39-
testCompile('org.spockframework:spock-core:1.1-groovy-2.4') {
44+
testImplementation 'junit:junit:4.13.1'
45+
testImplementation('org.spockframework:spock-core:1.1-groovy-2.4') {
4046
exclude module: 'groovy-all'
4147
}
4248
}
@@ -49,40 +55,61 @@ task sourcesJar(type: Jar, dependsOn: classes) {
4955

5056
task javadocJar(type: Jar, dependsOn: javadoc) {
5157
classifier "javadoc"
52-
from file(javadocsDir + "/" + project.name)
58+
from javadoc
5359
}
60+
javadoc.failOnError = false
5461

55-
publishing {
56-
publications {
57-
mainJava(MavenPublication) {
58-
from components.java
59-
}
60-
sourcesJava(MavenPublication) {
61-
from components.java
62-
artifact sourcesJar
63-
}
64-
mavenJavadoc(MavenPublication) {
65-
artifact javadocJar
66-
}
67-
}
62+
artifacts {
63+
archives javadocJar, sourcesJar
64+
}
65+
signing {
66+
sign configurations.archives
6867
}
6968

70-
if (project.hasProperty("myBintrayUser")) {
71-
bintray {
72-
user = myBintrayUser
73-
key = myBintrayKey
74-
publications = ['mainJava', 'sourcesJava']
75-
pkg {
76-
repo = 'maven'
77-
name = project.name
78-
licenses = ['Apache-2.0']
79-
vcsUrl = 'https://github.com/rjrudin/' + project.name + '.git'
80-
version {
81-
name = project.version
82-
released = new Date()
83-
}
84-
}
85-
}
69+
publishing {
70+
publications {
71+
mainJava(MavenPublication) {
72+
pom {
73+
name = "${group}:${project.name}"
74+
description = "Gradle plugin for automating everything involving MarkLogic"
75+
packaging = "jar"
76+
url = "https://github.com/marklogic-community/${project.name}"
77+
licenses {
78+
license {
79+
name = "The Apache License, Version 2.0"
80+
url = "http://www.apache.org/licenses/LICENSE-2.0.txt"
81+
}
82+
}
83+
developers {
84+
developer {
85+
id = "marklogic"
86+
name = "MarkLogic Github Contributors"
87+
88+
organization = "MarkLogic"
89+
organizationUrl = "https://www.marklogic.com"
90+
}
91+
}
92+
scm {
93+
url = "[email protected]:marklogic-community/${project.name}.git"
94+
connection = "scm:[email protected]:marklogic-community/${project.name}.git"
95+
developerConnection = "scm:[email protected]:marklogic-community/${project.name}.git"
96+
}
97+
}
98+
from components.java
99+
artifact sourcesJar
100+
artifact javadocJar
101+
}
102+
}
103+
repositories {
104+
maven {
105+
name = "central"
106+
url = mavenCentralUrl
107+
credentials {
108+
username mavenCentralUsername
109+
password mavenCentralPassword
110+
}
111+
}
112+
}
86113
}
87114

88115
pluginBundle {

gradle.properties

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
1-
group=com.marklogic
2-
version=4.1.1
3-
javadocsDir=../gh-pages-marklogic-java/javadocs
4-
51
# Define this via gradle-local.properties or on the command line when running snyk-test
62
snykToken=
3+
4+
# Define these on the command line to publish to OSSRH
5+
# See https://central.sonatype.org/publish/publish-gradle/#credentials for more information
6+
mavenCentralUsername=
7+
mavenCentralPassword=
8+
mavenCentralUrl=https://oss.sonatype.org/service/local/staging/deploy/maven2/
9+
#signing.keyId=YourKeyId
10+
#signing.password=YourPublicKeyPassword
11+
#signing.secretKeyRingFile=PathToYourKeyRingFile
12+

0 commit comments

Comments
 (0)