Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Package with the new DownloadOnlyWhenRequired manifest entry #958

Merged
merged 4 commits into from
Feb 11, 2024
Merged

Package with the new DownloadOnlyWhenRequired manifest entry #958

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9337e63
feature: package with the new DownloadOnlyWhenRequired manifest entry
gtoison Feb 2, 2024
515e382
Merge remote-tracking branch 'origin/master' into DownloadOnlyWhenReq…
gtoison Feb 9, 2024
bf16c1b
Enable the downloadOnlyRequired option to see if anything breaks
gtoison Feb 9, 2024
1a84f3d
reverted organize imports
gtoison Feb 10, 2024
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
1 change: 1 addition & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,7 @@
<pluginDescription>Analyze Java, Scala, Closure and JSP code with SpotBugs. ${spotbugs.version}</pluginDescription>
<pluginClass>org.sonar.plugins.findbugs.FindbugsPlugin</pluginClass>
<useChildFirstClassLoader>false</useChildFirstClassLoader>
<requiredForLanguages>java,scala,jsp,clojure,kotlin</requiredForLanguages>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello @agigleux
Would you mind confirming that this is correct? Reading the annoucment post it was not 100% clear to me if I should have the languages here or the file extensions for the corresponding languages (for instance kotlin or kt)

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should be the language keys, so it should be fine like this.

SonarQube 10.4 was released, so it would be great if you could test it with the feature enabled (it is disabled by default in 10.4) to be 100% sure there are no unexpected side effects.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for confirming! The integration tests are now running on SonarQube 10.4 and I've also added this to the orchestrator installing the servers (for the integration tests):
.setServerProperty("sonar.plugins.downloadOnlyRequired", "true")

</configuration>
</plugin>
<plugin>
Expand Down
23 changes: 12 additions & 11 deletions src/test/java/org/sonar/plugins/findbugs/it/FindbugsTestSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,12 @@
*/
package org.sonar.plugins.findbugs.it;

import com.sonar.orchestrator.junit5.OrchestratorExtension;
import com.sonar.orchestrator.junit5.OrchestratorExtensionBuilder;
import com.sonar.orchestrator.locator.FileLocation;
import com.sonar.orchestrator.locator.Location;
import com.sonar.orchestrator.locator.MavenLocation;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.nio.file.FileSystems;
import java.nio.file.Files;

import org.sonarqube.ws.client.HttpConnector;
import org.sonarqube.ws.client.issues.IssuesService;
Expand All @@ -33,12 +34,11 @@
import org.sonarqube.ws.client.qualityprofiles.AddProjectRequest;
import org.sonarqube.ws.client.qualityprofiles.QualityprofilesService;

import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.nio.file.FileSystems;
import java.nio.file.Files;
import com.sonar.orchestrator.junit5.OrchestratorExtension;
import com.sonar.orchestrator.junit5.OrchestratorExtensionBuilder;
import com.sonar.orchestrator.locator.FileLocation;
import com.sonar.orchestrator.locator.Location;
import com.sonar.orchestrator.locator.MavenLocation;

@IntegrationTest
public class FindbugsTestSuite {
Expand All @@ -60,6 +60,7 @@ public class FindbugsTestSuite {
.useDefaultAdminCredentialsForBuilds(true)
.setSonarVersion("LATEST_RELEASE[" + sonarVersion + "]")
.setOrchestratorProperty("orchestrator.artifactory.url", "https://repo1.maven.org/maven2")
.setServerProperty("sonar.plugins.downloadOnlyRequired", "true")
.restoreProfileAtStartup(FileLocation.ofClasspath("/it/profiles/empty-backup.xml"))
.restoreProfileAtStartup(FileLocation.ofClasspath("/it/profiles/findbugs-backup.xml"))
.restoreProfileAtStartup(FileLocation.ofClasspath("/it/profiles/fbcontrib-backup.xml"));
Expand Down
Loading