Update template plugin to 1.3.0.1139 (#216)

SonarSource · May 16, 2024 · 5ada8bd · 5ada8bd
1 parent 3cc7f1e
commit 5ada8bd
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -41,6 +41,8 @@ v3.0 generates plugins that are compatible with versions of SonarQube from v7.9.
 
 v3.1 generates plugins that are compatible with versions of SonarQube from v7.9.6 (tested with the latest available version at time of release i.e. v9.7).
 
+v4.0 generates plugins that are compatible with versions of SonarQube from v9.9 (tested with the latest available version at time of release i.e. v10.5.1).
+
 If you have an existing plugin that was generated with v1.0 of the SDK and want to use the plugin with SonarQube 7.0 or later, you will need to create a new plugin using v2.0 of the SDK. If you customized the _SQALE.xml_ file for your v1.0 plugin, you will need to move the remediation information to the _rules.xml_ file for the v2.0 plugin.
 
 #### Changes between v1.0 and v2.0

diff --git a/RoslynPluginGenerator/Resources/sonar-roslyn-sdk-template-plugin-1.2.0.76.jar b/RoslynPluginGenerator/Resources/sonar-roslyn-sdk-template-plugin-1.2.0.76.jar
diff --git a/RoslynPluginGenerator/Resources/sonar-roslyn-sdk-template-plugin-1.3.0.1139.jar b/RoslynPluginGenerator/Resources/sonar-roslyn-sdk-template-plugin-1.3.0.1139.jar
diff --git a/RoslynPluginGenerator/RoslynPluginJarBuilder.cs b/RoslynPluginGenerator/RoslynPluginJarBuilder.cs
@@ -34,7 +34,7 @@ public class RoslynPluginJarBuilder
         /// <summary>
         /// Name of the embedded resource that contains the .jar file to update
         /// </summary>
-        private const string TemplateJarResourceName = "SonarQube.Plugins.Roslyn.Resources.sonar-roslyn-sdk-template-plugin-1.2.0.76.jar";
+        private const string TemplateJarResourceName = "SonarQube.Plugins.Roslyn.Resources.sonar-roslyn-sdk-template-plugin-1.3.0.1139.jar";
 
         // Locations in the jar archive where various file should be embedded.
         // Using forward-slash since that is the separator used by Java for archive entry names.

diff --git a/RoslynPluginGenerator/SonarQube.Plugins.Roslyn.PluginGenerator.csproj b/RoslynPluginGenerator/SonarQube.Plugins.Roslyn.PluginGenerator.csproj
@@ -50,11 +50,7 @@
   </ItemGroup>
 
   <ItemGroup Label="Embedded jar file">
-    <!-- Corresponsds to the following commit:
-
-      https://github.com/SonarSource/sonarqube-roslyn-sdk-template-plugin/commit/6e4dd88878f40a44231365494db768a7af3e6096
-    -->
-    <EmbeddedResource Include="Resources\sonar-roslyn-sdk-template-plugin-1.2.0.76.jar" />
+    <EmbeddedResource Include="Resources\sonar-roslyn-sdk-template-plugin-1.3.0.1139.jar" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Tests/IntegrationTests/Roslyn/RoslynGenTests.cs b/Tests/IntegrationTests/Roslyn/RoslynGenTests.cs
@@ -93,7 +93,7 @@ public void RoslynPlugin_GenerateForDependencyAnalyzers_Succeeds()
             // Act
             NuGetPackageHandler nuGetHandler = new NuGetPackageHandler(fakeRemotePkgMgr.LocalRepository, localPackageDestination, logger);
             AnalyzerPluginGenerator apg = new AnalyzerPluginGenerator(nuGetHandler, logger);
-            ProcessedArgs args = new ProcessedArgs(targetPkg.Id, targetPkg.Version, "cs", null, false, 
+            ProcessedArgs args = new ProcessedArgs(targetPkg.Id, targetPkg.Version, "cs", null, false,
                 true /* generate plugins for dependencies with analyzers*/, outputDir, null);
             bool result = apg.Generate(args);
 
@@ -399,13 +399,13 @@ private static void AssertPackagePropertiesInManifest(IPackage package, JarManif
             manifestReader.FindValue("Plugin-Developers").Should().Be(String.Join(",", package.Authors));
             manifestReader.FindValue("Plugin-TermsConditionsUrl").Should().Be(package.LicenseUrl.ToString());
         }
-        
+
         private static void AssertFixedValuesInManifest(JarManifestReader reader)
         {
-            reader.FindValue("Sonar-Version").Should().Be("7.9");
+            reader.FindValue("Sonar-Version").Should().Be("9.14.0.375");
             reader.FindValue("Plugin-Class").Should().Be("org.sonar.plugins.roslynsdk.RoslynSdkGeneratedPlugin");
             reader.FindValue("SonarLint-Supported").Should().Be("false");
-            reader.FindValue("Plugin-Dependencies").Should().Be("META-INF/lib/jsr305-1.3.9.jar META-INF/lib/commons-io-2.6.jar META-INF/lib/stax2-api-3.1.4.jar META-INF/lib/staxmate-2.0.1.jar META-INF/lib/stax-api-1.0.1.jar");
+            reader.FindValue("Plugin-Dependencies").Should().Be("META-INF/lib/jsr305-3.0.2.jar META-INF/lib/staxmate-2.4.1.jar META-INF/lib/stax2-api-4.2.1.jar META-INF/lib/commons-io-2.16.1.jar");
         }
 
         private void CheckEmbeddedAnalyzerPayload(ZipFileChecker jarChecker, string staticResourceName,