Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: spring-projects/spring-boot
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.3.9
Choose a base ref
...
head repository: spring-projects/spring-boot
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v3.3.10
Choose a head ref

Commits on Feb 20, 2025

  1. Copy the full SHA
    70e0744 View commit details

Commits on Feb 22, 2025

  1. Fix typo

    snicoll committed Feb 22, 2025
    Copy the full SHA
    7ca2713 View commit details
  2. Adapt reference to JooqExceptionTranslator

    This commit updates the reference guide as JooqExceptionTranslator has
    been superseded by ExceptionTranslatorExecuteListener.
    
    See gh-44385
    
    Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
    ngocnhan-tran1996 authored and snicoll committed Feb 22, 2025
    Copy the full SHA
    c211b05 View commit details
  3. Merge pull request #44385 from ngocnhan-tran1996

    * pr/44385:
      Adapt reference to JooqExceptionTranslator
    
    Closes gh-44385
    snicoll committed Feb 22, 2025
    Copy the full SHA
    58a9280 View commit details
  4. Clarify which Mongo properties are ignored when URI property is set

    See gh-44384
    
    Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
    nosan authored and snicoll committed Feb 22, 2025
    Copy the full SHA
    2f288bf View commit details
  5. Polish contribution

    snicoll committed Feb 22, 2025
    Copy the full SHA
    7fd1955 View commit details
  6. Merge pull request #44384 from nosan

    * pr/44384:
      Polish contribution
      Clarify which Mongo properties are ignored when URI property is set
    
    Closes gh-44384
    snicoll committed Feb 22, 2025
    Copy the full SHA
    acfdd11 View commit details
  7. Consider properties on outer class in nested @DataJpaTest tests

    See gh-44348
    
    Signed-off-by: Bernie Schelberg <bernard.schelberg@invicara.com>
    bernie-schelberg-invicara authored and snicoll committed Feb 22, 2025
    Copy the full SHA
    b9438be View commit details
  8. Polish contribution

    snicoll committed Feb 22, 2025
    Copy the full SHA
    2a94ee1 View commit details
  9. Merge pull request #44348 from bernie-schelberg-invicara

    * pr/44348:
      Polish contribution
      Consider properties on outer class in nested @DataJpaTest tests
    
    Closes gh-44348
    snicoll committed Feb 22, 2025
    Copy the full SHA
    b711489 View commit details
  10. Use Javadoc attributes for Gradle reference guide

    See gh-44388
    
    Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
    ngocnhan-tran1996 authored and snicoll committed Feb 22, 2025
    Copy the full SHA
    d781ce1 View commit details
  11. Merge pull request #44388 from ngocnhan-tran1996

    * pr/44388:
      Use Javadoc attributes for Gradle reference guide
    
    Closes gh-44388
    snicoll committed Feb 22, 2025
    Copy the full SHA
    7247570 View commit details

Commits on Feb 24, 2025

  1. Polish

    See gh-44323
    
    Signed-off-by: Johnny Lim <izeye@naver.com>
    izeye authored and snicoll committed Feb 24, 2025
    Copy the full SHA
    332ad7b View commit details
  2. Update copyright of changed files

    snicoll committed Feb 24, 2025
    Copy the full SHA
    bf1dc09 View commit details
  3. Merge pull request #44323 from izeye

    * pr/44323:
      Update copyright of changed files
      Polish
    
    Closes gh-44323
    snicoll committed Feb 24, 2025
    Copy the full SHA
    e6b2193 View commit details
  4. Fix typo in fold attribute

    See gh-44413
    
    Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
    ngocnhan-tran1996 authored and snicoll committed Feb 24, 2025
    Copy the full SHA
    ae2cfeb View commit details
  5. Update copyright of changed files

    snicoll committed Feb 24, 2025
    Copy the full SHA
    41656bf View commit details
  6. Merge pull request #44413 from ngocnhan-tran1996

    * pr/44413:
      Update copyright of changed files
      Fix typo in fold attribute
    
    Closes gh-44413
    snicoll committed Feb 24, 2025
    Copy the full SHA
    def70a1 View commit details

