Commit Graph

2634 Commits

Author SHA1 Message Date
Rossen Stoyanchev
28f9511b68 Update reference docs for 3.0 2022-08-08 14:16:18 +03:00
Rossen Stoyanchev
fb82f141ab Merge branch '2.5.x' 2022-08-04 19:23:40 +03:00
Rossen Stoyanchev
233c114427 Remove/fix doc references 2022-08-04 19:11:42 +03:00
Rossen Stoyanchev
9fd8d3eccd Upgrade to Gradle 7.4.2 and use java-library plugin
Align with main branch
2022-08-03 13:26:36 +03:00
rstoyanchev
2e8acc97a4 Polishing contribution
Closes gh-111
2022-07-15 10:11:26 +01:00
Scott Cantor
dab4438e91 Add protected methods to FlowModelFlowBuilder
This allows a custom build of the Flow ApplicationContext.

See gh-111
2022-07-15 10:11:26 +01:00
rstoyanchev
ae6efce58d Update to Spring Framework 6.0.0-M5, Hibernate 5.6.10, Jakarta JSTL 2.0 2022-07-14 16:12:23 +01:00
rstoyanchev
913bf48493 Merge branch 'pr/109'
Closes gh-109
2022-07-14 14:31:26 +01:00
Ian Young
68e2fd83b4 Bump Spring Framework to 6.0.0-M4 2022-07-14 14:26:27 +01:00
Ian Young
d5029790fd Adopt Spring Framework 6 and Jakarta EE 9
To avoid any complications with functional changes between Hibernate 5
and Hibernate 6, this uses the hibernate-core-jakarta v5 module rather
than hibernate-core v6. This requires a specific dependency exclusion
in spring-webflow.gradle to make sure that hibernate-entitymanager
never causes both versions to be loaded. This can be simplified after
eventual adoption of Hibernate 6.

The Spring snapshot repository needs to be referenced in build.gradle
for this early stage work on SWF 3.
2022-07-14 14:26:27 +01:00
Ian Young
7cb8c3d9ae Change from java plugin to java-library plugin
The java-library plugin is an extension of the older java plugin.
It introduces the api dependency configuration and helps us to get
the right scope in the generated POM.
2022-07-14 14:26:27 +01:00
Ian Young
3f8c133ad1 Remove spring-faces from build
Porting the JavaServer Faces support forward to Jakarta Server Faces
is outside my area of competence. Hopefully, someone with knowledge
of this area will be able to step up later.
2022-07-14 14:26:27 +01:00
Ian Young
9207f961eb Remove support for Tiles 3
This is no longer supported by Spring Framework 6.
2022-07-14 14:26:27 +01:00
Ian Young
505b3fc3d7 Fix Java terminal deprecations
This is cosmetic for Java 17, but will be required for some later
version. Fixing it now greatly reduces the number of warnings we see.
2022-07-14 14:26:27 +01:00
Ian Young
f91129e24c Switch to Java 17
Uses the new Java toolchain feature of Gradle to acquire Java 17.

Doing it this way means that you can start ./gradlew under any version
of Java and still use Java 17 for the build; it picks a candidate from
the environment or downloads one if required. It also takes care of
source and target compatibility, with the exception of ide.gradle
which is handled separately.
2022-07-14 14:26:27 +01:00
Ian Young
014321240e Update Gradle to 7.4.2
This adds support for Java 17.
2022-07-14 14:26:27 +01:00
Ian Young
2e3750dbc0 Adopt new Gradle maven-publish plugin
The maven plugin was removed in Gradle 7, so we need to replace it with
maven-publish. This uses a similar DSL, but operates in a slightly
different way. The simplest way of handling the differences is to
reorder its application within build.gradle so that appropriate
properties will have been applied by the time publish-maven.gradle
is invoked.
2022-07-14 14:26:27 +01:00
Ian Young
014c3d4893 Fix base directory name within -dist distribution
Without the .get(), the substitution names the property rather than interpolating its value.
2022-07-14 14:26:27 +01:00
Ian Young
c8c9df6d54 Fix descriptions of distribution tasks
Without the .get(), the substitution names the property rather than interpolating its value.
2022-07-14 14:26:27 +01:00
Ian Young
7f5df351ff Ignore duplicate paths in schemas .zip for Gradle 7.0 compatibility
Gradle 7.0 no longer silently ignores a case where the same file
appears multiple times in an output .zip.
2022-07-14 14:26:27 +01:00
Ian Young
65a9c42207 Update dependency configurations for compatibility with Gradle 7.0 2022-07-14 14:26:27 +01:00
Ian Young
3df089c234 Bump asciidoctor to 3.3.2 for compatibility with Gradle 7.0 2022-07-14 14:26:24 +01:00
Ian Young
e67a4e6f63 Fix HTML5 issues in Javadoc for Java 11
Some of these become hard errors in Java 17 or earlier, so it's best
to clean them up properly.
2022-07-14 14:25:19 +01:00
Ian Young
b441adecfe Per CONTRIBUTING, convert text files to use LF instead of CRLF
It is easier to standardise this now in one commit rather than
during later bulk changes where it would complicate the review process.

