102 Commits

Author SHA1 Message Date
Stéphane Nicoll
b78aa3cee8 Replace artifactory by standard repository structure
This commit removes the usage of the Artifactory plugin and replaces
it with a standard repository structure using the -PdeploymentRepository
option.

This also updates the generated POM to be current.
2024-10-10 12:02:42 +02:00
Brian Clozel
10ae7796c6 Fix documentation publication in Gradle build
This commit moves the asciidoctor *.adoc files to the default location
and removes the unnecessary asciidoctor plugin configuration as a
result.

This changes also reworks dependencies between tasks and adds the
missing publication configuration for generated artifacts. The entire
docs-specific script is moved from the main build.gradle file to a
"gradle/docs.gradle" script to improve readability of the main build.

Fixes gh-1797
2023-08-31 16:10:09 +01:00
Brian Clozel
46b03abe8f Move maven publication config to gradle folder 2023-08-31 16:10:09 +01:00
Brian Clozel
a5088a99f1 Upgrade Gradle plugins
This commit also removes the former repo.spring.io plugins repositories,
as they are not needed anymore by this build.
2023-08-31 16:10:09 +01:00
rstoyanchev
5b27250c70 Update dependencies
See gh-1794
2023-03-23 12:34:00 +01:00
Gabor Liptak
bce7f0cc91 Update spring-faces to Jakarta EE
FlowResourceResolver.java is removed, since it was deprecated, see
https://github.com/jakartaee/faces/issues/1583

See gh-1794
2023-01-31 23:58:07 +01:00
Jay Bryant
c0173e54d5 Use spring-asciidoc-backends
to get the latest look and feel and features.
2022-09-14 16:41:06 -05:00
Rossen Stoyanchev
ed81b44dd1 Add artifactory plugin to build script 2022-08-08 17:42:27 +03: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
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
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
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
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
3df089c234 Bump asciidoctor to 3.3.2 for compatibility with Gradle 7.0 2022-07-14 14:26:24 +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
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
6e09359203 Update dependencies 2021-02-15 10:49:28 +00:00
Brian Clozel
f5513f0189 Fix warnings in Gradle build file 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
Rossen Stoyanchev
2e1a289efb Upgrade Gradle 5.6 -> 5.6.4 and propdeps plugin 2020-04-28 08:01:56 +01:00
Jay Bryant
49fef3fc7c Upgrade spring-doc-resources
Upgrade spring-doc-resources from version 0.2.0 to version 0.2.1
to get a bug fix (setting display width in the HTML output).
2020-04-28 07:25:47 +01:00
Jay Bryant
6dc5d2801c Converted to Asciidoc
I used docbookrx to convert from Docbook to Asciidoc
I also removed the xml files for the reference documentation.
2020-04-28 07:25:47 +01:00
Etienne Dysli Metref
cadaaad605 Upgrade Web Flow tests from JUnit 4 to 5
Replace imports:
org.junit.Assert.* -> org.junit.jupiter.api.Assertions.*
org.junit.After    -> org.junit.jupiter.api.AfterEach
org.junit.Before   -> org.junit.jupiter.api.BeforeEach

Move the `message` argument to last position.

Issue: SWF-1739
2019-10-16 14:55:42 +01:00
Etienne Dysli Metref
ceb44a6634 Upgrade Web Flow tests from JUnit 3 to 4
Remove `extends TestCase` from all test classes and add `@Before`,
`@After`, and `@Test` method annotations.

Note that class `JsfUtilsTests` still indirectly inherits from
`TestCase` via `org.apache.myfaces.test.base.AbstractJsfTestCase`.

Issue: SWF-1739
2019-10-16 14:55:15 +01:00
Lars Grefer
a638b396bb Update to Gradle 5.6 2019-08-26 14:08:43 +03:00
Rossen Stoyanchev
eb7c543c0f Upgrade to Spring Framework 5.1.7 2019-06-04 10:11:49 -04:00
Spring Operator
8b9e13ba38 URL Cleanup
This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener).

# Fixed URLs

## Fixed But Review Recommended
These URLs were fixed, but the https status was not OK. However, the https status was the same as the http request or http redirected to an https URL, so they were migrated. Your review is recommended.

* http://springsource.org/downloads/sts (302) migrated to:
  https://spring.io/projectss/sts ([https](https://springsource.org/downloads/sts) result 404).

## Fixed Success
These URLs were fixed successfully.

* http://issues.gradle.org/browse/GRADLE-1116 migrated to:
  https://issues.gradle.org/browse/GRADLE-1116 ([https](https://issues.gradle.org/browse/GRADLE-1116) result 200).
* http://www.apache.org/licenses/LICENSE-2.0.txt migrated to:
  https://www.apache.org/licenses/LICENSE-2.0.txt ([https](https://www.apache.org/licenses/LICENSE-2.0.txt) result 200).
* http://projects.spring.io/spring-webflow migrated to:
  https://projects.spring.io/spring-webflow ([https](https://projects.spring.io/spring-webflow) result 301).
* http://repo.spring.io/libs-release migrated to:
  https://repo.spring.io/libs-release ([https](https://repo.spring.io/libs-release) result 302).
* http://repo.spring.io/libs-snapshot migrated to:
  https://repo.spring.io/libs-snapshot ([https](https://repo.spring.io/libs-snapshot) result 302).
* http://repo.spring.io/plugins-release migrated to:
  https://repo.spring.io/plugins-release ([https](https://repo.spring.io/plugins-release) result 302).
2019-03-06 16:28:27 -05:00
Rossen Stoyanchev
eeb0584b0e Upgrade SPR and SEC versions 2018-11-30 21:14:41 -05:00
Rossen Stoyanchev
c21f79825c Upgrade to latest versions 2018-09-11 14:08:18 -04:00
Rossen Stoyanchev
962cb673cf Use SimpleEvaluationContext in AbstractMvcView
Issue: SWF-1722
2018-03-27 13:41:57 -04:00
Rossen Stoyanchev
7215a49e4a Revert "Remove Spring JavaScript library"
This reverts commit 4d59b21e49.

Issue: SWF-1693
2018-02-07 14:46:37 -05:00
Rossen Stoyanchev
086e4ec728 Remove reference to tiles2 package (no longer in sources) 2018-02-06 14:37:37 -05:00
Rossen Stoyanchev
6d81084cc6 Polish build.gradle 2018-02-06 14:34:48 -05:00
Rossen Stoyanchev
34ffedf073 Fix test logging dependencies 2018-02-06 14:26:15 -05:00
Rossen Stoyanchev
3f548d6775 Update versions 2018-02-06 14:14:13 -05:00
Rossen Stoyanchev
ec300fc0dc Parameterize references to project version
SWF-1707
2017-07-31 14:07:20 +02:00
Andy Wilkinson
96f27501b1 Align EL API dependency with Spring Framework 5
Upgrade to 3.0.1-b04. The implementation dependency, tomcat-jasper-el,
has also been upgraded so that it implements the 3.0 API. Lastly,
the EL API dependency has been marked as compileOnly to prevent
conflicts with the API classes that are pulled in transitively by
tomcat-jasper-el.
2017-03-13 17:39:31 +00:00
Rossen Stoyanchev
7ade1b8c81 Catch up with the latest Spring Framework 5 snapshot 2017-02-02 14:02:15 -05:00
Andy Wilkinson
0969de6062 Reinstate logic that applies publish-maven.gradle to subprojects
Without applying publish-maven.gradle no Maven poms are generated.
2017-01-21 20:34:52 +00:00