Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
build
out
.idea
.gradle
.gradle
bin
11 changes: 7 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,17 @@ repositories {
}
}

def buildInfoVersion = '2.41.13'
def buildInfoVersion = '2.43.6'
// Updated to 2.17.3 for security fixes - compatible with Java 8+
def jacksonVersion = '2.17.3'

dependencies {
implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.15.2'
implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: jacksonVersion
implementation group: 'org.jfrog.buildinfo', name: 'build-info-extractor-npm', version: buildInfoVersion
implementation group: 'org.jfrog.buildinfo', name: 'build-info-extractor-go', version: buildInfoVersion
implementation group: 'org.jfrog.buildinfo', name: 'build-info-client', version: buildInfoVersion
implementation group: 'org.jfrog.buildinfo', name: 'build-info-api', version: buildInfoVersion
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.15.2'
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: jacksonVersion
implementation(group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.13') {
exclude group: 'commons-codec', module: 'commons-codec'
}
Expand All @@ -42,7 +45,7 @@ dependencies {
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.11'
implementation group: 'com.google.guava', name: 'guava', version: '32.0.1-jre'
implementation group: 'commons-codec', name: 'commons-codec', version: '1.13'
implementation group: 'com.jfrog', name: 'gradle-dep-tree', version: '3.0.1'
implementation group: 'com.jfrog', name: 'gradle-dep-tree', version: '3.2.1'
implementation group: 'commons-io', name: 'commons-io', version: '2.20.0'
implementation(group: 'com.opencsv', name: 'opencsv', version: '5.11.1') {
exclude group: 'common-collections', module: 'commons-collections'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
package com.jfrog.ide.common.nodes.subentities;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter;

import java.util.Objects;


@Getter
@JsonIgnoreProperties(ignoreUnknown = true)
public class ImpactPath {
@JsonProperty()
private String name;
Expand Down
5 changes: 2 additions & 3 deletions src/test/resources/gradle/groovy/api/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ configurations {

dependencies {
implementation project(':shared')
implementation module("commons-lang:commons-lang:2.4") {
dependency("commons-io:commons-io:1.2")
}
implementation "commons-lang:commons-lang:2.4"
implementation "commons-io:commons-io:1.2"
implementation group: 'org.apache.wicket', name: 'wicket', version: '1.3.7'

}
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/gradle/groovy/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath(group: 'org.jfrog.buildinfo', name: 'build-info-extractor-gradle', version: '4.+')
classpath(group: 'org.jfrog.buildinfo', name: 'build-info-extractor-gradle', version: '5.+')
}
configurations.classpath {
resolutionStrategy {
Expand Down
6 changes: 3 additions & 3 deletions src/test/resources/gradle/kotlin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath("org.jfrog.buildinfo", "build-info-extractor-gradle", "4.+")
classpath("org.jfrog.buildinfo", "build-info-extractor-gradle", "5.+")
}
configurations.classpath {
resolutionStrategy {
Expand Down Expand Up @@ -103,8 +103,8 @@ configure<org.jfrog.gradle.plugin.artifactory.dsl.ArtifactoryPluginConvention> {
publish {
repository {
setRepoKey("libs-snapshot-local") // The Artifactory repository key to publish to
setUsername(findProperty("artifactory_user")) // The publisher user name
setPassword(findProperty("artifactory_password")) // The publisher password
setUsername(findProperty("artifactory_user")?.toString().orEmpty()) // The publisher user name
setPassword(findProperty("artifactory_password")?.toString().orEmpty()) // The publisher password
// This is an optional section for configuring Ivy publication (when publishIvy = true).
ivy {
setIvyLayout("[organization]/[module]/ivy-[revision].xml")
Expand Down
5 changes: 2 additions & 3 deletions src/test/resources/gradle/unresolvedGroovy/api/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ configurations {

dependencies {
implementation project(':shared')
implementation module("commons-lang:commons-lang:2.4") {
dependency("commons-io:commons-io:1.2")
}
implementation "commons-lang:commons-lang:2.4"
implementation "commons-io:commons-io:1.2"
implementation group: 'org.apache.wicket', name: 'wicket', version: '1.3.7'

}
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/gradle/unresolvedGroovy/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath(group: 'org.jfrog.buildinfo', name: 'build-info-extractor-gradle', version: '4.+')
classpath(group: 'org.jfrog.buildinfo', name: 'build-info-extractor-gradle', version: '5.+')
}
configurations.classpath {
resolutionStrategy {
Expand Down
6 changes: 3 additions & 3 deletions src/test/resources/gradle/unresolvedKotlin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath("org.jfrog.buildinfo", "build-info-extractor-gradle", "4.+")
classpath("org.jfrog.buildinfo", "build-info-extractor-gradle", "5.+")
}
configurations.classpath {
resolutionStrategy {
Expand Down Expand Up @@ -103,8 +103,8 @@ configure<org.jfrog.gradle.plugin.artifactory.dsl.ArtifactoryPluginConvention> {
publish {
repository {
setRepoKey("libs-snapshot-local") // The Artifactory repository key to publish to
setUsername(findProperty("artifactory_user")) // The publisher user name
setPassword(findProperty("artifactory_password")) // The publisher password
setUsername(findProperty("artifactory_user")?.toString().orEmpty()) // The publisher user name
setPassword(findProperty("artifactory_password")?.toString().orEmpty()) // The publisher password
// This is an optional section for configuring Ivy publication (when publishIvy = true).
ivy {
setIvyLayout("[organization]/[module]/ivy-[revision].xml")
Expand Down
5 changes: 2 additions & 3 deletions src/test/resources/packageFinder/gradle/api/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ configurations {

dependencies {
implementation project(':shared')
implementation module("commons-lang:commons-lang:2.4") {
dependency("commons-io:commons-io:1.2")
}
implementation "commons-lang:commons-lang:2.4"
implementation "commons-io:commons-io:1.2"
implementation group: 'org.apache.wicket', name: 'wicket', version: '1.3.7'

}
Expand Down
Loading