Skip to content

Commit ff6ead1

Browse files
committed
Remove Velocity support
Issue: SPR-13795
1 parent 4027bda commit ff6ead1

File tree

54 files changed

+135
-4242
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+135
-4242
lines changed

spring-context-support/src/main/java/org/springframework/mail/MailPreparationException.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2012 the original author or authors.
2+
* Copyright 2002-2016 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -18,11 +18,10 @@
1818

1919
/**
2020
* Exception to be thrown by user code if a mail cannot be prepared properly,
21-
* for example when a Velocity template cannot be rendered for the mail text.
21+
* for example when a FreeMarker template cannot be rendered for the mail text.
2222
*
2323
* @author Juergen Hoeller
2424
* @since 1.1
25-
* @see org.springframework.ui.velocity.VelocityEngineUtils#mergeTemplateIntoString
2625
* @see org.springframework.ui.freemarker.FreeMarkerTemplateUtils#processTemplateIntoString
2726
*/
2827
@SuppressWarnings("serial")

spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessagePreparator.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2012 the original author or authors.
2+
* Copyright 2002-2016 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -46,7 +46,7 @@ public interface MimeMessagePreparator {
4646
* @throws java.io.IOException passing any exceptions thrown by MimeMessage methods
4747
* through for automatic conversion to the MailException hierarchy
4848
* @throws Exception if mail preparation failed, for example when a
49-
* Velocity template cannot be rendered for the mail text
49+
* FreeMarker template cannot be rendered for the mail text
5050
*/
5151
void prepare(MimeMessage mimeMessage) throws Exception;
5252

spring-context-support/src/main/java/org/springframework/ui/velocity/SpringResourceLoader.java

-128
This file was deleted.

0 commit comments

Comments
 (0)