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
5 changes: 3 additions & 2 deletions batch/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
<name>SonarScanner Java Library - Batch</name>

<properties>
<sonarQubeVersion>26.4.0.121862</sonarQubeVersion>
<sonarQubeVersion>26.10.0.133078</sonarQubeVersion>
<sonarScannerEngineVersion>26.4.0.121862</sonarScannerEngineVersion>
</properties>

<dependencies>
Expand All @@ -24,7 +25,7 @@
<dependency>
<groupId>org.sonarsource.sonarqube</groupId>
<artifactId>sonar-scanner-engine</artifactId>
<version>${sonarQubeVersion}</version>
<version>${sonarScannerEngineVersion}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
Expand Down
2 changes: 1 addition & 1 deletion its/it-simple-scanner/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>2.0.13</version>
<version>2.0.20</version>
</dependency>
</dependencies>

Expand Down
6 changes: 3 additions & 3 deletions its/it-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<properties>
<jetty.version>10.0.26</jetty.version>
<logback.version>1.5.34</logback.version>
<logback.version>1.6.5</logback.version>
<sonar.skip>true</sonar.skip>
<skipTests>true</skipTests>
</properties>
Expand All @@ -28,7 +28,7 @@
<dependency>
<groupId>org.sonarsource.orchestrator</groupId>
<artifactId>sonar-orchestrator-junit4</artifactId>
<version>6.4.3.4676</version>
<version>6.4.4.4797</version>
<scope>test</scope>
</dependency>

