Skip to content

Commit

Permalink
Fix dependency issues in gradle build files
Browse files Browse the repository at this point in the history
  • Loading branch information
kallestenflo committed Mar 21, 2023
1 parent 9a77472 commit 1e6647b
Show file tree
Hide file tree
Showing 7 changed files with 198 additions and 238 deletions.
39 changes: 29 additions & 10 deletions build.gradle
Expand Up @@ -6,21 +6,20 @@ buildscript {
}
}
dependencies {
classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.3.0'
classpath 'com.github.jengelman.gradle.plugins:shadow:5.2.0'
classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:6.1.0'
}
}

ext {
libs = [
jsonSmart: 'net.minidev:json-smart:2.4.10',
slf4jApi: 'org.slf4j:slf4j-api:1.7.36',
gson: 'com.google.code.gson:gson:2.10.1',
hamcrest: 'org.hamcrest:hamcrest:2.2',
jacksonDatabind: 'com.fasterxml.jackson.core:jackson-databind:2.14.2',
jettison: 'org.codehaus.jettison:jettison:1.5.4',
jsonOrg: 'org.json:json:20140107',
jsonSmart: 'net.minidev:json-smart:2.4.10',
slf4jApi: 'org.slf4j:slf4j-api:1.7.36',
tapestryJson: 'org.apache.tapestry:tapestry-json:5.8.1',
jakartaJsonP: 'jakarta.json:jakarta.json-api:2.0.1',
jakartaJsonB: 'jakarta.json.bind:jakarta.json.bind-api:2.0.0',
Expand All @@ -34,10 +33,19 @@ ext {
'org.glassfish:jakarta.json:2.0.1',
'org.eclipse:yasson:2.0.4',
//'org.apache.johnzon:johnzon-jsonb:1.2.12',
'org.slf4j:slf4j-simple:1.7.36'
'org.slf4j:slf4j-simple:1.7.36',
'com.google.code.gson:gson:2.10.1',
'org.hamcrest:hamcrest:2.2',
'com.fasterxml.jackson.core:jackson-databind:2.14.2',
'org.codehaus.jettison:jettison:1.5.4',
'org.json:json:20140107',
'org.apache.tapestry:tapestry-json:5.8.1',
'jakarta.json:jakarta.json-api:2.0.1',
'jakarta.json.bind:jakarta.json.bind-api:2.0.0'

]
]
snapshotVersion = project.version.contains('SNAPSHOT')
snapshotVersion = true
}

allprojects {
Expand Down Expand Up @@ -75,12 +83,12 @@ subprojects {

testLogging {
events "passed", "skipped", "failed"
//showStandardStreams = true
}
}

signing {
sign configurations.archives // sign publishing.publications.mavenJava
sign configurations.archives
//sign publishing.publications.mavenJava
required { !snapshotVersion && gradle.taskGraph.hasTask("publish") } // uploadArchives is replaced by publish
}

Expand All @@ -95,14 +103,25 @@ subprojects {
}

publishing {
repositories {
maven {
def releaseRepo = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
def snapshotRepo = "https://oss.sonatype.org/content/repositories/snapshots/"
url = snapshotVersion ? snapshotRepo : releaseRepo
credentials {
username = project.hasProperty('sonatypeOssUsername') ? sonatypeOssUsername : "Unknown user"
password = project.hasProperty('sonatypeOssPassword') ? sonatypeOssPassword : "Unknown password"
}
}
}
publications {
mavenJava(MavenPublication) {
from components.java

artifactId = jar.baseName
artifactId = jar.archiveBaseName

pom {
name = jar.baseName
name = jar.archiveBaseName
description = project.description
url = 'https://github.com/jayway/JsonPath'

Expand Down Expand Up @@ -139,4 +158,4 @@ wrapper {

//Task used by Heroku for staging
task stage(dependsOn: [':json-path-web-test:clean', 'json-path-web-test:jar', 'json-path-web-test:shadowJar']) {}
apply from: "$rootDir/gradle/binaryCompatibility.gradle"

Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.

0 comments on commit 1e6647b

Please sign in to comment.