This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch spring6 in repository https://gitbox.apache.org/repos/asf/isis.git
commit ba3e04fceb4dec4f89d690eb7205ea0651ad557b Merge: 8be04c3512 bc0675e124 Author: Andi Huber <[email protected]> AuthorDate: Tue Nov 29 15:29:02 2022 +0100 ISIS-3275: [Incubating] Migrate from Spring Framework 5.x to 6.x bom/pom.xml | 160 +++++++++++++++++---- core/pom.xml | 72 +--------- extensions/pom.xml | 66 --------- regressiontests/incubating/pom.xml | 6 +- .../incubating/src/main/java/include.txt | 1 - regressiontests/pom.xml | 43 ++++-- .../stable-cmdexecauditsess/generic/pom.xml | 5 + .../resources/META-INF/orm-commandlog.template | 0 regressiontests/stable-eventhandling/pom.xml | 6 +- .../stable-eventhandling/src/main/java/include.txt | 1 - regressiontests/stable-layouts/pom.xml | 40 ++---- .../layouts/integtest/model/Counter.layout.xml | 72 ---------- .../integtest/model/LayoutTestDomainModel.java | 24 ---- .../integtest/model/SimpleObject.layout.xml | 67 --------- .../layouts/integtest/model/types/Name.java | 40 ------ .../layouts/integtest/model/types/Notes.java | 45 ------ .../integtest/Layout_Counter_IntegTest.java | 0 .../integtest/Layout_SimpleObject_IntegTest.java | 0 .../layouts/integtest/model/Counter.java | 0 .../layouts/integtest/model/SimpleObject.java | 0 regressiontests/stable-viewers-jdo/pom.xml | 6 +- regressiontests/stable-viewers-jpa/pom.xml | 6 +- regressiontests/stable/pom.xml | 6 +- starters/pom.xml | 63 +------- testing/pom.xml | 67 --------- valuetypes/pom.xml | 67 --------- 26 files changed, 211 insertions(+), 652 deletions(-) diff --cc bom/pom.xml index 49e07db82e,8b81762fc7..612ee6d090 --- a/bom/pom.xml +++ b/bom/pom.xml @@@ -57,17 -57,10 +57,10 @@@ It is therefore a copy of org.apache:ap <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <sourceReleaseAssemblyDescriptor>source-release</sourceReleaseAssemblyDescriptor> <gpg.useagent>true</gpg.useagent> - <minimalMavenBuildVersion>3.2.5</minimalMavenBuildVersion> - <minimalJavaBuildVersion>1.8</minimalJavaBuildVersion> - - <java.version>17</java.version> - <maven.compiler.source>${java.version}</maven.compiler.source> - <maven.compiler.target>${java.version}</maven.compiler.target> - <maven.compiler.release>${java.version}</maven.compiler.release> - <surefire.version>3.0.0-M7</surefire.version> - - <!-- for surefire, failsafe and surefire-report --> - <maven.plugin.tools.version>3.7.0</maven.plugin.tools.version> + <minimalMavenBuildVersion>3.8.0</minimalMavenBuildVersion> <!-- enforces https repos --> - <minimalJavaBuildVersion>11</minimalJavaBuildVersion> - <maven.compiler.release>11</maven.compiler.release> ++ <minimalJavaBuildVersion>17</minimalJavaBuildVersion> ++ <maven.compiler.release>17</maven.compiler.release> + <!-- for m-plugin-p and maven-plugin-annotations --> <assembly.tarLongFileMode>posix</assembly.tarLongFileMode> <causeway.skipTests>false</causeway.skipTests> @@@ -77,6 -70,19 +70,20 @@@ <delombok.output>${project.build.directory}/delombok</delombok.output> ++ + <!-- PLUGINS --> + + <datanucleus-maven-plugin.version>6.0.0-release</datanucleus-maven-plugin.version> + <datanucleus-maven-plugin.log4jConfiguration>${basedir}/logging-dn-enhance.properties</datanucleus-maven-plugin.log4jConfiguration> + <datanucleus-maven-plugin.verbose>false</datanucleus-maven-plugin.verbose> + <datanucleus-maven-plugin.fork>false</datanucleus-maven-plugin.fork> + + <maven-source-plugin.version>3.2.1</maven-source-plugin.version> + <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version> + <maven-surefire-report-plugin.version>3.0.0-M7</maven-surefire-report-plugin.version> + <!-- for surefire, failsafe and surefire-report --> + <maven.plugin.tools.version>3.7.0</maven.plugin.tools.version> + <!-- LIBRARY DEPENDENCIES --> <archunit.version>1.0.1</archunit.version> diff --cc regressiontests/pom.xml index 677c287985,76d3668420..8c4813e219 --- a/regressiontests/pom.xml +++ b/regressiontests/pom.xml @@@ -15,10 -15,10 +15,10 @@@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.causeway.app</groupId> - <artifactId>causeway-app-starter-parent</artifactId> + <groupId>org.apache.causeway</groupId> + <artifactId>causeway-bom</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> - <relativePath>../starters/pom.xml</relativePath> + <relativePath>../bom/pom.xml</relativePath> </parent> <groupId>org.apache.causeway.regressiontests</groupId>
