Skip to content

Commit 6a2340c

Browse files
authored
More adjustments backing off newer code. (#1094)
* [pom] More adjustments and drop sonar plugin back to version 4. * [test] Bring up to date * [pom] Few more adjustments * [pom] More adjustments and drop back to see if we can get tests to work
1 parent 5a1c268 commit 6a2340c

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
include:
2424
# 9.9 LTS
2525
- SONAR_SERVER_VERSION: 9.9.7.96285
26-
SONAR_PLUGIN_API_VERSION: 9.17.0.587
26+
SONAR_PLUGIN_API_VERSION: 9.14.0.375
2727
SONAR_SERVER_JAVA_VERSION: 17
2828
# 10.x
2929
- SONAR_SERVER_VERSION: 10.7.0.96327

.github/workflows/sonarqube.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
env:
3131
# previous LTS version
3232
SONAR_SERVER_VERSION: 9.9.7.96285
33-
SONAR_PLUGIN_API_VERSION: 9.17.0.587
33+
SONAR_PLUGIN_API_VERSION: 9.14.0.375
3434
SONAR_TOKEN: $SONAR_TOKEN
3535
steps:
3636
- name: Decide the ref to check out

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<surefire.version>3.5.2</surefire.version>
6060
<failsafe.version>3.5.2</failsafe.version>
6161
<sonar.server.version>9.9.7.96285</sonar.server.version>
62-
<sonar-plugin-api.version>9.17.0.587</sonar-plugin-api.version>
62+
<sonar-plugin-api.version>9.14.0.375</sonar-plugin-api.version>
6363
<sonar-java.version>8.6.0.37351</sonar-java.version>
6464

6565
<sonar-orchestrator.version>5.0.0.2065</sonar-orchestrator.version>
@@ -76,7 +76,7 @@
7676
<dependency>
7777
<groupId>org.sonarsource.api.plugin</groupId>
7878
<artifactId>sonar-plugin-api</artifactId>
79-
<version>9.17.0.587</version>
79+
<version>9.14.0.375</version>
8080
</dependency>
8181
</dependencies>
8282
</dependencyManagement>

src/smoke-test/smoke-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ function run_smoke_test() {
2121
echo SonarQube has been launched.
2222

2323
count=0
24-
until mvn compile org.eclipse.jetty.ee8:jetty-ee8-jspc-maven-plugin:12.0.15:jspc org.sonarsource.scanner.maven:sonar-maven-plugin:5.0.0.4389:sonar -B -Dmaven.test.skip -Dsonar.profile="FindBugs + FB-Contrib" -Dsonar.host.url=http://sonarqube:9000 -Dsonar.login=admin -Dsonar.password=admin; do
24+
until mvn compile org.eclipse.jetty.ee8:jetty-ee8-jspc-maven-plugin:12.0.15:jspc org.sonarsource.scanner.maven:sonar-maven-plugin:4.0.0.41219:sonar -B -Dmaven.test.skip -Dsonar.profile="FindBugs + FB-Contrib" -Dsonar.host.url=http://sonarqube:9000 -Dsonar.login=admin -Dsonar.password=admin; do
2525
count=$[ $count + 1 ]
2626
if [ $count -ge 5 ]; then
2727
echo Sonar fails to scan 5 times!

src/test/java/org/sonar/plugins/findbugs/it/FindbugsTestSuite.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public class FindbugsTestSuite {
5454

5555
OrchestratorExtensionBuilder orchestratorBuilder = OrchestratorExtension.builderEnv()
5656
// Build the SonarQube server with an older version of the plugin
57-
.addPlugin(MavenLocation.of("com.github.spotbugs", "sonar-findbugs-plugin", "4.0.6"))
57+
.addPlugin(MavenLocation.of("com.github.spotbugs", "sonar-findbugs-plugin", "4.3.0"))
5858
.keepBundledPlugins()
5959
// Since SQ 9.8 permissions for 'Anyone' group has been limited for new instances
6060
.useDefaultAdminCredentialsForBuilds(true)
@@ -72,7 +72,7 @@ public class FindbugsTestSuite {
7272
File pluginTargetFile = new File(ORCHESTRATOR.getServer().getHome(), "extensions/plugins/sonar-findbugs-plugin.jar");
7373
try (OutputStream out = new FileOutputStream(pluginTargetFile)) {
7474
// Delete the old version of the plugin
75-
Files.delete(ORCHESTRATOR.getServer().getHome().toPath().resolve("extensions/plugins/sonar-findbugs-plugin-4.0.6.jar"));
75+
Files.delete(ORCHESTRATOR.getServer().getHome().toPath().resolve("extensions/plugins/sonar-findbugs-plugin-4.3.0.jar"));
7676
Files.copy(FileSystems.getDefault().getPath("target", "sonar-findbugs-plugin.jar"), out);
7777
} catch (IOException e) {
7878
throw new RuntimeException(e);

0 commit comments

Comments
 (0)