[java-shib-shared] branch main updated: Lost track of a Velocity macro resource, relocating to proper place.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository java-shib-shared.

View the commit online:
http://git.shibboleth.net/view/?p=java-shib-shared.git;a=commit;h=85cb8f860d860f8e3f4565ae95a6719178993b53

The following commit(s) were added to refs/heads/main by this push:
     new 85cb8f86 Lost track of a Velocity macro resource, relocating to proper place.
85cb8f86 is described below

commit 85cb8f860d860f8e3f4565ae95a6719178993b53
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Jun 13 10:01:02 2023 -0400

    Lost track of a Velocity macro resource, relocating to proper place.
---
 .../java/net/shibboleth/shared/spring/velocity/VelocityConfigurer.java  | 2 +-
 .../src/main/resources/net/shibboleth/shared}/spring/velocity/spring.vm | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/shib-velocity-spring/src/main/java/net/shibboleth/shared/spring/velocity/VelocityConfigurer.java b/shib-velocity-spring/src/main/java/net/shibboleth/shared/spring/velocity/VelocityConfigurer.java
index 2eb31900..96544acd 100644
--- a/shib-velocity-spring/src/main/java/net/shibboleth/shared/spring/velocity/VelocityConfigurer.java
+++ b/shib-velocity-spring/src/main/java/net/shibboleth/shared/spring/velocity/VelocityConfigurer.java
@@ -83,7 +83,7 @@ public class VelocityConfigurer extends VelocityEngineFactory
 
     /** Name of Spring's default bind macro library. */
     @Nonnull @NotEmpty
-    private static final String SPRING_MACRO_LIBRARY = "net/shibboleth/ext/spring/velocity/spring.vm";
+    private static final String SPRING_MACRO_LIBRARY = "net/shibboleth/shared/spring/velocity/spring.vm";
 
     /** Servlet context. */
     @Nullable private ServletContext servletContext;
diff --git a/shib-spring/src/main/resources/net/shibboleth/ext/spring/velocity/spring.vm b/shib-velocity-spring/src/main/resources/net/shibboleth/shared/spring/velocity/spring.vm
similarity index 100%
rename from shib-spring/src/main/resources/net/shibboleth/ext/spring/velocity/spring.vm
rename to shib-velocity-spring/src/main/resources/net/shibboleth/shared/spring/velocity/spring.vm

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.