Skip to content
This repository has been archived by the owner on Jul 2, 2023. It is now read-only.

Commit

Permalink
Update gradle plugins and library dependency version.
Browse files Browse the repository at this point in the history
  • Loading branch information
bud4453 committed May 8, 2019
1 parent d43a762 commit 495454a
Show file tree
Hide file tree
Showing 10 changed files with 32 additions and 45 deletions.
16 changes: 5 additions & 11 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,14 @@
* limitations under the License.
*/

buildscript {
repositories {
maven { setUrl('http://repo.spring.io/plugins-release') }
}
dependencies {
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
classpath "io.spring.gradle:dependency-management-plugin:${springDependencyManagementVersion}"
classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.8.1'
}
plugins {
id "org.asciidoctor.jvm.convert" version "2.2.0" apply false
id "com.jfrog.bintray" version "1.8.4" apply false
}

configure(subprojects) {
apply plugin: 'idea'
apply plugin: 'idea'

configure(subprojects) {
repositories {
mavenCentral()
mavenLocal()
Expand Down
38 changes: 15 additions & 23 deletions http-requests-bom/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,26 @@

apply from: "${rootDir}/gradle/bintray.gradle"

apply plugin: "java-platform"
apply plugin: 'maven-publish'
apply plugin: 'com.jfrog.bintray'

dependencies {
constraints {
api project(':http-requests-core')
api project(':http-requests-groovy')
api project(':http-requests-httpcomponents-client')
api project(':http-requests-jackson')
api project(':http-requests-jersey1')
api project(':http-requests-jersey2')
api project(':http-requests-spring')
}
}

publishing {
publications {
library(MavenPublication) {
from components.javaPlatform

groupId project.group
artifactId project.name
version project.version
Expand Down Expand Up @@ -53,28 +67,6 @@ publishing {
system = 'GitHub Issues'
url = githubHttpsUrl + "/issues"
}

withXml {
asNode().children().last() + {
def builder = delegate

builder.dependencyManagement {
builder.dependencies {
for (sub in rootProject.subprojects) {
if (!sub.plugins.hasPlugin('java') || !sub.plugins.hasPlugin('maven-publish')) {
continue
}

builder.dependency {
builder.groupId sub.group
builder.artifactId sub.name
builder.version sub.version
}
}
}
}
}
}
}
}
}
Expand Down
3 changes: 1 addition & 2 deletions http-requests-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
apply from: "${rootDir}/gradle/library-publish.gradle"

dependencies {
api "org.slf4j:slf4j-api:1.7.25"

api "org.slf4j:slf4j-api:1.7.26"
testImplementation project(":http-requests-functional-test")
}
12 changes: 9 additions & 3 deletions http-requests-documentation/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,20 @@
* limitations under the License.
*/

apply plugin: 'org.asciidoctor.convert'
apply plugin: 'org.asciidoctor.jvm.convert'

asciidoctor {
sourceDir new File("$projectDir/src/docs")
baseDir file("src/docs")
sourceDir file("src/docs")

sources {
include 'index.adoc'
}
backends 'html5'

outputOptions {
backends 'html5'
}

attributes 'copyright': 'Apache License, Version 2.0',
'toc': 'left',
'toclevels': 2,
Expand Down
1 change: 0 additions & 1 deletion http-requests-groovy/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,5 @@ dependencies {
api "org.codehaus.groovy:groovy:${groovyVersion}"
api "org.codehaus.groovy:groovy-json:${groovyVersion}"
api "org.codehaus.groovy:groovy-xml:${groovyVersion}"

testImplementation project(":http-requests-functional-test")
}
1 change: 0 additions & 1 deletion http-requests-httpcomponents-client/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,5 @@ apply from: "${rootDir}/gradle/library-publish.gradle"
dependencies {
api project(":http-requests-core")
api "org.apache.httpcomponents:httpclient:${httpComponentsClientVersion}"

testImplementation project(":http-requests-functional-test")
}
2 changes: 1 addition & 1 deletion http-requests-httpcomponents-client/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
#
projectDescription=Provides a concrete implementation of the http-requests library using the\
Apache HttpComponents Client library.
httpComponentsClientVersion=4.5.2
httpComponentsClientVersion=4.5.8
1 change: 0 additions & 1 deletion http-requests-jersey1/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,5 @@ apply from: "${rootDir}/gradle/library.gradle"
dependencies {
api project(":http-requests-core")
api "com.sun.jersey:jersey-client:${jersey1Version}"

testImplementation project(":http-requests-functional-test")
}
1 change: 0 additions & 1 deletion http-requests-jersey2/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,5 @@ dependencies {
api "org.glassfish.jersey.core:jersey-client:${jersey2Version}"
api "org.glassfish.jersey.core:jersey-common:${jersey2Version}"
api "org.glassfish.jersey.inject:jersey-hk2:${jersey2Version}"

testImplementation project(":http-requests-functional-test")
}
2 changes: 1 addition & 1 deletion http-requests-jersey2/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
#
projectDescription=Provides a concrete implementation of the http-requests library using the \
Jersey Client 2.x library.
jersey2Version=2.27
jersey2Version=2.28

0 comments on commit 495454a

Please sign in to comment.