diff --git a/pebble-3.2.1.tar.gz b/pebble-3.2.1.tar.gz deleted file mode 100644 index cd322a3..0000000 --- a/pebble-3.2.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:761a1a3f93f5895292e48eb617fb77d10b95f51e741d0f3934563551c4d133b9 -size 240746 diff --git a/pebble-4.0.0.tar.gz b/pebble-4.0.0.tar.gz new file mode 100644 index 0000000..c71ac32 --- /dev/null +++ b/pebble-4.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d4efd3f73a8f345baff97c7b42c9754632c6e9d60494ffb4628970e9928d77d +size 249305 diff --git a/pebble.changes b/pebble.changes index 4b93fa0..476c428 100644 --- a/pebble.changes +++ b/pebble.changes @@ -1,3 +1,53 @@ +------------------------------------------------------------------- +Tue Dec 9 09:03:20 UTC 2025 - Anton Shvetz + +- Update to v4.0.0 + * [BREAKING CHANGES] + + Add support for spring boot 4 (#704) + + Use one of the following artifactId according to the spring + boot version that you are using + ArtifactId → spring-boot version + pebble-legacy-spring-boot-starter → 3.x.x + pebble-spring-boot-starter → 4.x.x + + The following spring boot properties has been moved to + .servlet or .reactive + Old property → New Property + pebble.allowRequestOverride + → pebble.servlet.allowRequestOverride + pebble.allowSessionOverride + → pebble.servlet.allowSessionOverride + pebble.cache → pebble.servlet.cache + pebble.contentType → pebble.servlet.contentType + pebble.exposeRequestAttributes + → pebble.servlet.exposeRequestAttributes + pebble.exposeSessionAttributes + → pebble.servlet.exposeSessionAttributes + pebble.exposeSpringMacroHelpers + → pebble.servlet.exposeSpringMacroHelpers + → pebble.reactive.mediaTypes + For more information, please consult the spring-boot + integration documentation in the Boot externalized + configuration section + * New Features + + Add nl2br filter (#699) +- Update to v3.2.4 + * Fix the problem of unit test failure under JDK 21 (#692) + * Fix the problem of not resolving reactive values in models + (#691) +- Update to v3.2.3 + * Dynamically open different feature according to different + scenarios (#671) + * Fix the ability to provide your own PebbleViewResolver (#686) +- Update to v3.2.2 + * Throw a more detailed exception from DefaultAttributeResolver + (#653) + * Make expression nodes fully visitable (#657) + * Added getTemplates function to MemoryLoader (#660) + * Generate OSGi metadata into pebble jar to make it OSGi + compliant (#663) + * Add flag for parameter name retention in maven compiler plugin + (#664) + ------------------------------------------------------------------- Mon Sep 11 00:13:02 UTC 2023 - Anton Shvetz diff --git a/pebble.spec b/pebble.spec index 9f547fe..c632836 100644 --- a/pebble.spec +++ b/pebble.spec @@ -1,7 +1,7 @@ # # spec file for package pebble # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2025 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: pebble -Version: 3.2.1 +Version: 4.0.0 Release: 0 Summary: Java Template Engine License: BSD-3-Clause @@ -26,10 +26,10 @@ URL: https://pebbletemplates.io/ Source0: https://github.com/PebbleTemplates/%{name}/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: fdupes BuildRequires: maven-local +BuildRequires: mvn(biz.aQute.bnd:bnd-maven-plugin) BuildRequires: mvn(jakarta.servlet:jakarta.servlet-api) BuildRequires: mvn(javax.servlet:servlet-api) BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin) -BuildRequires: mvn(org.slf4j:slf4j-api) BuildRequires: mvn(org.unbescape:unbescape) BuildArch: noarch @@ -47,16 +47,17 @@ Group: Documentation/HTML API documentation for %{name}. %prep -%setup -q -rm pebble/src/main/java/io/pebbletemplates/pebble/cache/{template/CaffeineTemplateCache,tag/CaffeineTagCache}.java +%autosetup %pom_disable_module %{name}-spring -%pom_remove_plugin org.sonatype.plugins:nexus-staging-maven-plugin +%pom_remove_plugin org.sonatype.central:central-publishing-maven-plugin %pom_remove_plugin :maven-javadoc-plugin %pom_remove_dep com.github.ben-manes.caffeine:caffeine %{name} +rm pebble/src/main/java/io/pebbletemplates/pebble/cache/{template/CaffeineTemplateCache,tag/CaffeineTagCache}.java + %build %{mvn_build} -f -- \ %if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}