Skip to content

Commit 1e6647b

Browse files
committed
Fix dependency issues in gradle build files
1 parent 9a77472 commit 1e6647b

File tree

7 files changed

+198
-238
lines changed

7 files changed

+198
-238
lines changed

build.gradle

+29-10
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,20 @@ buildscript {
66
}
77
}
88
dependencies {
9-
classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.3.0'
109
classpath 'com.github.jengelman.gradle.plugins:shadow:5.2.0'
1110
classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:6.1.0'
1211
}
1312
}
1413

1514
ext {
1615
libs = [
16+
jsonSmart: 'net.minidev:json-smart:2.4.10',
17+
slf4jApi: 'org.slf4j:slf4j-api:1.7.36',
1718
gson: 'com.google.code.gson:gson:2.10.1',
1819
hamcrest: 'org.hamcrest:hamcrest:2.2',
1920
jacksonDatabind: 'com.fasterxml.jackson.core:jackson-databind:2.14.2',
2021
jettison: 'org.codehaus.jettison:jettison:1.5.4',
2122
jsonOrg: 'org.json:json:20140107',
22-
jsonSmart: 'net.minidev:json-smart:2.4.10',
23-
slf4jApi: 'org.slf4j:slf4j-api:1.7.36',
2423
tapestryJson: 'org.apache.tapestry:tapestry-json:5.8.1',
2524
jakartaJsonP: 'jakarta.json:jakarta.json-api:2.0.1',
2625
jakartaJsonB: 'jakarta.json.bind:jakarta.json.bind-api:2.0.0',
@@ -34,10 +33,19 @@ ext {
3433
'org.glassfish:jakarta.json:2.0.1',
3534
'org.eclipse:yasson:2.0.4',
3635
//'org.apache.johnzon:johnzon-jsonb:1.2.12',
37-
'org.slf4j:slf4j-simple:1.7.36'
36+
'org.slf4j:slf4j-simple:1.7.36',
37+
'com.google.code.gson:gson:2.10.1',
38+
'org.hamcrest:hamcrest:2.2',
39+
'com.fasterxml.jackson.core:jackson-databind:2.14.2',
40+
'org.codehaus.jettison:jettison:1.5.4',
41+
'org.json:json:20140107',
42+
'org.apache.tapestry:tapestry-json:5.8.1',
43+
'jakarta.json:jakarta.json-api:2.0.1',
44+
'jakarta.json.bind:jakarta.json.bind-api:2.0.0'
45+
3846
]
3947
]
40-
snapshotVersion = project.version.contains('SNAPSHOT')
48+
snapshotVersion = true
4149
}
4250

4351
allprojects {
@@ -75,12 +83,12 @@ subprojects {
7583

7684
testLogging {
7785
events "passed", "skipped", "failed"
78-
//showStandardStreams = true
7986
}
8087
}
8188

8289
signing {
83-
sign configurations.archives // sign publishing.publications.mavenJava
90+
sign configurations.archives
91+
//sign publishing.publications.mavenJava
8492
required { !snapshotVersion && gradle.taskGraph.hasTask("publish") } // uploadArchives is replaced by publish
8593
}
8694

@@ -95,14 +103,25 @@ subprojects {
95103
}
96104

97105
publishing {
106+
repositories {
107+
maven {
108+
def releaseRepo = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
109+
def snapshotRepo = "https://oss.sonatype.org/content/repositories/snapshots/"
110+
url = snapshotVersion ? snapshotRepo : releaseRepo
111+
credentials {
112+
username = project.hasProperty('sonatypeOssUsername') ? sonatypeOssUsername : "Unknown user"
113+
password = project.hasProperty('sonatypeOssPassword') ? sonatypeOssPassword : "Unknown password"
114+
}
115+
}
116+
}
98117
publications {
99118
mavenJava(MavenPublication) {
100119
from components.java
101120

102-
artifactId = jar.baseName
121+
artifactId = jar.archiveBaseName
103122

104123
pom {
105-
name = jar.baseName
124+
name = jar.archiveBaseName
106125
description = project.description
107126
url = 'https://github.com/jayway/JsonPath'
108127

@@ -139,4 +158,4 @@ wrapper {
139158

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

gradle/wrapper/gradle-wrapper.jar

4.11 KB
Binary file not shown.

0 commit comments

Comments
 (0)