aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-02-24[automerge] Merge of apache-velocity-engine from aosp/master 2p: 757677e884 ↵HEADandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29mastermainandroid14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseAndrew Vuong
am: dbb091f02e am: 1ac9c00f57 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-velocity-engine/+/21545885 Change-Id: Ifb4e5b9c9da40f901e97b6192df577a502035479 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24[automerge] Merge of apache-velocity-engine from aosp/master 2p: 757677e884 ↵Andrew Vuong
am: dbb091f02e am: 3865031614 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-velocity-engine/+/21545885 Change-Id: Iee58b3eba48a519f8c294bd4212a219864c8606b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24[automerge] Merge of apache-velocity-engine from aosp/master 2p: 757677e884 ↵android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseAndrew Vuong
am: dbb091f02e Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-velocity-engine/+/21545885 Change-Id: I902417b67b5a9e9c3ae7af41057f7e65cb1b40b8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24[automerge] Merge of apache-velocity-engine from aosp/master 2p: 757677e884 ↵aml_tz5_341510070aml_tz5_341510050aml_tz5_341510010aml_sch_341510000aml_odp_341610000aml_neu_341510000aml_neu_341010080aml_neu_341010000aml_ase_341510000aml_ase_341410000aml_ase_341310010aml_ase_341113000aml_ase_340913000android14-mainline-appsearch-releaseaml_tz5_341510010Andrew Vuong
am: dbb091f02e Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-velocity-engine/+/21545885 Change-Id: If783598ed2b69e48d62c1b8817466b909e1ae88d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22[automerge] Merge of apache-velocity-engine from aosp/master 2p: 757677e884android14-devAndrew Vuong
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-velocity-engine/+/21545885 Bug: 262898801 Change-Id: Iab7144cf0ece4e538cda5e0a56e87d764b48dc66
2023-02-22Merge of apache-velocity-engine from aosp/masteraml_tz4_332714010Andrew Vuong
Bug: 262898801 Test: mma Change-Id: I68491a2e8b89245a1bff44d86023cec475ff902d
2023-02-18Add java_library to Android.bp and manually generated_sources. am: ↵Andrew Vuong
f2461dce3a am: 2ccb9641e1 am: 67603ab6a1 am: 3a93ff2641 am: e84642ac22 Original change: https://android-review.googlesource.com/c/platform/external/apache-velocity-engine/+/2436333 Change-Id: I2064daff12711b2b381b5bcbe205e007e67fe1b9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17Add java_library to Android.bp and manually generated_sources. am: ↵Andrew Vuong
f2461dce3a am: 2ccb9641e1 am: 67603ab6a1 am: 3a93ff2641 Original change: https://android-review.googlesource.com/c/platform/external/apache-velocity-engine/+/2436333 Change-Id: I9d393860e265edc537b904bf99a10fa291a6375d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17Add java_library to Android.bp and manually generated_sources. am: ↵Andrew Vuong
f2461dce3a am: 2ccb9641e1 am: 67603ab6a1 am: 3a93ff2641 Original change: https://android-review.googlesource.com/c/platform/external/apache-velocity-engine/+/2436333 Change-Id: I0b728fc9fbf78769166aa7feead28c0df015cedd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17Add java_library to Android.bp and manually generated_sources. am: ↵Andrew Vuong
f2461dce3a am: 2ccb9641e1 am: 67603ab6a1 Original change: https://android-review.googlesource.com/c/platform/external/apache-velocity-engine/+/2436333 Change-Id: I88475e737be5f844156ee5530e120693bfed8c8e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17Add java_library to Android.bp and manually generated_sources. am: ↵Andrew Vuong
f2461dce3a am: 2ccb9641e1 Original change: https://android-review.googlesource.com/c/platform/external/apache-velocity-engine/+/2436333 Change-Id: I5575541f5fe641f276256502601ddcac472d85e7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-17Add java_library to Android.bp and manually generated_sources. am: f2461dce3aandroid-u-beta-1-gplAndrew Vuong
Original change: https://android-review.googlesource.com/c/platform/external/apache-velocity-engine/+/2436333 Change-Id: I5e0bc6a902c6c47a1b25848cec77a31db8b0492c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15Add java_library to Android.bp and manually generated_sources.platform-tools-34.0.1Andrew Vuong
Bug: 262898801 Test: mma Change-Id: I568083b350be298d38aa9791cbfa24b4ad99f9e0
2023-02-14Initial import of apache-velocity-engine from upstream master am: 31f36d06e1 ↵Andrew Vuong
am: eabfc4b862 am: d0b448f2aa Original change: https://android-review.googlesource.com/c/platform/external/apache-velocity-engine/+/2434334 Change-Id: Iabbe76c79537fcdac7a95712127de4d35e1177c7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-14Initial import of apache-velocity-engine from upstream master am: 31f36d06e1 ↵Andrew Vuong
am: eabfc4b862 Original change: https://android-review.googlesource.com/c/platform/external/apache-velocity-engine/+/2434334 Change-Id: I06f4f8eef3ce47886496040e1d09c120c04e2d47 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-14Initial import of apache-velocity-engine from upstream master am: 31f36d06e1Andrew Vuong
Original change: https://android-review.googlesource.com/c/platform/external/apache-velocity-engine/+/2434334 Change-Id: Ib46a9892a5a4c948eb063b60b4bcaa4656ef7e9b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-13Initial import of apache-velocity-engine from upstream masterAndrew Vuong
Bug: 262898801 Test: TH Change-Id: I820a8f113056324148395f29443c5acd84f4acca
2023-02-09Initial empty repositorymain-16kInna Palant
2023-01-15Remove travis CIClaude Brisson
2022-10-23Merge pull request #33 from sultan/cveClaude Brisson
hsqldb 'jdk8' dependency classifier
2022-10-23hsqldb 'jdk8' dependency classifierSwell
2022-10-23Merge pull request #32 from sultan/cveClaude Brisson
update dependencies to avoid CVE warnings
2022-10-23update dependencies to avoid CVE warningsSwell
2022-07-25Easier #include and #parse directives subclassing - fixes VELOCITY-959Claude Brisson
2022-07-25Make templates cloneable - fixes VELOCITY-958Claude Brisson
2022-06-18Fix a funny typoClaude Brisson
2022-06-18Merge pull request #23 from gndrm/bugfix/override-defaultEncodingClaude Brisson
add the ability to override defaultEncoding
2022-06-18Merge pull request #29 from DoItWithASmile/masterClaude Brisson
Fixes VELOCITY-953
2022-06-18Merge pull request #31 from ↵Claude Brisson
apache/dependabot/maven/spring-velocity-support/org.springframework-spring-core-5.3.20 Bump spring-core from 5.3.4 to 5.3.20 in /spring-velocity-support
2022-05-25Bump spring-core from 5.3.4 to 5.3.20 in /spring-velocity-supportdependabot[bot]
Bumps [spring-core](https://github.com/spring-projects/spring-framework) from 5.3.4 to 5.3.20. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.4...v5.3.20) --- updated-dependencies: - dependency-name: org.springframework:spring-core dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
2022-04-18Merge pull request #1 from DoItWithASmile/mainDoItWithASmile
Fixes VELOCITY-953 where VelocimacroProxy polutes context stack due t…
2022-04-18Fixes VELOCITY-953 where VelocimacroProxy polutes context stack due to wrong ↵Janek.Schumann
handling of #break or exceptions
2021-07-07Merge pull request #24 from luryson/patch-3Claude Brisson
fix: touch resource to set nextCheck field, otherwise template will be refreshed every time after first expiration
2021-06-21Update ResourceManagerImpl.javaluryson
invoke touch() to set nextCheck field, otherwise template will be refreshed every time after first expiration
2021-04-27add the ability to override defaultEncodinggndrm
2021-04-08[engine] Re-enable travisClaude Brisson
2021-03-03[maven-release-plugin] prepare for next development iterationClaude Brisson
2021-03-03[maven-release-plugin] prepare release 2.3-RC2Claude Brisson
2021-03-03Fix references alternate values implementation, with some more test casesClaude Brisson
2021-03-03Merge pull request #20 from hgschmie/2.3-rc1-fixesClaude Brisson
Fixes failing tests on JDK 11+
2021-03-03Revert "[maven-release-plugin] prepare release 2.3-RC1"Claude Brisson
This reverts commit a9c3432f357b62370992d4698a2f78c97cf484cb.
2021-03-03Revert "[maven-release-plugin] prepare for next development iteration"Claude Brisson
This reverts commit 29f9e32167a0fe66d2f6ca6ce1d3dc394a977db8.
2021-03-02Fixes failing tests on JDK 11+Henning Schmiedehausen
Some brittle code tests the messages of exceptions etc. in the tests which have changed in JDK11+ Tested with OpenJDK 11 and OpenJDK 15.
2021-02-27[maven-release-plugin] prepare for next development iterationClaude Brisson
2021-02-27[maven-release-plugin] prepare release 2.3-RC1Claude Brisson
2021-02-27[engine] Switch scm URLs from svn to gitClaude Brisson
2021-02-27[engine] Temporarily disable travis CIClaude Brisson
2021-02-27[engine] Update upcoming 2.3 date in changelogClaude Brisson
2021-02-27[engine] Update hsqldb and spring dependencies versionsClaude Brisson
2021-02-27[engine] Update another reference of extra-enforcer-rules plugin versionClaude Brisson
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-22 17:31:25 +0000