diff options
author | Jacek <jacek.poreda@sonarsource.com> | 2021-11-22 15:51:42 +0100 |
---|---|---|
committer | sonartech <sonartech@sonarsource.com> | 2021-11-22 20:03:27 +0000 |
commit | 39b94d8d74ba61879e5ebd87b29307ddc7a5297d (patch) | |
tree | d148649fc96e7ea93fe94eb44829597eb7d7553b | |
parent | 3f9445c25962f914ccdd889c002ddd8e19b0cf89 (diff) | |
download | sonarqube-39b94d8d74ba61879e5ebd87b29307ddc7a5297d.tar.gz sonarqube-39b94d8d74ba61879e5ebd87b29307ddc7a5297d.zip |
SONAR-15102 Upgrade 3rd party dependencies
* Upgrade logback to 1.2.7
* Upgrade build-time-tracker to 2.1.0
* Upgrade com.auth0:java-jwt [3.10.3 -> 3.18.2]
* Upgrade com.github.ben-manes.versions:com.github.ben-manes.versions.gradle.plugin [0.33.0 -> 0.39.0]
* Upgrade com.github.everit-org.json-schema:org.everit.json.schema [1.12.2 -> 1.14.0]
* Upgrade com.google.code.gson:gson [2.8.6 -> 2.8.9]
* Upgrade com.google.protobuf:com.google.protobuf.gradle.plugin [0.8.13 -> 0.8.18]
* Upgrade com.google.protobuf:protobuf-java [3.17.3 -> 3.19.1]
* Upgrade com.googlecode.java-diff-utils:diffutils [1.2 -> 1.3.0]
* Upgrade com.hazelcast:hazelcast [4.2 -> 4.2.2]
* Upgrade com.jfrog.artifactory:com.jfrog.artifactory.gradle.plugin [4.21.0 -> 4.24.23]
* Upgrade com.squareup.okhttp3:mockwebserver [4.9.0 -> 4.9.3]
* Upgrade com.yworks:yguard [2.7.1 -> 2.10.0]
* Upgrade commons-codec:commons-codec [1.14 -> 1.15]
* Upgrade commons-io:commons-io [2.8.0 -> 2.11.0]
* Upgrade commons-logging:commons-logging [1.1.1 -> 1.2]
* Upgrade de.undercouch.download:de.undercouch.download.gradle.plugin [4.1.1 -> 4.1.2]
* Upgrade io.spring.dependency-management:io.spring.dependency-management.gradle.plugin [1.0.10.RELEASE -> 1.0.11.RELEASE]
* Upgrade junit:junit [4.13.1 -> 4.13.2]
* Upgrade net.javacrumbs.json-unit:json-unit-fluent [2.14.0 -> 2.28.0]
* Upgrade org.apache.commons:commons-csv [1.7 -> 1.9.0]
* Upgrade org.apache.commons:commons-lang3 [3.9 -> 3.12.0]
* Upgrade org.apache.tomcat.embed:tomcat-embed-core [8.5.72 -> 8.5.73]
* Upgrade org.assertj:assertj-core [3.15.0 -> 3.21.0]
* Upgrade org.assertj:assertj-guava [3.3.0 -> 3.4.0]
* Upgrade org.awaitility:awaitility [4.0.2 -> 4.1.1]
* Upgrade org.eclipse.jgit:org.eclipse.jgit [5.11.0.202103091610-r -> 5.13.0.202109080827-r]
* Upgrade org.jboss.byteman:byteman [4.0.10 -> 4.0.17]
* Upgrade org.jboss.resteasy:resteasy-client [3.11.0.Final -> 3.15.2.Final]
* Upgrade org.jfree:jfreechart [1.5.0 -> 1.5.3]
* Upgrade org.jsoup:jsoup [1.13.1 -> 1.14.3]
* Upgrade org.junit.jupiter:junit-jupiter-api [5.6.0 -> 5.8.1]
* Upgrade org.mockito:mockito-core [3.3.3 -> 3.12.4]
* Upgrade org.mybatis:mybatis [3.5.6 -> 3.5.7]
* Upgrade org.owasp.dependencycheck:org.owasp.dependencycheck.gradle.plugin [6.3.1 -> 6.5.0.1]
* Upgrade org.reflections:reflections [0.9.12 -> 0.10.2]
* Upgrade org.sonarqube:org.sonarqube.gradle.plugin [3.0 -> 3.3]
* Upgrade org.tmatesoft.svnkit:svnkit [1.10.1 -> 1.10.3]
* Upgrade org.xmlunit:xmlunit-core [2.6.4 -> 2.8.3]
* Upgrade org.xmlunit:xmlunit-matchers [2.6.4 -> 2.8.3]
5 files changed, 44 insertions, 43 deletions
diff --git a/build.gradle b/build.gradle index 042beb69d0a..a7a3655673a 100644 --- a/build.gradle +++ b/build.gradle @@ -2,17 +2,17 @@ import groovy.json.JsonOutput plugins { // Ordered alphabeticly - id 'com.github.ben-manes.versions' version '0.33.0' + id 'com.github.ben-manes.versions' version '0.39.0' id 'com.github.hierynomus.license' version '0.15.0' id "com.github.hierynomus.license-report" version "0.15.0" apply false id 'com.github.johnrengelman.shadow' version '5.2.0' apply false - id 'com.google.protobuf' version '0.8.13' apply false - id 'com.jfrog.artifactory' version '4.21.0' - id 'io.spring.dependency-management' version '1.0.10.RELEASE' - id "com.asarkar.gradle.build-time-tracker" version "2.0.4" apply false - id 'org.owasp.dependencycheck' version '6.3.1' - id 'org.sonarqube' version '3.0' - id "de.undercouch.download" version "4.1.1" apply false + id 'com.google.protobuf' version '0.8.18' apply false + id 'com.jfrog.artifactory' version '4.24.23' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' + id "com.asarkar.gradle.build-time-tracker" version "2.1.0" apply false + id 'org.owasp.dependencycheck' version '6.5.0.1' + id 'org.sonarqube' version '3.3' + id "de.undercouch.download" version "4.1.2" apply false } // display a summary of task durations at the end of the build @@ -175,7 +175,7 @@ subprojects { } ext { - protobufVersion = '3.17.3' + protobufVersion = '3.19.1' // define a method which can be called by project to change Java version to compile to configureCompileJavaToVersion = { javaVersion -> @@ -288,7 +288,7 @@ subprojects { dependency 'org.sonarsource.iac:sonar-iac-plugin:1.4.0.1294' // please keep this list alphabetically ordered - dependencySet(group: 'ch.qos.logback', version: '1.2.3') { + dependencySet(group: 'ch.qos.logback', version: '1.2.7') { entry 'logback-access' entry 'logback-classic' entry 'logback-core' @@ -296,9 +296,9 @@ subprojects { dependency('commons-beanutils:commons-beanutils:1.8.3') { exclude 'commons-logging:commons-logging' } - dependency 'commons-codec:commons-codec:1.14' + dependency 'commons-codec:commons-codec:1.15' dependency 'commons-dbutils:commons-dbutils:1.7' - dependency 'commons-io:commons-io:2.8.0' + dependency 'commons-io:commons-io:2.11.0' dependency 'commons-lang:commons-lang:2.6' imports { mavenBom 'com.fasterxml.jackson:jackson-bom:2.11.4' } dependencySet(group: 'com.fasterxml.jackson.dataformat', version: '2.11.4') { @@ -311,16 +311,16 @@ subprojects { entry 'scribejava-apis' entry 'scribejava-core' } - dependency 'com.github.everit-org.json-schema:org.everit.json.schema:1.12.2' + dependency 'com.github.everit-org.json-schema:org.everit.json.schema:1.14.0' // This project is no longer maintained and was forked // by https://github.com/java-diff-utils/java-diff-utils // (io.github.java-diff-utils:java-diff-utils). - dependency 'com.googlecode.java-diff-utils:diffutils:1.2' + dependency 'com.googlecode.java-diff-utils:diffutils:1.3.0' dependency('com.googlecode.json-simple:json-simple:1.1.1') { exclude 'junit:junit' } dependency 'com.google.code.findbugs:jsr305:3.0.2' - dependency 'com.google.code.gson:gson:2.8.6' + dependency 'com.google.code.gson:gson:2.8.9' dependency('com.google.guava:guava:28.2-jre') { exclude 'com.google.errorprone:error_prone_annotations' exclude 'com.google.guava:listenablefuture' @@ -331,7 +331,7 @@ subprojects { dependency "com.google.protobuf:protobuf-java:${protobufVersion}" // Do not upgrade H2 to 1.4.200 because of instability: https://github.com/h2database/h2database/issues/2205 dependency 'com.h2database:h2:1.4.199' - dependencySet(group: 'com.hazelcast', version: '4.2') { + dependencySet(group: 'com.hazelcast', version: '4.2.2') { entry 'hazelcast' } dependency 'com.hazelcast:hazelcast-kubernetes:2.2.3' @@ -343,7 +343,7 @@ subprojects { // upgrade okhttp3 dependency kotlin to get rid of not exploitable CVE-2020-29582 dependency 'org.jetbrains.kotlin:kotlin-stdlib-common:1.4.21' dependency 'org.jetbrains.kotlin:kotlin-stdlib:1.4.21' - dependencySet(group: 'com.squareup.okhttp3', version: '4.9.0') { + dependencySet(group: 'com.squareup.okhttp3', version: '4.9.3') { entry 'okhttp' entry 'mockwebserver' } @@ -354,20 +354,20 @@ subprojects { entry 'jjwt-impl' entry 'jjwt-jackson' } - dependency 'com.auth0:java-jwt:3.10.3' + dependency 'com.auth0:java-jwt:3.18.2' dependency 'io.netty:netty-all:4.1.70.Final' dependency 'com.sun.mail:javax.mail:1.5.6' dependency 'javax.annotation:javax.annotation-api:1.3.2' dependency 'javax.servlet:javax.servlet-api:3.1.0' dependency 'javax.xml.bind:jaxb-api:2.3.0' - dependency 'junit:junit:4.13.1' - dependency 'org.junit.jupiter:junit-jupiter-api:5.6.0' - dependency 'org.xmlunit:xmlunit-core:2.6.4' - dependency 'org.xmlunit:xmlunit-matchers:2.6.4' + dependency 'junit:junit:4.13.2' + dependency 'org.junit.jupiter:junit-jupiter-api:5.8.1' + dependency 'org.xmlunit:xmlunit-core:2.8.3' + dependency 'org.xmlunit:xmlunit-matchers:2.8.3' dependency 'net.jpountz.lz4:lz4:1.3.0' dependency 'net.lightbody.bmp:littleproxy:1.1.0-beta-bmp-17' - dependency 'org.awaitility:awaitility:4.0.2' - dependency 'org.apache.commons:commons-csv:1.7' + dependency 'org.awaitility:awaitility:4.1.1' + dependency 'org.apache.commons:commons-csv:1.9.0' dependency 'org.apache.commons:commons-email:1.5' dependency 'org.apache.commons:commons-dbcp2:2.9.0' dependency('org.apache.httpcomponents:httpclient:4.5.13'){ @@ -379,14 +379,14 @@ subprojects { entry 'log4j-to-slf4j' entry 'log4j-core' } - dependencySet(group: 'org.apache.tomcat.embed', version: '8.5.72') { + dependencySet(group: 'org.apache.tomcat.embed', version: '8.5.73') { entry 'tomcat-embed-core' entry('tomcat-embed-jasper') { exclude 'org.eclipse.jdt.core.compiler:ecj' } } - dependency 'org.assertj:assertj-core:3.15.0' - dependency 'org.assertj:assertj-guava:3.3.0' + dependency 'org.assertj:assertj-core:3.21.0' + dependency 'org.assertj:assertj-guava:3.4.0' dependency('org.codehaus.sonar:sonar-channel:4.2') { exclude 'org.slf4j:slf4j-api' } @@ -403,15 +403,15 @@ subprojects { dependency 'org.elasticsearch.plugin:transport-netty4-client:7.14.1' dependency 'org.elasticsearch:mocksocket:1.0' dependency 'org.codelibs.elasticsearch.module:analysis-common:7.14.1' - dependency 'org.eclipse.jgit:org.eclipse.jgit:5.11.0.202103091610-r' - dependency 'org.tmatesoft.svnkit:svnkit:1.10.1' + dependency 'org.eclipse.jgit:org.eclipse.jgit:5.13.0.202109080827-r' + dependency 'org.tmatesoft.svnkit:svnkit:1.10.3' dependency 'org.hamcrest:hamcrest-all:1.3' - dependency 'org.jsoup:jsoup:1.13.1' + dependency 'org.jsoup:jsoup:1.14.3' dependency 'org.mindrot:jbcrypt:0.4' - dependency('org.mockito:mockito-core:3.3.3') { + dependency('org.mockito:mockito-core:3.12.4') { exclude 'org.hamcrest:hamcrest-core' } - dependency 'org.mybatis:mybatis:3.5.6' + dependency 'org.mybatis:mybatis:3.5.7' dependency 'org.nanohttpd:nanohttpd:2.3.1' dependency 'org.picocontainer:picocontainer:2.15' dependencySet(group: 'org.slf4j', version: '1.7.30') { @@ -421,7 +421,7 @@ subprojects { entry 'slf4j-api' } dependency 'org.postgresql:postgresql:42.2.19' - dependency 'org.reflections:reflections:0.9.12' + dependency 'org.reflections:reflections:0.10.2' dependency 'org.simpleframework:simple:4.1.21' dependency 'org.sonarsource.orchestrator:sonar-orchestrator:3.35.1.2719' dependency 'org.sonarsource.update-center:sonar-update-center-common:1.23.0.723' diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceLinesDiffFinder.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceLinesDiffFinder.java index 98872444a46..3f382eaff7d 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceLinesDiffFinder.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceLinesDiffFinder.java @@ -35,7 +35,7 @@ public class SourceLinesDiffFinder { int dbLine = left.size(); int reportLine = right.size(); try { - PathNode node = MyersDiff.buildPath(left.toArray(), right.toArray()); + PathNode node = new MyersDiff<String>().buildPath(left, right); while (node.prev != null) { PathNode prevNode = node.prev; diff --git a/server/sonar-main/build.gradle b/server/sonar-main/build.gradle index 2e11dd66e75..7e888f1298e 100644 --- a/server/sonar-main/build.gradle +++ b/server/sonar-main/build.gradle @@ -35,6 +35,6 @@ dependencies { testCompile 'org.awaitility:awaitility' testCompile 'org.mockito:mockito-core' testCompile 'com.squareup.okhttp3:mockwebserver' - testCompile 'commons-logging:commons-logging:1.1.1' + testCompile 'commons-logging:commons-logging:1.2' testCompile project(':sonar-testing-harness') } diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/rule/DefaultRuleFinderTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/rule/DefaultRuleFinderTest.java index 9943549f96a..08094784df4 100644 --- a/server/sonar-server-common/src/test/java/org/sonar/server/rule/DefaultRuleFinderTest.java +++ b/server/sonar-server-common/src/test/java/org/sonar/server/rule/DefaultRuleFinderTest.java @@ -108,10 +108,10 @@ public class DefaultRuleFinderTest { assertThat(underTest.findAll(RuleQuery.create().withRepositoryKey("checkstyle"))).hasSize(2); // find_all_enabled - assertThat(underTest.findAll(RuleQuery.create())).extracting("ruleKey").containsOnly(rule1.getKey(), rule3.getKey(), rule4.getKey()); + assertThat(underTest.findAll(RuleQuery.create())).extracting(Rule::ruleKey).containsOnly(rule1.getKey(), rule3.getKey(), rule4.getKey()); // find_all - assertThat(underTest.findAll()).extracting("ruleKey").containsOnly(rule1.getKey().rule(), rule3.getKey().rule(), rule4.getKey().rule()); + assertThat(underTest.findAll()).extracting(RuleDefinitionDto::getRuleKey).containsOnly(rule1.getKey().rule(), rule3.getKey().rule(), rule4.getKey().rule()); // do_not_find_disabled_rules assertThat(underTest.findByKey("checkstyle", "DisabledCheck")).isNull(); @@ -132,8 +132,8 @@ public class DefaultRuleFinderTest { @Test public void find_all_not_include_removed_rule() { // rule 3 is REMOVED - assertThat(underTest.findAll(RuleQuery.create())).extracting("ruleKey").containsOnly(rule1.getKey(), rule3.getKey(), rule4.getKey()); - assertThat(underTest.findAll()).extracting("ruleKey").containsOnly(rule1.getKey().rule(), rule3.getKey().rule(), rule4.getKey().rule()); + assertThat(underTest.findAll(RuleQuery.create())).extracting(Rule::ruleKey).containsOnly(rule1.getKey(), rule3.getKey(), rule4.getKey()); + assertThat(underTest.findAll()).extracting(RuleDefinitionDto::getRuleKey).containsOnly(rule1.getKey().rule(), rule3.getKey().rule(), rule4.getKey().rule()); } @Test diff --git a/sonar-plugin-api-impl/src/main/java/org/sonar/api/config/internal/MultivalueProperty.java b/sonar-plugin-api-impl/src/main/java/org/sonar/api/config/internal/MultivalueProperty.java index 338aca11c34..255f97067fd 100644 --- a/sonar-plugin-api-impl/src/main/java/org/sonar/api/config/internal/MultivalueProperty.java +++ b/sonar-plugin-api-impl/src/main/java/org/sonar/api/config/internal/MultivalueProperty.java @@ -45,10 +45,11 @@ public class MultivalueProperty { public static String[] parseAsCsv(String key, String value, UnaryOperator<String> valueProcessor) { String cleanValue = MultivalueProperty.trimFieldsAndRemoveEmptyFields(value); List<String> result = new ArrayList<>(); - try (CSVParser csvParser = CSVFormat.RFC4180 - .withHeader((String) null) - .withIgnoreEmptyLines() - .withIgnoreSurroundingSpaces() + try (CSVParser csvParser = CSVFormat.RFC4180.builder() + .setSkipHeaderRecord(true) + .setIgnoreEmptyLines(true) + .setIgnoreSurroundingSpaces(true) + .build() .parse(new StringReader(cleanValue))) { List<CSVRecord> records = csvParser.getRecords(); if (records.isEmpty()) { |