From 8b0ba3f4b9ec846880766b823447b3a5e0713dc9 Mon Sep 17 00:00:00 2001 From: duncanp-sonar Date: Wed, 17 Nov 2021 20:57:11 +0000 Subject: [PATCH] Update minimum supported SQ version to 7.9 (#168) --- README.md | 5 ++++- ...r-roslyn-sdk-template-plugin-1.2.0.76.jar} | Bin 463206 -> 463207 bytes .../RoslynPluginJarBuilder.cs | 2 +- ...Qube.Plugins.Roslyn.PluginGenerator.csproj | 6 +++--- RoslynPluginGenerator/UIResources.Designer.cs | 4 ++-- RoslynPluginGenerator/UIResources.resx | 2 +- .../IntegrationTests/Roslyn/RoslynGenTests.cs | 2 +- 7 files changed, 12 insertions(+), 9 deletions(-) rename RoslynPluginGenerator/Resources/{sonar-roslyn-sdk-template-plugin-1.2.0.73.jar => sonar-roslyn-sdk-template-plugin-1.2.0.76.jar} (99%) diff --git a/README.md b/README.md index a72acab..291d87e 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,10 @@ The latest release version (v2.0) is available [here](https://github.com/SonarSo ### Compatibility v1.0 of the SDK generates plugins that are compatible with SonarQube v4.5.2 -> v6.7. -v2.0 generates plugins that are compatible versions of SonarQube from v6.7 (tested with the current latest available version, v7.3alpha1). +v2.0 generates plugins that are compatible with versions of SonarQube from v6.7 (tested with the current latest available version, v7.3alpha1). + +v3.0 generates plugins that are compatible with versions of SonarQube from v7.9.6 (tested with the current latest available version, v9.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. diff --git a/RoslynPluginGenerator/Resources/sonar-roslyn-sdk-template-plugin-1.2.0.73.jar b/RoslynPluginGenerator/Resources/sonar-roslyn-sdk-template-plugin-1.2.0.76.jar similarity index 99% rename from RoslynPluginGenerator/Resources/sonar-roslyn-sdk-template-plugin-1.2.0.73.jar rename to RoslynPluginGenerator/Resources/sonar-roslyn-sdk-template-plugin-1.2.0.76.jar index dbefaaf3823cac8fb12e745fa1cc16c3e64ac2fa..0aba3e7e9e52f9fea78133bbf1c40f8f6a2a5f27 100644 GIT binary patch delta 1276 zcmaF1Napz>8J+-dW)?065Lh~6B9AKPk{N};KMJ4rW=*uxtG{{d7~B05;-20?YHB;V zs~K4%i&ST})!#oV;Or$KKjZH9{P|_~?TS>VCCJvYCbx!Za?ZH_w#Rp$ShT_N4?c&g zb5FW2y1movfUL-utm%^qkA60t;J%O5)k$pghTA(=wU+o^%R1V7b?eE80(vjbCpFLA zAj2J>F~VS^^qHAHZX0LzrC=2+tVG5 zTp^5F;te7F+dmuDR_yw`B%&h!TFbu%Hk}mZZ^zC)&sldmNZWh2tdhyw$1n61u6_J& z_jKw4Mec|%rVCsGBl>$-VU?LVJgXM0z~Jf8IJWV@uu@;j1s+(F?lR!_Mj zHF0uvUd+jhS+gv(fH*Z_8M-+NaeAwF*k_efxJ>lJdpU)YV&OCSd*C_ohx>9ZAq+NlbeSsh#EWI5|<=u+N!&eg$p z&)Fl=-l7?k&oL=50jUp6Y9LC2S&wP)jL9C%7C_$SCT0&tAb0Z_7Dh0Ao>h(=#DC9I z$qb^i1d6#q^nK}dEFks$3W1DFOJ_`eq^Jp`nt7GB^C~g^zd)h-bRV|>v^j>auQ$*gFewv%z(qs`ZtAKM3 zlwg5#1Q^~r9%f=-$S+FQ5AbGW5@Cj9u|+ecTkx>U$UKG073b$A7NM&s0IFc*o!-mC zt_bwg^bJ5RlP&Y)`>b-)-|(>W0R1=p7f7reEH-%qGv{=BUZ6NotuHT7{2&WR?c`r9 zLepnM#aDvFkFWy8ZTJxG;a~u25#$5f_GG#qAG;^Wgi0WnDP91mQhoY9K6ZJK*nN=L z73sz_>LqU8SKu#Z})az?Sm-2gO$ISu6ZsF7TQ#|-FV~CsJw&o4i&TJ zZ&iNZnfLq>(|3gzNA*-EcZp{!@Yit9I--+UxV<>g`|0d8#b%%{BSAgq z=%IhrIf~vMo>%&vq#o6q$Fz7#^qp$=58lUiQnm5&T(Sc(!K7hTj`yv+AS!v{yKA zUub1nQne$_=f&N}z6(<1_E<@OXE#YPl-?YkXP?F$Jk8De)?0zhjF!d!SqkUvcbyVG z>6lK6{eHG78eFFf38vioVkTzG2k!|e-vTK9RK+&YzY z=hJJ`V_x5@U90lzx!9JwU)OEdzF@s&O1)TE-kELRqff47@m{7e;kwhSIJJ*2pBz$3 z$(^>G?NVsh`*X6g6Z3!8y-ks*&oA7*tfg!H1@`Rst4%m`I5HQ0cyne054((vxYQi6 zUEh{wb-tUkIx(?wBjfL!(9_?wbpIcj8vXgY&zi2kkwvIKK@1t`0j;>u2f4x#!^R~B5!i(+_)9{(c8D}rJ z_;2~SiJcdmnY(0Hu-hEno4Bf9&u+fOuapic>36|OiHDPO)V3~eu6?EBh!}V$&VE^fmAb}(sn*2#=pEkb~~>DBM>tIG4pg@0~S@F z*me^G7Rdk*!@q$=ED@wC{UHkwvu;m+$fl|V6qw$}&2Eaw8q?2kvs;>M1m+ZQ#(@$n zaE<`OTgO983=H{2>G}cQj7%cTkQ}zLdAcPiLY_e7iu3ali_ldR0#z{aFi(EKD#C}X zc~kTBjUXu-kd)l?w><1TK)+7^4H7GZh?(=Uivq)8x*so4>;MZ$-Q?daLeuB)0@VV= zSAoP2vjW9!v=K&gFl++)gthlwf-*A$!(BE81}nHv7#Nl`KAx`6$L;XvZvh?H+(zesB`5|udyL$*kza*3>c@&889kL&xVRt0!10sr%w}L*HZ+U{^I7_ y^>-5(7``_!Fv!A92l>LOfn|C^1B)C|m~sFeG+j^-XhPI /// Name of the embedded resource that contains the .jar file to update /// - private const string TemplateJarResourceName = "SonarQube.Plugins.Roslyn.Resources.sonar-roslyn-sdk-template-plugin-1.2.0.73.jar"; + private const string TemplateJarResourceName = "SonarQube.Plugins.Roslyn.Resources.sonar-roslyn-sdk-template-plugin-1.2.0.76.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 index 0f47337..0244da0 100644 --- a/RoslynPluginGenerator/SonarQube.Plugins.Roslyn.PluginGenerator.csproj +++ b/RoslynPluginGenerator/SonarQube.Plugins.Roslyn.PluginGenerator.csproj @@ -54,10 +54,10 @@ - + diff --git a/RoslynPluginGenerator/UIResources.Designer.cs b/RoslynPluginGenerator/UIResources.Designer.cs index 3f53cfa..cb1ae31 100644 --- a/RoslynPluginGenerator/UIResources.Designer.cs +++ b/RoslynPluginGenerator/UIResources.Designer.cs @@ -19,7 +19,7 @@ namespace SonarQube.Plugins.Roslyn { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class UIResources { @@ -473,7 +473,7 @@ public static string Program_SupportedRoslynVersion { } /// - /// Looks up a localized string similar to Minimum supported SonarQube version: 6.7 (highest version tested against: 7.3-alpha1). + /// Looks up a localized string similar to Minimum supported SonarQube version: 7.9.6 (highest version tested against: 9.1). /// public static string Program_SupportedSonarQubeVersions { get { diff --git a/RoslynPluginGenerator/UIResources.resx b/RoslynPluginGenerator/UIResources.resx index 6f700bd..2f8f914 100644 --- a/RoslynPluginGenerator/UIResources.resx +++ b/RoslynPluginGenerator/UIResources.resx @@ -260,7 +260,7 @@ The conflict will be ignored. Maximum supported Roslyn version: - Minimum supported SonarQube version: 6.7 (highest version tested against: 7.3-alpha1) + Minimum supported SonarQube version: 7.9.6 (highest version tested against: 9.1) Skipping rule in analyzer {0}: Duplicate key. diff --git a/Tests/IntegrationTests/Roslyn/RoslynGenTests.cs b/Tests/IntegrationTests/Roslyn/RoslynGenTests.cs index 7ff54b2..3f6ffe5 100644 --- a/Tests/IntegrationTests/Roslyn/RoslynGenTests.cs +++ b/Tests/IntegrationTests/Roslyn/RoslynGenTests.cs @@ -402,7 +402,7 @@ private static void AssertPackagePropertiesInManifest(IPackage package, JarManif private static void AssertFixedValuesInManifest(JarManifestReader reader) { - reader.FindValue("Sonar-Version").Should().Be("6.7"); + reader.FindValue("Sonar-Version").Should().Be("7.9"); 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");