Commits on Feb 25, 2025

  1. Add a project icon for IntelliJ IDEA

    See gh-44424
    
    Signed-off-by: Johnny Lim <izeye@naver.com>
    izeye authored and snicoll committed Feb 25, 2025
    Copy the full SHA
    c498fcb View commit details
  2. Merge pull request #44424 from izeye

    * pr/44424:
      Add a project icon for IntelliJ IDEA
    
    Closes gh-44424
    snicoll committed Feb 25, 2025
    Copy the full SHA
    59c0036 View commit details

Commits on Feb 26, 2025

  1. Copy the full SHA
    453002b View commit details
  2. Copy the full SHA
    abf320d View commit details
  3. Copy the full SHA
    3acea58 View commit details
  4. Copy the full SHA
    56c9551 View commit details
  5. Copy the full SHA
    5be5eaf View commit details
  6. Copy the full SHA
    8874582 View commit details
  7. Copy the full SHA
    8577718 View commit details
  8. Copy the full SHA
    3de189a View commit details
  9. Upgrade to Gradle 8.13

    wilkinsona committed Feb 26, 2025
    Copy the full SHA
    a0ff9f6 View commit details

Commits on Feb 27, 2025

  1. Revert "Use Framework's default class loader as default in ImportCand…

    …idates"
    
    This reverts commit 56c9551.
    
    See gh-44401
    wilkinsona committed Feb 27, 2025
    Copy the full SHA
    21a5319 View commit details

