Skip to content

Commit cd0e2c8

Browse files
Merge branch 'master' into fix/category-html-rendering-26053
2 parents e03d0e5 + d002ad0 commit cd0e2c8

File tree

7 files changed

+16
-13
lines changed

7 files changed

+16
-13
lines changed

bom/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ THE SOFTWARE.
4141
<commons-fileupload2.version>2.0.0-M4</commons-fileupload2.version>
4242
<groovy.version>2.4.21</groovy.version>
4343
<jelly.version>1.1-jenkins-20250731</jelly.version>
44-
<stapler.version>2061.v3949245133a_f</stapler.version>
44+
<stapler.version>2065.v7db_c1fcf0a_d0</stapler.version>
4545
</properties>
4646

4747
<dependencyManagement>
@@ -260,7 +260,7 @@ THE SOFTWARE.
260260
<dependency>
261261
<groupId>org.jenkins-ci</groupId>
262262
<artifactId>version-number</artifactId>
263-
<version>1.12</version>
263+
<version>1.14</version>
264264
</dependency>
265265
<dependency>
266266
<groupId>org.jenkins-ci.main</groupId>

core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ THE SOFTWARE.
4040

4141
<properties>
4242
<!-- Minimum Remoting version, which is tested for API compatibility, duplicated so that renovate only updates the latest remoting version property -->
43-
<remoting.minimum.supported.version>3107.v665000b_51092</remoting.minimum.supported.version>
43+
<remoting.minimum.supported.version>3176.v207ec082a_8c0</remoting.minimum.supported.version>
4444
<!-- Filled in by jacoco-maven-plugin -->
4545
<jacocoSurefireArgs />
4646
</properties>

core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,11 +363,14 @@ private String getErrorMessages(SignupInfo si) {
363363
* This can be run by anyone, but only to create the very first user account.
364364
*/
365365
@RequirePOST
366-
public void doCreateFirstAccount(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
366+
public synchronized void doCreateFirstAccount(StaplerRequest2 req, StaplerResponse2 rsp)
367+
throws IOException, ServletException {
368+
367369
if (hasSomeUser()) {
368370
rsp.sendError(SC_UNAUTHORIZED, "First user was already created");
369371
return;
370372
}
373+
371374
User u = createAccount(req, rsp, false, "firstUser.jelly");
372375
if (u != null) {
373376
tryToMakeAdmin(u);

core/src/main/java/jenkins/telemetry/impl/JavaSystemProperties.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@ public String getDisplayName() {
7070
@NonNull
7171
@Override
7272
public LocalDate getStart() {
73-
return LocalDate.of(2023, 12, 17);
73+
return LocalDate.of(2026, 1, 4);
7474
}
7575

7676
@NonNull
7777
@Override
7878
public LocalDate getEnd() {
79-
return LocalDate.of(2024, 4, 1);
79+
return LocalDate.of(2026, 4, 1);
8080
}
8181

8282
@Override

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ THE SOFTWARE.
281281
<dependency>
282282
<groupId>com.puppycrawl.tools</groupId>
283283
<artifactId>checkstyle</artifactId>
284-
<version>12.3.0</version>
284+
<version>12.3.1</version>
285285
</dependency>
286286
</dependencies>
287287
<executions>

test/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ THE SOFTWARE.
3939
<properties>
4040
<mavenDebug>false</mavenDebug>
4141
<!-- Minimum Remoting version, which is tested for API compatibility, duplicated so that renovate only updates the latest remoting version property -->
42-
<remoting.minimum.supported.version>3107.v665000b_51092</remoting.minimum.supported.version>
42+
<remoting.minimum.supported.version>3176.v207ec082a_8c0</remoting.minimum.supported.version>
4343
<!-- Filled in by jacoco-maven-plugin -->
4444
<jacocoSurefireArgs />
4545
<!--
@@ -238,7 +238,7 @@ THE SOFTWARE.
238238
<dependency>
239239
<groupId>org.jenkins-ci.plugins</groupId>
240240
<artifactId>credentials</artifactId>
241-
<version>1453.v9b_a_29777a_b_fd</version>
241+
<version>1460.v48765a_c7d849</version>
242242
<scope>test</scope>
243243
</dependency>
244244
<dependency>

war/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ THE SOFTWARE.
4848
<port>8080</port>
4949
<mina-sshd-api.version>2.16.0-167.va_269f38cc024</mina-sshd-api.version>
5050
<!-- Minimum Remoting version, which is tested for API compatibility, duplicated so that renovate only updates the latest remoting version property -->
51-
<remoting.minimum.supported.version>3107.v665000b_51092</remoting.minimum.supported.version>
51+
<remoting.minimum.supported.version>3176.v207ec082a_8c0</remoting.minimum.supported.version>
5252

5353
</properties>
5454

@@ -346,7 +346,7 @@ THE SOFTWARE.
346346
<!-- dependency of junit -->
347347
<groupId>io.jenkins.plugins</groupId>
348348
<artifactId>checks-api</artifactId>
349-
<version>373.vfe7645102093</version>
349+
<version>402.vca_263b_f200e3</version>
350350
<type>hpi</type>
351351
</artifactItem>
352352
<artifactItem>
@@ -397,7 +397,7 @@ THE SOFTWARE.
397397
<!-- dependency of jackson2-api -->
398398
<groupId>io.jenkins.plugins</groupId>
399399
<artifactId>jakarta-xml-bind-api</artifactId>
400-
<version>4.0.6-10.v9b_7e1d1fc40b_</version>
400+
<version>4.0.6-12.vb_1833c1231d3</version>
401401
<type>hpi</type>
402402
</artifactItem>
403403

@@ -471,7 +471,7 @@ THE SOFTWARE.
471471
<!-- detached after 2.163 -->
472472
<groupId>io.jenkins.plugins</groupId>
473473
<artifactId>jaxb</artifactId>
474-
<version>2.3.9-133.vb_ec76a_73f706</version>
474+
<version>2.3.9-143.v5979df3304e6</version>
475475
<type>hpi</type>
476476
</artifactItem>
477477
<artifactItem>

0 commit comments

Comments
 (0)