Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version=26.1
# No change required for patch versions
versionEOL=2026-06-08
pdfreportVersion=3.0.0.83
complianceReportsVersion=0.0.1.2515
complianceReportsVersion=1.0.1.171
pluginApiVersion=13.4.3.4290
description=Open source platform for continuous inspection of code quality
projectTitle=SonarQube
Expand Down
2 changes: 1 addition & 1 deletion server/sonar-ce/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies {
api 'com.google.guava:guava'
api 'com.google.protobuf:protobuf-java'
api 'com.hazelcast:hazelcast'
api "com.sonarsource.sonarcloud:compliance-reports:${complianceReportsVersion}"
api "org.sonarsource.compliancereports:compliance-reports:${complianceReportsVersion}"
api 'commons-io:commons-io'
api 'com.zaxxer:HikariCP'
api 'org.sonarsource.api.plugin:sonar-plugin-api'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
package org.sonar.ce.container;

import com.google.common.annotations.VisibleForTesting;
import io.sonarcloud.compliancereports.ingestion.IssueIngestionService;
import org.sonarsource.compliancereports.ingestion.IssueIngestionService;
import java.time.Clock;
import java.util.List;
import javax.annotation.CheckForNull;
Expand Down
3 changes: 1 addition & 2 deletions server/sonar-db-dao/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ dependencies {

compileOnlyApi 'com.github.spotbugs:spotbugs-annotations'

implementation "com.sonarsource.sonarcloud:compliance-reports:${complianceReportsVersion}"
implementation "com.sonarsource.sonarcloud:compliance-reports-metadata:${complianceReportsVersion}"
implementation "org.sonarsource.compliancereports:compliance-reports:${complianceReportsVersion}"

testImplementation 'commons-dbutils:commons-dbutils'
testImplementation 'org.assertj:assertj-core'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
*/
package org.sonar.db.report;

import io.sonarcloud.compliancereports.dao.AggregationType;
import io.sonarcloud.compliancereports.dao.IssueStats;
import org.sonarsource.compliancereports.dao.AggregationType;
import org.sonarsource.compliancereports.dao.IssueStats;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
Expand All @@ -29,7 +29,7 @@
import org.sonar.api.utils.System2;
import org.sonar.db.DbTester;

import static io.sonarcloud.compliancereports.dao.AggregationType.PROJECT;
import static org.sonarsource.compliancereports.dao.AggregationType.PROJECT;
import static org.assertj.core.api.Assertions.tuple;
import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.Lists;
import io.sonarcloud.compliancereports.dao.AggregationType;
import org.sonarsource.compliancereports.dao.AggregationType;
import java.util.Collection;
import java.util.List;
import javax.annotation.Nullable;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*/
package org.sonar.db.purge;

import io.sonarcloud.compliancereports.dao.AggregationType;
import org.sonarsource.compliancereports.dao.AggregationType;
import java.util.Collection;
import java.util.Comparator;
import java.util.Date;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
*/
package org.sonar.db.report;

import io.sonarcloud.compliancereports.dao.AggregationType;
import io.sonarcloud.compliancereports.dao.IssueStats;
import io.sonarcloud.compliancereports.dao.IssueStatsByRuleKeyDao;
import org.sonarsource.compliancereports.dao.AggregationType;
import org.sonarsource.compliancereports.dao.IssueStats;
import org.sonarsource.compliancereports.dao.IssueStatsByRuleKeyDao;
import java.util.List;
import org.sonar.db.DbClient;
import org.sonar.db.DbSession;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*/
package org.sonar.db.report;

import io.sonarcloud.compliancereports.dao.IssueStats;
import org.sonarsource.compliancereports.dao.IssueStats;
import java.util.List;
import org.apache.ibatis.annotations.Param;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
hotspots_reviewed as hotspotsReviewed
</sql>

<select id="selectByAggregationId" parameterType="map" resultType="io.sonarcloud.compliancereports.dao.IssueStats">
<select id="selectByAggregationId" parameterType="map" resultType="org.sonarsource.compliancereports.dao.IssueStats">
select
<include refid="IssueStatsColumns"/>
from issue_stats_by_rule_key
where aggregation_id = #{aggregationId}
and aggregation_type = #{aggregationType}
</select>

<select id="selectByAggregationIds" parameterType="map" resultType="io.sonarcloud.compliancereports.dao.IssueStats">
<select id="selectByAggregationIds" parameterType="map" resultType="org.sonarsource.compliancereports.dao.IssueStats">
select
<include refid="IssueStatsColumns"/>
from issue_stats_by_rule_key
Expand Down
4 changes: 2 additions & 2 deletions server/sonar-server-common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ dependencies {
api project(':sonar-ws')

implementation project(':server:sonar-statemachine')
implementation "com.sonarsource.sonarcloud:compliance-reports:${complianceReportsVersion}"
implementation "org.sonarsource.compliancereports:compliance-reports:${complianceReportsVersion}"

compileOnlyApi 'com.github.spotbugs:spotbugs-annotations'

Expand Down Expand Up @@ -61,7 +61,7 @@ dependencies {
testImplementation project(':sonar-plugin-api-impl')
testImplementation project(':sonar-testing-harness')

testFixturesApi "com.sonarsource.sonarcloud:compliance-reports:${complianceReportsVersion}"
testFixturesApi "org.sonarsource.compliancereports:compliance-reports:${complianceReportsVersion}"
testFixturesApi 'junit:junit'
testFixturesApi testFixtures(project(':server:sonar-db-dao'))

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
package org.sonar.server.rule.index;

import com.google.common.collect.Sets;
import io.sonarcloud.compliancereports.reports.CategoryTree;
import io.sonarcloud.compliancereports.reports.ComplianceCategoryRules;
import org.sonarsource.compliancereports.reports.CategoryTree;
import org.sonarsource.compliancereports.reports.ComplianceCategoryRules;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
*/
package org.sonar.server.compliance;

import io.sonarcloud.compliancereports.dao.ActiveRuleDao;
import io.sonarcloud.compliancereports.dao.AggregationType;
import org.sonarsource.compliancereports.dao.ActiveRuleDao;
import org.sonarsource.compliancereports.dao.AggregationType;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
*/
package org.sonar.server.issue;

import io.sonarcloud.compliancereports.dao.AggregationType;
import io.sonarcloud.compliancereports.dao.IssueStats;
import io.sonarcloud.compliancereports.ingestion.IssueFromAnalysis;
import io.sonarcloud.compliancereports.ingestion.IssueIngestionService;
import org.sonarsource.compliancereports.dao.AggregationType;
import org.sonarsource.compliancereports.dao.IssueStats;
import org.sonarsource.compliancereports.ingestion.IssueFromAnalysis;
import org.sonarsource.compliancereports.ingestion.IssueIngestionService;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
package org.sonar.server.issue;

import com.google.common.collect.ImmutableSet;
import io.sonarcloud.compliancereports.reports.ReportKey;
import org.sonarsource.compliancereports.reports.ReportKey;
import java.util.Collection;
import java.util.List;
import java.util.Map;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
import co.elastic.clients.elasticsearch._types.query_dsl.Query;
import co.elastic.clients.util.NamedValue;
import com.google.common.base.Joiner;
import io.sonarcloud.compliancereports.reports.ComplianceCategoryRules;
import io.sonarcloud.compliancereports.reports.RepositoryRuleKey;
import org.sonarsource.compliancereports.reports.ComplianceCategoryRules;
import org.sonarsource.compliancereports.reports.RepositoryRuleKey;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
package org.sonar.server.rule.index;

import com.google.common.base.Preconditions;
import io.sonarcloud.compliancereports.reports.ComplianceCategoryRules;
import org.sonarsource.compliancereports.reports.ComplianceCategoryRules;
import java.util.Collection;
import javax.annotation.CheckForNull;
import javax.annotation.Nullable;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
*/
package org.sonar.server.issue;

import io.sonarcloud.compliancereports.dao.AggregationType;
import io.sonarcloud.compliancereports.ingestion.IssueIngestionService;
import org.sonarsource.compliancereports.dao.AggregationType;
import org.sonarsource.compliancereports.ingestion.IssueIngestionService;
import java.util.List;
import java.util.Set;
import java.util.function.Consumer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*/
package org.sonar.server;

import io.sonarcloud.compliancereports.reports.metadata.MetadataType;
import org.sonarsource.compliancereports.reports.metadata.MetadataType;

public class TestMetadataType implements MetadataType {
@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*/
package org.sonar.server;

import io.sonarcloud.compliancereports.reports.metadata.MetadataType;
import org.sonarsource.compliancereports.reports.metadata.MetadataType;

public class TestMetadataType2 implements MetadataType {
@Override
Expand Down
2 changes: 1 addition & 1 deletion server/sonar-webserver-es/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dependencies {
compileOnlyApi 'com.github.spotbugs:spotbugs-annotations'
compileOnlyApi 'jakarta.servlet:jakarta.servlet-api'

implementation "com.sonarsource.sonarcloud:compliance-reports:${complianceReportsVersion}"
implementation "org.sonarsource.compliancereports:compliance-reports:${complianceReportsVersion}"

testImplementation 'org.apache.logging.log4j:log4j-api'
testImplementation 'org.apache.logging.log4j:log4j-core'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@

import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList;
import io.sonarcloud.compliancereports.reports.MetadataRules;
import io.sonarcloud.compliancereports.reports.ComplianceCategoryRules;
import io.sonarcloud.compliancereports.reports.ReportKey;
import org.sonarsource.compliancereports.reports.MetadataRules;
import org.sonarsource.compliancereports.reports.ComplianceCategoryRules;
import org.sonarsource.compliancereports.reports.ReportKey;
import java.time.Clock;
import java.time.DateTimeException;
import java.time.OffsetDateTime;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
*/
package org.sonar.server.issue.index;

import io.sonarcloud.compliancereports.reports.MetadataLoader;
import io.sonarcloud.compliancereports.reports.MetadataRules;
import io.sonarcloud.compliancereports.reports.ReportKey;
import org.sonarsource.compliancereports.reports.MetadataLoader;
import org.sonarsource.compliancereports.reports.MetadataRules;
import org.sonarsource.compliancereports.reports.ReportKey;
import java.time.Clock;
import java.time.ZoneId;
import java.time.ZoneOffset;
Expand Down
2 changes: 1 addition & 1 deletion server/sonar-webserver-webapi/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies {
implementation 'com.github.erosb:json-sKema'
api 'io.prometheus:simpleclient_common'
api 'io.prometheus:simpleclient_servlet'
implementation "com.sonarsource.sonarcloud:compliance-reports:${complianceReportsVersion}"
implementation "org.sonarsource.compliancereports:compliance-reports:${complianceReportsVersion}"
implementation 'org.apache.commons:commons-text'

api project(':server:sonar-ce-common')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
*/
package org.sonar.server.hotspot.ws;

import io.sonarcloud.compliancereports.dao.AggregationType;
import io.sonarcloud.compliancereports.dao.IssueStats;
import org.sonarsource.compliancereports.dao.AggregationType;
import org.sonarsource.compliancereports.dao.IssueStats;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
*/
package org.sonar.server.issue.ws;

import io.sonarcloud.compliancereports.dao.AggregationType;
import io.sonarcloud.compliancereports.dao.IssueStats;
import org.sonarsource.compliancereports.dao.AggregationType;
import org.sonarsource.compliancereports.dao.IssueStats;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.IntStream;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
*/
package org.sonar.server.issue.ws;

import io.sonarcloud.compliancereports.reports.MetadataLoader;
import io.sonarcloud.compliancereports.reports.MetadataRules;
import org.sonarsource.compliancereports.reports.MetadataLoader;
import org.sonarsource.compliancereports.reports.MetadataRules;
import java.time.Clock;
import java.util.Arrays;
import java.util.Date;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
package org.sonar.server.issue.ws;

import com.google.common.collect.ImmutableMap;
import io.sonarcloud.compliancereports.reports.MetadataLoader;
import io.sonarcloud.compliancereports.reports.MetadataRules;
import org.sonarsource.compliancereports.reports.MetadataLoader;
import org.sonarsource.compliancereports.reports.MetadataRules;
import java.time.Clock;
import java.util.List;
import java.util.Map;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
import com.google.common.collect.Sets;
import com.google.gson.JsonElement;
import com.google.gson.JsonParser;
import io.sonarcloud.compliancereports.reports.MetadataLoader;
import io.sonarcloud.compliancereports.reports.MetadataRules;
import org.sonarsource.compliancereports.reports.MetadataLoader;
import org.sonarsource.compliancereports.reports.MetadataRules;
import java.time.Clock;
import java.util.Arrays;
import java.util.Collections;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
package org.sonar.server.qualityprofile.ws;

import com.google.common.collect.ImmutableSet;
import io.sonarcloud.compliancereports.reports.MetadataLoader;
import io.sonarcloud.compliancereports.reports.MetadataRules;
import org.sonarsource.compliancereports.reports.MetadataLoader;
import org.sonarsource.compliancereports.reports.MetadataRules;
import java.util.Collections;
import java.util.Optional;
import java.util.Set;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
*/
package org.sonar.server.rule.ws;

import io.sonarcloud.compliancereports.reports.ComplianceCategoryRules;
import io.sonarcloud.compliancereports.reports.MetadataLoader;
import io.sonarcloud.compliancereports.reports.MetadataRules;
import io.sonarcloud.compliancereports.reports.RepositoryRuleKey;
import org.sonarsource.compliancereports.reports.ComplianceCategoryRules;
import org.sonarsource.compliancereports.reports.MetadataLoader;
import org.sonarsource.compliancereports.reports.MetadataRules;
import org.sonarsource.compliancereports.reports.RepositoryRuleKey;
import java.util.Set;
import org.junit.Rule;
import org.junit.Test;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
*/
package org.sonar.server.rule.ws;

import io.sonarcloud.compliancereports.reports.MetadataLoader;
import io.sonarcloud.compliancereports.reports.MetadataRules;
import org.sonarsource.compliancereports.reports.MetadataLoader;
import org.sonarsource.compliancereports.reports.MetadataRules;
import java.time.Clock;
import java.time.Instant;
import java.time.OffsetDateTime;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*/
package org.sonar.server.common;

import io.sonarcloud.compliancereports.reports.ReportKey;
import org.sonarsource.compliancereports.reports.ReportKey;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
*/
package org.sonar.server.hotspot.ws;

import io.sonarcloud.compliancereports.dao.AggregationType;
import io.sonarcloud.compliancereports.dao.IssueStats;
import org.sonarsource.compliancereports.dao.AggregationType;
import org.sonarsource.compliancereports.dao.IssueStats;
import java.util.Objects;
import javax.annotation.CheckForNull;
import javax.annotation.Nullable;
Expand All @@ -46,7 +46,7 @@
import org.sonar.server.pushapi.hotspots.HotspotChangedEvent;

import static com.google.common.base.Preconditions.checkArgument;
import static io.sonarcloud.compliancereports.dao.AggregationType.PROJECT;
import static org.sonarsource.compliancereports.dao.AggregationType.PROJECT;
import static org.apache.commons.lang3.StringUtils.trimToNull;
import static org.sonar.api.issue.Issue.RESOLUTION_ACKNOWLEDGED;
import static org.sonar.api.issue.Issue.RESOLUTION_FIXED;
Expand Down
Loading