Commits on Feb 28, 2025

  1. Close InputStream when loading Log4j2 Configuration from a Resource

    See gh-44467
    
    Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
    nosan authored and mhalbritter committed Feb 28, 2025
    Copy the full SHA
    be7e952 View commit details
  2. Merge pull request #44467 from nosan

    * pr/44467:
      Close InputStream when loading Log4j2 Configuration from a Resource
    
    Closes gh-44467
    mhalbritter committed Feb 28, 2025
    Copy the full SHA
    825ca76 View commit details
  3. Merge pull request #44467 from nosan

    * pr/44467:
      Close InputStream when loading Log4j2 Configuration from a Resource
    
    Closes gh-44467
    mhalbritter committed Feb 28, 2025
    Copy the full SHA
    19ba2ec View commit details
  4. Update version of Elasticsearch test container image

    See gh-44459
    
    Signed-off-by: Dmitry Sulman <dmitry.sulman@gmail.com>
    dmitrysulman authored and mhalbritter committed Feb 28, 2025
    Copy the full SHA
    c98f9ac View commit details
  5. Merge pull request #44459 from dmitrysulman

    * pr/44459:
      Update version of Elasticsearch test container image
    
    Closes gh-44459
    mhalbritter committed Feb 28, 2025
    Copy the full SHA
    8c035ce View commit details
  6. Update version of Neo4j test container image

    See gh-44463
    
    Signed-off-by: Dmitry Sulman <dmitry.sulman@gmail.com>
    dmitrysulman authored and mhalbritter committed Feb 28, 2025
    Copy the full SHA
    7276be8 View commit details
  7. Merge pull request #44463 from dmitrysulman

    * pr/44463:
      Update version of Neo4j test container image
    
    Closes gh-44463
    mhalbritter committed Feb 28, 2025
    Copy the full SHA
    c86d47f View commit details
  8. Fix tests

    mhalbritter committed Feb 28, 2025
    Copy the full SHA
    c91c8e2 View commit details
  9. Generate reflection hints for main methods

    This commit makes sure to register the necessary hints to invoke the
    main method of any bean available in the context. This is necessary
    for tests that use the UseMainMethod feature.
    
    This generates more hints than strictly necessary as there isn't a
    way to contribute hints based on a ContextLoader, see
    spring-projects/spring-framework#34513 for
    more details.
    
    Closes gh-44461
    snicoll committed Feb 28, 2025
    Copy the full SHA
    e1f45c5 View commit details
  10. Remove obsolete hints for Flyway Teams features

    See gh-44460
    
    Signed-off-by: Benjamin König <koenig87@googlemail.com>
    bekoenig authored and mhalbritter committed Feb 28, 2025
    Copy the full SHA
    23fd79f View commit details
  11. Merge pull request #44460 from bekoenig

    * pr/44460:
      Remove obsolete hints for Flyway Teams features
    
    Closes gh-44460
    mhalbritter committed Feb 28, 2025
    Copy the full SHA
    278c7a5 View commit details
  12. Bump solid-js from 1.8.17 to 1.9.5 in /antora

    Bumps [solid-js](https://github.com/solidjs/solid) from 1.8.17 to 1.9.5.
    - [Release notes](https://github.com/solidjs/solid/releases)
    - [Changelog](https://github.com/solidjs/solid/blob/main/CHANGELOG.md)
    - [Commits](solidjs/solid@v1.8.17...v1.9.5)
    
    ---
    updated-dependencies:
    - dependency-name: solid-js
      dependency-type: indirect
    ...
    
    See gh-44432
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored and mhalbritter committed Feb 28, 2025
    Copy the full SHA
    c641b3f View commit details
  13. Merge pull request #44432 from dependabot[bot]

    * pr/44432:
      Bump solid-js from 1.8.17 to 1.9.5 in /antora
    
    Closes gh-44432
    mhalbritter committed Feb 28, 2025
    Copy the full SHA
    00da65c View commit details
  14. Copy the full SHA
    7d01c94 View commit details
  15. Copy the full SHA
    e696837 View commit details

Commits on Mar 3, 2025

  1. Copy the full SHA
    05082ce View commit details

Commits on Mar 4, 2025

  1. Polish Spring-WS smoke test

    This commit polishes the smoke test for Spring Web Services, namely
    clearing unused dependencies and clarify the necessary configuration:
    
    1. No need to extend from `WsConfigurationAdapter` if no advanced
    configuration is required
    2. Spring Web Services creates a `XsdSchema` bean whose name matches
    the name of the file. Added a `@Qualifier("hr")` to make that more
    obvious as it would break if an additional schema was to be added.
    
    Closes gh-44515
    snicoll committed Mar 4, 2025
    Copy the full SHA
    9b41bbd View commit details
  2. Fix typo

    See gh-44514
    
    Signed-off-by: Matthias Streidel <github@metters.slmail.me>
    metters-senacor authored and snicoll committed Mar 4, 2025
    Copy the full SHA
    474dafa View commit details
  3. Merge pull request #44514 from metters

    * pr/44514:
      Fix typo
    
    Closes gh-44514
    snicoll committed Mar 4, 2025
    Copy the full SHA
    60c6ca3 View commit details
  4. Remove redundant tests

    Closes gh-44520
    wilkinsona committed Mar 4, 2025
    Copy the full SHA
    c9f3688 View commit details
Showing 712 changed files with 7,712 additions and 3,585 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ jobs:
build-and-stage-release:
name: Build and Stage Release
if: ${{ github.repository == 'spring-projects/spring-boot' || github.repository == 'spring-projects/spring-boot-commercial' }}
runs-on: ${{ vars.UBUNTU_MEDIUIM || 'ubuntu-latest' }}
runs-on: ${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }}
steps:
- name: Check Out Code
uses: actions/checkout@v4
2 changes: 0 additions & 2 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions .idea/icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
40 changes: 22 additions & 18 deletions antora/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion antora/package.json
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@
"@springio/antora-xref-extension": "1.0.0-alpha.4",
"@springio/antora-zip-contents-collector-extension": "1.0.0-alpha.8",
"@asciidoctor/tabs": "1.0.0-beta.6",
"@springio/asciidoctor-extensions": "1.0.0-alpha.15",
"@springio/asciidoctor-extensions": "1.0.0-alpha.17",
"patch-package": "^8.0.0"
},
"config": {
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2012-2024 the original author or authors.
* Copyright 2012-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -50,6 +50,7 @@ public void apply(Project project) {
new KotlinConventions().apply(project);
new WarConventions().apply(project);
new EclipseConventions().apply(project);
new TestFixturesConventions().apply(project);
RepositoryTransformersExtension.apply(project);
}

Original file line number Diff line number Diff line change
@@ -32,6 +32,7 @@
import io.spring.javaformat.gradle.tasks.Format;
import org.gradle.api.JavaVersion;
import org.gradle.api.Project;
import org.gradle.api.Task;
import org.gradle.api.artifacts.Configuration;
import org.gradle.api.artifacts.ConfigurationContainer;
import org.gradle.api.artifacts.Dependency;
@@ -54,6 +55,8 @@
import org.springframework.boot.build.architecture.ArchitecturePlugin;
import org.springframework.boot.build.classpath.CheckClasspathForProhibitedDependencies;
import org.springframework.boot.build.optional.OptionalDependenciesPlugin;
import org.springframework.boot.build.springframework.CheckAotFactories;
import org.springframework.boot.build.springframework.CheckSpringFactories;
import org.springframework.boot.build.testing.TestFailuresPlugin;
import org.springframework.boot.build.toolchain.ToolchainPlugin;
import org.springframework.util.StringUtils;
@@ -98,6 +101,19 @@
* <li>{@code Implementation-Version}
* </ul>
* <li>{@code spring-boot-parent} is used for dependency management</li>
* <li>Additional checks are configured:
* <ul>
* <li>For all source sets:
* <ul>
* <li>Prohibited dependencies on the compile classpath
* <li>Prohibited dependencies on the runtime classpath
* </ul>
* <li>For the {@code main} source set:
* <ul>
* <li>{@code META-INF/spring/aot.factories}
* <li>{@code META-INF/spring.factories}
* </ul>
* </ul>
* </ul>
*
* <p/>
@@ -123,6 +139,7 @@ void apply(Project project) {
configureDependencyManagement(project);
configureToolchain(project);
configureProhibitedDependencyChecks(project);
configureFactoriesFilesChecks(project);
});
}

