Skip to content

Commit aee259d

Browse files
lukasz-jarocki-sonarsourcematteo-mara-sonarsource
authored and
sonartech
committed
NO-JIRA Bump orchestrator and sonar-update-center removing dependencies on transitive commons-lang from sonar-update-center
Co-authored-by: Matteo Mara <[email protected]>
1 parent 647b387 commit aee259d

File tree

16 files changed

+56
-58
lines changed

16 files changed

+56
-58
lines changed

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ subprojects {
535535
dependency 'org.reflections:reflections:0.10.2'
536536
dependency 'org.simpleframework:simple:5.1.6'
537537
dependency 'org.sonarsource.git.blame:git-files-blame:2.0.0.2053'
538-
dependencySet(group: 'org.sonarsource.orchestrator', version: '6.0.1.3892') {
538+
dependencySet(group: 'org.sonarsource.orchestrator', version: '6.0.3.3907') {
539539
entry('sonar-orchestrator-junit4') {
540540
exclude 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml'
541541
}
@@ -548,7 +548,7 @@ subprojects {
548548
dependency "com.sonarsource.pdfreport:security-report-pdf-generation:${pdfreportVersion}"
549549
dependency "com.sonarsource.pdfreport:pdf-generator-utils:${pdfreportVersion}"
550550
dependency 'com.sonarsource.fixsuggestions:ai-suggestions-shared:1.0.0.1775'
551-
dependency 'org.sonarsource.update-center:sonar-update-center-common:1.35.0.2835'
551+
dependency 'org.sonarsource.update-center:sonar-update-center-common:1.36.0.4317'
552552
dependency 'org.sonarsource.classloader:sonar-classloader:1.2.1.2095'
553553
dependency 'org.springdoc:springdoc-openapi-starter-webmvc-api:2.8.13'
554554
dependencySet(group: 'com.icegreen', version: '2.1.7') {

‎server/sonar-db-dao/src/it/java/org/sonar/db/measure/MeasureDaoIT.java‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@
2424
import java.util.Collections;
2525
import java.util.List;
2626
import java.util.Map;
27-
import org.apache.commons.lang.RandomStringUtils;
28-
import org.apache.commons.lang.math.RandomUtils;
27+
import org.apache.commons.lang3.RandomUtils;
2928
import org.apache.ibatis.session.ResultHandler;
3029
import org.junit.jupiter.api.Test;
3130
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -41,7 +40,7 @@
4140

4241
import static java.util.Collections.emptyList;
4342
import static java.util.Collections.singletonList;
44-
import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic;
43+
import static org.apache.commons.lang3.RandomStringUtils.secure;
4544
import static org.assertj.core.api.Assertions.assertThat;
4645
import static org.assertj.core.api.Assertions.entry;
4746
import static org.assertj.core.groups.Tuple.tuple;
@@ -201,8 +200,8 @@ void selectByComponentUuidsAndMetricKeys() {
201200

202201
@Test
203202
void selectByComponentUuidsAndMetricKeys_does_not_use_db_when_no_components() {
204-
String metricKey = randomAlphabetic(7);
205-
newMeasure().addValue(metricKey, randomAlphabetic(11));
203+
String metricKey = secure().nextAlphabetic(7);
204+
newMeasure().addValue(metricKey, secure().nextAlphabetic(11));
206205

207206
DbSession dbSession = mock(DbSession.class);
208207
assertThat(underTest.selectByComponentUuidsAndMetricKeys(dbSession, emptyList(), singletonList(metricKey)))
@@ -220,8 +219,8 @@ void selectByComponentUuidsAndMetricKeys_does_not_use_db_when_no_metrics() {
220219

221220
@Test
222221
void selectByComponentUuidsAndMetricKeys_with_single_component_and_single_metric() {
223-
String metricKey = randomAlphabetic(7);
224-
String value = randomAlphabetic(11);
222+
String metricKey = secure().nextAlphabetic(7);
223+
String value = secure().nextAlphabetic(11);
225224
MeasureDto measure = newMeasure().addValue(metricKey, value);
226225
underTest.insert(db.getSession(), measure);
227226

@@ -233,8 +232,8 @@ void selectByComponentUuidsAndMetricKeys_with_single_component_and_single_metric
233232

234233
@Test
235234
void selectByComponentUuidsAndMetricKeys_with_nonexistent_component_returns_empty() {
236-
String metricKey = randomAlphabetic(7);
237-
String value = randomAlphabetic(11);
235+
String metricKey = secure().nextAlphabetic(7);
236+
String value = secure().nextAlphabetic(11);
238237
MeasureDto measure = newMeasure().addValue(metricKey, value);
239238
underTest.insert(db.getSession(), measure);
240239

@@ -247,8 +246,8 @@ void selectByComponentUuidsAndMetricKeys_with_nonexistent_component_returns_empt
247246

248247
@Test
249248
void selectByComponentUuidsAndMetricKeys_with_nonexistent_metric_returns_empty() {
250-
String metricKey = randomAlphabetic(7);
251-
String value = randomAlphabetic(11);
249+
String metricKey = secure().nextAlphabetic(7);
250+
String value = secure().nextAlphabetic(11);
252251
MeasureDto measure = newMeasure().addValue(metricKey, value);
253252
underTest.insert(db.getSession(), measure);
254253

@@ -273,7 +272,7 @@ void selectByComponentUuidsAndMetricKeys_with_many_components_and_many_metrics()
273272
underTest.insert(db.getSession(),
274273
newMeasure().setComponentUuid(component1)
275274
.addValue(metric1, component1measure1)
276-
.addValue(nonRequestedMetric, randomAlphabetic(7)));
275+
.addValue(nonRequestedMetric, secure().nextAlphabetic(7)));
277276

278277
String component2 = "component2";
279278
String component2measure1 = "component2measure1";
@@ -282,11 +281,11 @@ void selectByComponentUuidsAndMetricKeys_with_many_components_and_many_metrics()
282281
newMeasure().setComponentUuid(component2)
283282
.addValue(metric1, component2measure1)
284283
.addValue(metric2, component2measure2)
285-
.addValue(nonRequestedMetric, randomAlphabetic(7)));
284+
.addValue(nonRequestedMetric, secure().nextAlphabetic(7)));
286285

287286
String nonRequestedComponent = "nonRequestedComponent";
288287
underTest.insert(db.getSession(),
289-
newMeasure().setComponentUuid(nonRequestedComponent).addValue(metric1, randomAlphabetic(7)));
288+
newMeasure().setComponentUuid(nonRequestedComponent).addValue(metric1, secure().nextAlphabetic(7)));
290289

291290
List<MeasureDto> measureDtos = underTest.selectByComponentUuidsAndMetricKeys(
292291
db.getSession(), Arrays.asList(component1, component2), Arrays.asList(metric1, metric2));
@@ -371,7 +370,7 @@ void selectTreeByQuery_return_children_and_several_measures() {
371370

372371
ComponentDto branch = db.components().insertPrivateProject().getMainBranchComponent();
373372

374-
ComponentDto dir = db.components().insertComponent(newDirectory(branch, RandomStringUtils.randomAlphabetic(15)));
373+
ComponentDto dir = db.components().insertComponent(newDirectory(branch, secure().nextAlphabetic(15)));
375374
MeasureDto measureOnDirectory = newMeasureForMetrics(dir, metric1, metric2);
376375

377376
ComponentDto file1 = db.components().insertComponent(newFileDto(dir));
@@ -498,7 +497,7 @@ void findNclocOfBiggestBranch() {
498497

499498
private MeasureDto newMeasureForMetrics(ComponentDto componentDto, MetricDto... metrics) {
500499
return db.measures().insertMeasure(componentDto,
501-
m -> Arrays.stream(metrics).forEach(metric -> m.addValue(metric.getKey(), RandomUtils.nextInt(50))));
500+
m -> Arrays.stream(metrics).forEach(metric -> m.addValue(metric.getKey(), RandomUtils.secure().randomInt(0,50))));
502501
}
503502

504503
private void verifyTableSize(int expectedSize) {
@@ -512,6 +511,6 @@ private void verifyPersisted(MeasureDto dto) {
512511
}
513512

514513
private static double getDoubleValue() {
515-
return RandomUtils.nextInt(100);
514+
return RandomUtils.secure().randomInt(0,100);
516515
}
517516
}

‎server/sonar-db-dao/src/it/java/org/sonar/db/purge/PurgeDaoIT.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import java.util.stream.IntStream;
4141
import java.util.stream.Stream;
4242
import org.apache.commons.io.IOUtils;
43-
import org.apache.commons.lang.math.RandomUtils;
43+
import org.apache.commons.lang3.RandomUtils;
4444
import org.apache.commons.lang3.time.DateUtils;
4545
import org.junit.jupiter.api.Test;
4646
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -330,13 +330,13 @@ void close_issues_clean_index_and_file_sources_of_disabled_components_specified_
330330
MetricDto metric2 = db.measures().insertMetric();
331331

332332
db.measures().insertMeasure(srcFile,
333-
m -> m.addValue(metric1.getKey(), RandomUtils.nextInt(50)).addValue(metric2.getKey(), RandomUtils.nextInt(50)));
333+
m -> m.addValue(metric1.getKey(), RandomUtils.secure().randomInt(0, 50)).addValue(metric2.getKey(), RandomUtils.secure().randomInt(0, 50)));
334334
db.measures().insertMeasure(dir,
335-
m -> m.addValue(metric1.getKey(), RandomUtils.nextInt(50)).addValue(metric2.getKey(), RandomUtils.nextInt(50)));
335+
m -> m.addValue(metric1.getKey(), RandomUtils.secure().randomInt(0, 50)).addValue(metric2.getKey(), RandomUtils.secure().randomInt(0, 50)));
336336
db.measures().insertMeasure(mainBranch,
337-
m -> m.addValue(metric1.getKey(), RandomUtils.nextInt(50)).addValue(metric2.getKey(), RandomUtils.nextInt(50)));
337+
m -> m.addValue(metric1.getKey(), RandomUtils.secure().randomInt(0, 50)).addValue(metric2.getKey(), RandomUtils.secure().randomInt(0, 50)));
338338
db.measures().insertMeasure(enabledFile,
339-
m -> m.addValue(metric1.getKey(), RandomUtils.nextInt(50)).addValue(metric2.getKey(), RandomUtils.nextInt(50)));
339+
m -> m.addValue(metric1.getKey(), RandomUtils.secure().randomInt(0, 50)).addValue(metric2.getKey(), RandomUtils.secure().randomInt(0, 50)));
340340
assertThat(db.countRowsOfTable("measures")).isEqualTo(4);
341341

342342
// back to present
@@ -1727,13 +1727,13 @@ void delete_measures_when_deleting_project() {
17271727

17281728
ComponentDto project1 = db.components().insertPublicProject().getMainBranchComponent();
17291729
ComponentDto dir1 = db.components().insertComponent(newDirectory(project1, "path"));
1730-
db.measures().insertMeasure(project1, m -> m.addValue(metric.getKey(), RandomUtils.nextInt(50)));
1731-
db.measures().insertMeasure(dir1, m -> m.addValue(metric.getKey(), RandomUtils.nextInt(50)));
1730+
db.measures().insertMeasure(project1, m -> m.addValue(metric.getKey(), RandomUtils.secure().randomInt(0, 50)));
1731+
db.measures().insertMeasure(dir1, m -> m.addValue(metric.getKey(), RandomUtils.secure().randomInt(0, 50)));
17321732

17331733
ComponentDto project2 = db.components().insertPublicProject().getMainBranchComponent();
17341734
ComponentDto dir2 = db.components().insertComponent(newDirectory(project2, "path"));
1735-
db.measures().insertMeasure(project2, m -> m.addValue(metric.getKey(), RandomUtils.nextInt(50)));
1736-
db.measures().insertMeasure(dir2, m -> m.addValue(metric.getKey(), RandomUtils.nextInt(50)));
1735+
db.measures().insertMeasure(project2, m -> m.addValue(metric.getKey(), RandomUtils.secure().randomInt(0, 50)));
1736+
db.measures().insertMeasure(dir2, m -> m.addValue(metric.getKey(), RandomUtils.secure().randomInt(0, 50)));
17371737

17381738
underTest.deleteProject(dbSession, project1.uuid(), project1.qualifier(), project1.name(), project1.getKey());
17391739

‎server/sonar-db-dao/src/main/java/org/sonar/db/ce/CeScannerContextDao.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import java.util.Set;
3232
import java.util.stream.Collectors;
3333
import org.apache.commons.io.IOUtils;
34-
import org.apache.commons.lang.StringUtils;
34+
import org.apache.commons.lang3.StringUtils;
3535
import org.sonar.api.utils.System2;
3636
import org.sonar.core.util.CloseableIterator;
3737
import org.sonar.db.Dao;

‎server/sonar-db-dao/src/test/java/org/sonar/db/measure/MeasureDtoTest.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,44 +23,44 @@
2323
import java.util.Map;
2424
import java.util.TreeMap;
2525
import java.util.function.BiFunction;
26-
import org.apache.commons.lang.math.RandomUtils;
26+
import org.apache.commons.lang3.RandomUtils;
2727
import org.junit.jupiter.api.Test;
2828
import org.junit.jupiter.params.ParameterizedTest;
2929
import org.junit.jupiter.params.provider.MethodSource;
3030

31-
import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic;
31+
import static org.apache.commons.lang3.RandomStringUtils.secure;
3232
import static org.assertj.core.api.Assertions.assertThat;
3333

3434
class MeasureDtoTest {
3535

3636
@Test
3737
void getDouble_returns_double_value() {
38-
String metricKey = randomAlphabetic(7);
39-
double value = RandomUtils.nextDouble();
38+
String metricKey = secure().nextAlphabetic(7);
39+
double value = RandomUtils.secure().randomDouble();
4040
MeasureDto measureDto = new MeasureDto().addValue(metricKey, value);
4141
assertThat(measureDto.getDouble(metricKey)).isEqualTo(value);
4242
}
4343

4444
@Test
4545
void getInt_returns_int_value() {
46-
String metricKey = randomAlphabetic(7);
47-
int value = RandomUtils.nextInt();
46+
String metricKey = secure().nextAlphabetic(7);
47+
int value = RandomUtils.secure().randomInt();
4848
MeasureDto measureDto = new MeasureDto().addValue(metricKey, value);
4949
assertThat(measureDto.getInt(metricKey)).isEqualTo(value);
5050
}
5151

5252
@Test
5353
void getLong_returns_long_value() {
54-
String metricKey = randomAlphabetic(7);
55-
long value = RandomUtils.nextInt();
54+
String metricKey = secure().nextAlphabetic(7);
55+
long value = RandomUtils.secure().randomInt();
5656
MeasureDto measureDto = new MeasureDto().addValue(metricKey, value);
5757
assertThat(measureDto.getLong(metricKey)).isEqualTo(value);
5858
}
5959

6060
@ParameterizedTest
6161
@MethodSource("valuesOfDifferentTypes")
6262
void getString_returns_string_value(Object value) {
63-
String metricKey = randomAlphabetic(7);
63+
String metricKey = secure().nextAlphabetic(7);
6464
MeasureDto measureDto = new MeasureDto().addValue(metricKey, value);
6565
assertThat(measureDto.getString(metricKey)).isEqualTo(String.valueOf(value));
6666
}
@@ -72,7 +72,7 @@ private static List<Object> valuesOfDifferentTypes() {
7272
@ParameterizedTest
7373
@MethodSource("gettersOfDifferentTypes")
7474
void getters_return_null_for_nonexistent_metric(BiFunction<MeasureDto, String, Object> getter) {
75-
String metricKey = randomAlphabetic(7);
75+
String metricKey = secure().nextAlphabetic(7);
7676
MeasureDto measureDto = new MeasureDto();
7777
assertThat(getter.apply(measureDto, metricKey)).isNull();
7878
}

‎server/sonar-db-dao/src/testFixtures/java/org/sonar/db/user/UserTesting.java‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,10 @@
2323
import java.util.Locale;
2424
import java.util.Random;
2525
import javax.annotation.Nullable;
26+
import org.apache.commons.lang3.RandomUtils;
2627

2728
import static java.util.Collections.emptyList;
2829
import static java.util.Collections.singletonList;
29-
import static org.apache.commons.lang.math.RandomUtils.nextBoolean;
30-
import static org.apache.commons.lang.math.RandomUtils.nextInt;
3130
import static org.apache.commons.lang3.RandomStringUtils.secure;
3231

3332
public class UserTesting {
@@ -40,7 +39,7 @@ public static UserDto newUserDto() {
4039
return new UserDto()
4140
.setUuid(secure().nextAlphanumeric(40))
4241
.setActive(true)
43-
.setLocal(RANDOM.nextBoolean())
42+
.setLocal(RandomUtils.secure().randomBoolean())
4443
.setLogin(secure().nextAlphanumeric(30))
4544
.setName(secure().nextAlphanumeric(30))
4645
.setEmail(secure().nextAlphanumeric(30))
@@ -57,11 +56,11 @@ public static UserDto newUserDto() {
5756
public static UserDto newUserDtoRealistic() {
5857
long timeNow = System.currentTimeMillis();
5958
String loginAndAndId = secure().nextAlphanumeric(30);
60-
String realisticIdentityProvider = realisticIdentityProviders[nextInt(realisticIdentityProviders.length)];
61-
boolean isExternal = nextBoolean();
59+
String realisticIdentityProvider = realisticIdentityProviders[RandomUtils.secure().randomInt(0, realisticIdentityProviders.length)];
60+
boolean isExternal = RandomUtils.secure().randomBoolean();
6261
String externalIdAndLogin = isExternal ? loginAndAndId + "_" + realisticIdentityProvider : loginAndAndId;
6362
return new UserDto().setUuid(secure().nextAlphanumeric(40))
64-
.setActive(nextBoolean())
63+
.setActive(RandomUtils.secure().randomBoolean())
6564
.setLocal(!isExternal)
6665
.setLogin(loginAndAndId)
6766
.setName(loginAndAndId + " " + loginAndAndId)
@@ -76,9 +75,9 @@ public static UserDto newUserDtoRealistic() {
7675
.setCryptedPassword("100000$arHk2+TbNYyFeUgAsDBz7O5M+W0Y3NKJGgvz0KsURHzfXaTXlLT0WYI3DWwXOgHLgyFidVJ4HF22h7zbJoaa8g==")
7776
.setCreatedAt(timeNow)
7877
.setUpdatedAt(timeNow)
79-
.setLastConnectionDate(nextBoolean() ? timeNow : null)
80-
.setResetPassword(nextBoolean() && nextBoolean() && nextBoolean())
81-
.setHomepageParameter(nextInt(10) + "")
78+
.setLastConnectionDate(RandomUtils.secure().randomBoolean() ? timeNow : null)
79+
.setResetPassword(RandomUtils.secure().randomBoolean() && RandomUtils.secure().randomBoolean() && RandomUtils.secure().randomBoolean())
80+
.setHomepageParameter(RandomUtils.secure().randomInt(0,10) + "")
8281
.setHomepageType("projects");
8382
}
8483

‎server/sonar-webserver-common/src/main/java/org/sonar/server/common/email/config/EmailConfigurationService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import java.util.List;
2323
import java.util.Optional;
2424
import javax.annotation.Nullable;
25-
import org.apache.commons.lang.StringUtils;
25+
import org.apache.commons.lang3.StringUtils;
2626
import org.sonar.api.server.ServerSide;
2727
import org.sonar.db.DbClient;
2828
import org.sonar.db.DbSession;

‎server/sonar-webserver-common/src/main/java/org/sonar/server/common/github/config/GithubConfigurationService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import java.util.Set;
2626
import java.util.stream.Collectors;
2727
import javax.annotation.Nullable;
28-
import org.apache.commons.lang.StringUtils;
28+
import org.apache.commons.lang3.StringUtils;
2929
import org.sonar.alm.client.github.GithubGlobalSettingsValidator;
3030
import org.sonar.api.server.ServerSide;
3131
import org.sonar.auth.github.GitHubIdentityProvider;

‎server/sonar-webserver-webapi-v2/src/main/java/org/sonar/server/v2/api/analysis/service/JresHandlerImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import org.sonar.server.v2.common.model.OS;
4141
import org.springframework.beans.factory.annotation.Autowired;
4242

43-
import static org.apache.commons.lang.StringUtils.isBlank;
43+
import static org.apache.commons.lang3.StringUtils.isBlank;
4444
import static org.sonar.core.config.CorePropertyDefinitions.DISABLE_JRE_AUTO_PROVISIONING;
4545

4646
public class JresHandlerImpl implements JresHandler {

‎server/sonar-webserver-webapi-v2/src/main/java/org/sonar/server/v2/api/email/config/controller/DefaultEmailConfigurationController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
package org.sonar.server.v2.api.email.config.controller;
2121

2222
import java.util.List;
23-
import org.apache.commons.lang.StringUtils;
23+
import org.apache.commons.lang3.StringUtils;
2424
import org.sonar.server.common.email.config.EmailConfiguration;
2525
import org.sonar.server.common.email.config.EmailConfigurationAuthMethod;
2626
import org.sonar.server.common.email.config.EmailConfigurationSecurityProtocol;

0 commit comments

Comments
 (0)