Expand Down Expand Up @@ -90,7 +90,7 @@
<dependency>
<groupId>org.wiremock</groupId>
<artifactId>wiremock-standalone</artifactId>
<version>3.10.0</version>
<version>3.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
16 changes: 13 additions & 3 deletions lib-shaded/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<!-- Explicit version: not managed by the SonarSource parent -->
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>9.10.1</version>
<version>9.11</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -154,8 +154,10 @@
<exclude>org.bouncycastle.pkcs12.max_it_count</exclude>
<exclude>org.bouncycastle.pkcs12.allow_sun_secret_keys</exclude>
<exclude>org.bouncycastle.pkcs12.default</exclude>
<exclude>org.bouncycastle.pkcs12.store_it_count</exclude>
<exclude>org.bouncycastle.x509.crl_cache_ttl</exclude>
<exclude>org.bouncycastle.x509.enableCRLDP</exclude>
<exclude>org.bouncycastle.x509.CRLDP_protocols</exclude>
<exclude>org.bouncycastle.x509.max_policy_nodes</exclude>
<exclude>org.bouncycastle.x509.max_cert_path_build_nodes</exclude>
<exclude>org.bouncycastle.x509.sgp22_name_constraints</exclude>
Expand All @@ -175,6 +177,7 @@
<exclude>org.bouncycastle.drbg.entropy_thread</exclude>
<exclude>org.bouncycastle.drbg.gather_pause_secs</exclude>
<exclude>org.bouncycastle.asn1.allow_non_der_time</exclude>
<exclude>org.bouncycastle.asn1.allow_zoneless_utctime</exclude>
<exclude>org.bouncycastle.asn1.max_cons_depth</exclude>
<exclude>org.bouncycastle.asn1.max_limit</exclude>
<exclude>org.bouncycastle.asn1.allow_unsafe_integer</exclude>
Expand All @@ -184,6 +187,7 @@
<exclude>org.bouncycastle.dsa.max_size</exclude>
<exclude>org.bouncycastle.dsa.FIPS186-2for1024bits</exclude>
<exclude>org.bouncycastle.bcfks.max_it_count</exclude>
<exclude>org.bouncycastle.bcfks.store_it_count</exclude>
<exclude>org.bouncycastle.bcfks.max_scrypt_memory</exclude>
<exclude>org.bouncycastle.pbe.max_iteration_count</exclude>
<exclude>org.bouncycastle.pbe.max_scrypt_memory</exclude>
Expand All @@ -209,6 +213,11 @@
<exclude>org.bouncycastle.argon2.max_parallelism</exclude>
<exclude>org.bouncycastle.pemreader.lax</exclude>
<exclude>org.bouncycastle.constraints.allow_override</exclude>
<exclude>org.bouncycastle.openpgp.max_armor_header_length</exclude>
<exclude>org.bouncycastle.openpgp.max_armor_headers</exclude>
<exclude>org.bouncycastle.openssh.max_rounds</exclude>
<exclude>org.bouncycastle.ocsp.max_response_size</exclude>
<exclude>org.bouncycastle.mime.max_depth</exclude>
</excludes>
</relocation>
</relocations>
Expand All @@ -225,7 +234,8 @@
copies of module-info.class. bcprov-jdk18on is different: its META-INF/versions/{17,25} carry
classes with no base-tree counterpart, registered by always-loaded base Mappings classes -
KEM.ML-KEM (versions/17 MLKEMSpi) and the JCE KDF services KDF.PBKDF2*/HKDF-* (versions/25
PBKDF2Spi/HKDFSpi). Dropping them means the shaded provider would advertise those algorithms
PBKDF2Spi/HKDFSpi), plus SM9KEMSpi in versions/17 starting with bcprov 1.86.
Dropping them means the shaded provider would advertise those algorithms
but fail to instantiate them (NoSuchAlgorithmException) on a JDK new enough to activate them -
accepted here because this module only ever uses BouncyCastle to load a PKCS12 keystore
(HttpClientFactory/ScannerEngineLauncher), never ML-KEM or the public KDF.* services.
Expand Down Expand Up @@ -308,7 +318,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<!-- Explicit version: unlike surefire, not pinned by the SonarSource parent's pluginManagement -->
<version>3.5.2</version>
<version>3.6.0</version>
<executions>
<execution>
<goals>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,8 @@ private static Set<String> collectRealNames(Path jar) throws IOException {
if (entry.isDirectory()) {
continue;
}
String path = entry.getName();
// Multi-release entries use the same class/resource names as their base-tree counterparts.
String path = entry.getName().replaceFirst("^META-INF/versions/[0-9]+/", "");
int lastSlash = path.lastIndexOf('/');
int lastDotInFileName = path.substring(lastSlash + 1).lastIndexOf('.');
String withoutExtension = lastDotInFileName < 0 ? path : path.substring(0, lastSlash + 1 + lastDotInFileName);
Expand Down
4 changes: 2 additions & 2 deletions lib/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@
<dependency>
<groupId>io.github.hakky54</groupId>
<artifactId>ayza</artifactId>
<version>10.0.3</version>
<version>10.1.0</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
<version>1.85.2</version>
<version>1.86</version>
Comment thread
gitar-bot[bot] marked this conversation as resolved.
</dependency>
<dependency>
<groupId>de.siegmar</groupId>
Expand Down
12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@

<!-- used for deployment to SonarSource Artifactory -->
<gitRepositoryName>sonar-scanner-java-library</gitRepositoryName>
<mockito.version>5.22.0</mockito.version>
<mockito.version>5.24.0</mockito.version>
<!-- Don't update to slf4j 2 to continue supporting the Scanner for Maven with Maven < 4 -->
<slf4j.version>1.7.36</slf4j.version>
</properties>
Expand All @@ -65,12 +65,12 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.20.0</version>
<version>3.21.0</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.21.0</version>
<version>2.22.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand All @@ -80,7 +80,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.13.2</version>
<version>2.14.0</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
Expand All @@ -90,7 +90,7 @@
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>6.0.3</version>
<version>6.1.3</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -112,7 +112,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.21.0</version>
<version>1.23.0</version>
</dependency>
<dependency>
<groupId>de.siegmar</groupId>
Expand Down
Loading