From f981e4b1bc61612721b9abb99aa1d142e1edba59 Mon Sep 17 00:00:00 2001 From: Pavel Mikula Date: Mon, 19 Jun 2023 13:12:24 +0200 Subject: [PATCH 1/5] Align names for sonar analyzer commons --- pom.xml | 2 +- sonar-csharp-plugin/pom.xml | 2 +- sonar-dotnet-shared-library/pom.xml | 2 +- sonar-vbnet-plugin/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 3ad8df2e5f9..b479e084234 100644 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,7 @@ ${project.groupId}:SonarAnalyzer.CSharp:nupkg,${project.groupId}:SonarAnalyzer.VisualBasic:nupkg none - 2.5.0.1358 + 2.5.0.1358 9.17.0.587 10.0.0.68432 11 diff --git a/sonar-csharp-plugin/pom.xml b/sonar-csharp-plugin/pom.xml index b356274ef36..85f7d4c56ee 100644 --- a/sonar-csharp-plugin/pom.xml +++ b/sonar-csharp-plugin/pom.xml @@ -69,7 +69,7 @@ org.sonarsource.analyzer-commons sonar-analyzer-commons - ${sonar.analyzer.commons} + ${sonar.analyzer.commons.version} diff --git a/sonar-dotnet-shared-library/pom.xml b/sonar-dotnet-shared-library/pom.xml index ff01bb8142e..d58faab5d59 100644 --- a/sonar-dotnet-shared-library/pom.xml +++ b/sonar-dotnet-shared-library/pom.xml @@ -51,7 +51,7 @@ org.sonarsource.analyzer-commons sonar-analyzer-commons - ${sonar.analyzer.commons} + ${sonar.analyzer.commons.version} org.sonarsource.analyzer-commons diff --git a/sonar-vbnet-plugin/pom.xml b/sonar-vbnet-plugin/pom.xml index 169ccb942c8..9270314b369 100644 --- a/sonar-vbnet-plugin/pom.xml +++ b/sonar-vbnet-plugin/pom.xml @@ -69,7 +69,7 @@ org.sonarsource.analyzer-commons sonar-analyzer-commons - ${sonar.analyzer.commons} + ${sonar.analyzer.commons.version} From 20e8dc2b27f92f0653f5201d0f7b2b783a368ff1 Mon Sep 17 00:00:00 2001 From: Pavel Mikula Date: Mon, 19 Jun 2023 13:14:35 +0200 Subject: [PATCH 2/5] Findbugs --- pom.xml | 1 + sonar-csharp-plugin/pom.xml | 2 +- sonar-dotnet-shared-library/pom.xml | 2 +- sonar-vbnet-plugin/pom.xml | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index b479e084234..3e0a4bc9ff9 100644 --- a/pom.xml +++ b/pom.xml @@ -62,6 +62,7 @@ 10.0.0.68432 11 ${jdk.min.version} + 3.0.2 2.0.7 32.0.0-jre diff --git a/sonar-csharp-plugin/pom.xml b/sonar-csharp-plugin/pom.xml index 85f7d4c56ee..979f120605d 100644 --- a/sonar-csharp-plugin/pom.xml +++ b/sonar-csharp-plugin/pom.xml @@ -56,7 +56,7 @@ com.google.code.findbugs jsr305 - 3.0.2 + ${findbugs.version} provided diff --git a/sonar-dotnet-shared-library/pom.xml b/sonar-dotnet-shared-library/pom.xml index d58faab5d59..dd0bcfb4e9f 100644 --- a/sonar-dotnet-shared-library/pom.xml +++ b/sonar-dotnet-shared-library/pom.xml @@ -33,7 +33,7 @@ com.google.code.findbugs jsr305 - 3.0.2 + ${findbugs.version} provided diff --git a/sonar-vbnet-plugin/pom.xml b/sonar-vbnet-plugin/pom.xml index 9270314b369..3a99faa1674 100644 --- a/sonar-vbnet-plugin/pom.xml +++ b/sonar-vbnet-plugin/pom.xml @@ -56,7 +56,7 @@ com.google.code.findbugs jsr305 - 3.0.2 + ${findbugs.version} provided From dddc058c7d86f8c0820df141891667302525ab8c Mon Sep 17 00:00:00 2001 From: Pavel Mikula Date: Mon, 19 Jun 2023 13:18:23 +0200 Subject: [PATCH 3/5] commons.lang --- pom.xml | 7 ++++--- sonar-csharp-plugin/pom.xml | 2 +- sonar-dotnet-shared-library/pom.xml | 4 ++-- sonar-vbnet-plugin/pom.xml | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 3e0a4bc9ff9..98ec2ec38ca 100644 --- a/pom.xml +++ b/pom.xml @@ -61,15 +61,16 @@ 9.17.0.587 10.0.0.68432 11 - ${jdk.min.version} 3.0.2 + ${jdk.min.version} 2.0.7 32.0.0-jre - 1.4.8 - 4.13.2 3.24.2 + 2.6 + 4.13.2 + 1.4.8 diff --git a/sonar-csharp-plugin/pom.xml b/sonar-csharp-plugin/pom.xml index 979f120605d..73ba23ffd80 100644 --- a/sonar-csharp-plugin/pom.xml +++ b/sonar-csharp-plugin/pom.xml @@ -94,7 +94,7 @@ commons-lang commons-lang - 2.6 + ${commons.lang.version} test diff --git a/sonar-dotnet-shared-library/pom.xml b/sonar-dotnet-shared-library/pom.xml index dd0bcfb4e9f..612065ba8e9 100644 --- a/sonar-dotnet-shared-library/pom.xml +++ b/sonar-dotnet-shared-library/pom.xml @@ -56,7 +56,7 @@ org.sonarsource.analyzer-commons sonar-xml-parsing - ${sonar.analyzer.commons} + ${sonar.analyzer.commons.version} @@ -69,7 +69,7 @@ commons-lang commons-lang - 2.6 + ${commons.lang.version} test diff --git a/sonar-vbnet-plugin/pom.xml b/sonar-vbnet-plugin/pom.xml index 3a99faa1674..7623cda0a7c 100644 --- a/sonar-vbnet-plugin/pom.xml +++ b/sonar-vbnet-plugin/pom.xml @@ -94,7 +94,7 @@ commons-lang commons-lang - 2.6 + ${commons.lang.version} test From b3fd0dc30e0bc1ee90a4443d7884ddfc8219d379 Mon Sep 17 00:00:00 2001 From: Pavel Mikula Date: Mon, 19 Jun 2023 13:19:31 +0200 Subject: [PATCH 4/5] mockito --- pom.xml | 1 + sonar-csharp-plugin/pom.xml | 2 +- sonar-dotnet-shared-library/pom.xml | 2 +- sonar-vbnet-plugin/pom.xml | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 98ec2ec38ca..b913d15c85e 100644 --- a/pom.xml +++ b/pom.xml @@ -71,6 +71,7 @@ 2.6 4.13.2 1.4.8 + 5.3.1 diff --git a/sonar-csharp-plugin/pom.xml b/sonar-csharp-plugin/pom.xml index 73ba23ffd80..94ec6bc3205 100644 --- a/sonar-csharp-plugin/pom.xml +++ b/sonar-csharp-plugin/pom.xml @@ -100,7 +100,7 @@ org.mockito mockito-core - 5.3.1 + ${mockito.version} test diff --git a/sonar-dotnet-shared-library/pom.xml b/sonar-dotnet-shared-library/pom.xml index 612065ba8e9..642453724ae 100644 --- a/sonar-dotnet-shared-library/pom.xml +++ b/sonar-dotnet-shared-library/pom.xml @@ -93,7 +93,7 @@ org.mockito mockito-core - 5.3.1 + ${mockito.version} test diff --git a/sonar-vbnet-plugin/pom.xml b/sonar-vbnet-plugin/pom.xml index 7623cda0a7c..d51d4f12199 100644 --- a/sonar-vbnet-plugin/pom.xml +++ b/sonar-vbnet-plugin/pom.xml @@ -100,7 +100,7 @@ org.mockito mockito-core - 5.3.1 + ${mockito.version} test From b2b7ba392182b356a3952bc96fc08104530f23f6 Mon Sep 17 00:00:00 2001 From: Pavel Mikula Date: Mon, 19 Jun 2023 13:22:05 +0200 Subject: [PATCH 5/5] stax --- pom.xml | 2 ++ sonar-csharp-plugin/pom.xml | 4 ++-- sonar-vbnet-plugin/pom.xml | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index b913d15c85e..fa1a1f8f37a 100644 --- a/pom.xml +++ b/pom.xml @@ -72,6 +72,8 @@ 4.13.2 1.4.8 5.3.1 + 4.2.1 + 2.0.1 diff --git a/sonar-csharp-plugin/pom.xml b/sonar-csharp-plugin/pom.xml index 94ec6bc3205..9c1ee24fc92 100644 --- a/sonar-csharp-plugin/pom.xml +++ b/sonar-csharp-plugin/pom.xml @@ -112,7 +112,7 @@ org.codehaus.woodstox stax2-api - 4.2.1 + ${stax2.api.version} stax @@ -124,7 +124,7 @@ org.codehaus.staxmate staxmate - 2.0.1 + ${staxmate.version} org.codehaus.woodstox diff --git a/sonar-vbnet-plugin/pom.xml b/sonar-vbnet-plugin/pom.xml index d51d4f12199..3036bee35a4 100644 --- a/sonar-vbnet-plugin/pom.xml +++ b/sonar-vbnet-plugin/pom.xml @@ -112,7 +112,7 @@ org.codehaus.woodstox stax2-api - 4.2.1 + ${stax2.api.version} stax @@ -124,7 +124,7 @@ org.codehaus.staxmate staxmate - 2.0.1 + ${staxmate.version} org.codehaus.woodstox