@@ -304,4 +321,26 @@ private void createProhibitedDependenciesCheck(Configuration classpath, Project
project.getTasks().getByName(JavaBasePlugin.CHECK_TASK_NAME).dependsOn(checkClasspathForProhibitedDependencies);
}

private void configureFactoriesFilesChecks(Project project) {
SourceSetContainer sourceSets = project.getExtensions().getByType(JavaPluginExtension.class).getSourceSets();
sourceSets.matching((sourceSet) -> SourceSet.MAIN_SOURCE_SET_NAME.equals(sourceSet.getName()))
.configureEach((main) -> {
TaskProvider<Task> check = project.getTasks().named(JavaBasePlugin.CHECK_TASK_NAME);
TaskProvider<CheckAotFactories> checkAotFactories = project.getTasks()
.register("checkAotFactories", CheckAotFactories.class, (task) -> {
task.setSource(main.getResources());
task.setClasspath(main.getOutput().getClassesDirs());
task.setDescription("Checks the META-INF/spring/aot.factories file of the main source set.");
});
check.configure((task) -> task.dependsOn(checkAotFactories));
TaskProvider<CheckSpringFactories> checkSpringFactories = project.getTasks()
.register("checkSpringFactories", CheckSpringFactories.class, (task) -> {
task.setSource(main.getResources());
task.setClasspath(main.getOutput().getClassesDirs());
task.setDescription("Checks the META-INF/spring.factories file of the main source set.");
});
check.configure((task) -> task.dependsOn(checkSpringFactories));
});
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
/*
* Copyright 2012-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.springframework.boot.build;

import org.gradle.api.Project;
import org.gradle.api.artifacts.ConfigurationContainer;
import org.gradle.api.component.AdhocComponentWithVariants;
import org.gradle.api.plugins.JavaTestFixturesPlugin;

/**
* Conventions that are applied in the presence of the {@link JavaTestFixturesPlugin}.
* When the plugin is applied:
*
* <ul>
* <li>Publishing of the test fixtures is disabled.
* </ul>
*
* @author Andy Wilkinson
*/
class TestFixturesConventions {

void apply(Project project) {
project.getPlugins().withType(JavaTestFixturesPlugin.class, (testFixtures) -> disablePublishing(project));
}

private void disablePublishing(Project project) {
ConfigurationContainer configurations = project.getConfigurations();
AdhocComponentWithVariants javaComponent = (AdhocComponentWithVariants) project.getComponents()
.getByName("java");
javaComponent.withVariantsFromConfiguration(configurations.getByName("testFixturesApiElements"),
(variant) -> variant.skip());
javaComponent.withVariantsFromConfiguration(configurations.getByName("testFixturesRuntimeElements"),
(variant) -> variant.skip());
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/*
* Copyright 2012-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.springframework.boot.build.springframework;

import org.gradle.api.Task;

/**
* {@link Task} that checks {@code META-INF/spring/aot.factories}.
*
* @author Andy Wilkinson
*/
public abstract class CheckAotFactories extends CheckFactoriesFile {

public CheckAotFactories() {
super("META-INF/spring/aot.factories");
}

}
Loading