This is literally the result of running "dos2unix" on appropriate files.

There is no attempt here to likewise standardise the spaces/tabs
conventions in the codebase.
2022-07-14 14:25:19 +01:00
Ian Young
cf774743ea Set version to 3.0.0-SNAPSHOT
Expect this commit to be rebased away once @rstoyanchev updates
main branch.
2022-07-14 14:25:19 +01:00
rstoyanchev
92048b526e Merge branch '2.5.x'
Closes gh-110
2022-07-07 14:46:42 +01:00
Jay Bryant
0d2130244e Fix the build by updating the doc-resources download
to work the same way as it works in Spring Framework.
2022-07-07 08:32:00 -05:00
Jay Bryant
1ba807bd31 Editing pass
Edited for grammar, punctuation, spelling, usage, and voice.
2022-07-06 13:58:37 +01:00
Jay Bryant
1ac2d22d3e Update doc-production version
Update the spring-doc-resources and Asciidoctor versions,
to get the docs for this project to match the current Spring standard.
2021-05-26 09:46:24 +01:00
Rossen Stoyanchev
95f87b66a8 Update references to master branch 2021-04-28 19:29:08 +01:00
Rossen Stoyanchev
6e09359203 Update dependencies 2021-02-15 10:49:28 +00:00
Jay Bryant
7716ecbc2a Wording changes
Replacing some terms
2020-07-22 11:24:22 +03:00
Rossen Stoyanchev
99032c1aad Merge pull request #102
Closes gh-102
2020-05-04 20:11:43 +01:00
Rossen Stoyanchev
3bb4e6c3a7 Polishing contribution 2020-05-04 20:10:12 +01:00
Lars Grefer
2be8bcbc18 Java 8: Anonymous type can be replaced with lambda 2020-05-04 20:10:12 +01:00
Lars Grefer
ef48c15603 Java 7: 'try finally' replaceable with 'try' with resources 2020-05-04 20:10:12 +01:00
Lars Grefer
78e8f7a3f8 Java 7: Identical 'catch' branches in 'try' statement 2020-05-04 20:10:12 +01:00
Lars Grefer
55137e101a Java 7: Explicit type can be replaced with <> 2020-05-04 20:10:12 +01:00
Lars Grefer
ab69df656d Java 5: Unnecessary boxing 2020-05-04 20:10:12 +01:00
Lars Grefer
7caa67f302 Java 5: 'while' and for-loop replaceable with 'foreach' 2020-05-04 20:10:12 +01:00
Rossen Stoyanchev
0260d79092 Add OptionalDependenciesPlugin 2020-05-01 07:39:23 +01:00
Brian Clozel
f5513f0189 Fix warnings in Gradle build file 2020-05-01 07:36:27 +01:00
Brian Clozel
87002cc7ba Update link to project page
This commit updates the published POMs for this project to point to the
new project page on spring.io.
2020-05-01 07:36:27 +01:00
Brian Clozel
92ed854f97 Remove Gradle propdeps plugin
This commit removes the propdeps plugin.
"provided" configurations are replaced with "compileOnly", "testCompile"
configurations.
The "optional" configuration supported by propdeps is now replaced by a
local Gradle plugin defining a specific configuration for that.

As a result of that change, optional/provided dependencies are not
published with the POMs anymore.
2020-05-01 07:36:27 +01:00
Brian Clozel
2f2c2e0313 Use Spring dependency management plugin
This commit introduces the Spring dependency management Gradle
plugin. All dependency versions and BOMs are now managed in the
root project and declared in the modules directly.
2020-05-01 07:36:27 +01:00
Brian Clozel
e944eec255 Render asciidoc PDF version only for releases
This commit guards the PDF generation of the asciidoc reference
documentation with a version check.

Since the PDF generation takes a significant amount of time to build,
we should only generate it for non-SNAPSHOT versions.
2020-05-01 07:36:27 +01:00
Brian Clozel
780bb68bdb Move build files into each module
This commit moves each project build configuration into its own file
and keeps the common configuration in the root project.
2020-05-01 07:36:27 +01:00
Rossen Stoyanchev
0813506266 Update dependency versions 2020-04-28 18:32:01 +01:00
Rossen Stoyanchev
84170260ef All tests are executing again
Following the upgrade to JUnit 5 in gh-99, only the few remaining older
style tests extending from TestCase were being executed. This change
ensures JUnit 5 tests are executing as well.
2020-04-28 18:12:59 +01:00
Rossen Stoyanchev
fabf1ea7b4 Remove Spring I/O Platform plugin 2020-04-28 08:09:47 +01:00