[spring-extensions] branch dev/JSPS-1 updated (691df18 -> 0ec0225)

Scott Cantor cantor.2 at osu.edu
Thu Jun 2 14:40:22 UTC 2022


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

scantor pushed a change to branch dev/JSPS-1
in repository spring-extensions.

 discard 691df18  Move AccessControlService wrapper down.
 discard 36cb6ad  Migrate various classes.
 discard 7808aab  Allow nulls in list-combining factory bean.
 discard bb5853e  Migrate some IdP code down.
     add 76690e2  Bump parent POM to 11.3.3
     add f87abb0  JPAR-186 - New major version: adopt Spring Framework 6, Jakarta Servlet 5
     add 2abe17a  JSE-48 - Replace use of Spring NestedIOException with IOException
     add db908f5  Add removeApplicationListener to MockApplicationContext
     new e55bbff  Migrate some IdP code down.
     new 4d6e80a  Allow nulls in list-combining factory bean.
     new c602231  Migrate various classes.
     new fdd316e  Move AccessControlService wrapper down.
     new 0ec0225  Fix merge conflict.

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (691df18)
            \
             N -- N -- N   refs/heads/dev/JSPS-1 (0ec0225)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .classpath                                                   |  2 +-
 .settings/org.eclipse.jdt.core.prefs                         |  8 ++++----
 pom.xml                                                      | 11 +++++------
 .../context/FilesystemGenericWebApplicationContext.java      |  4 ++--
 .../shibboleth/ext/spring/error/ErrorRaisingController.java  |  3 ++-
 .../ext/spring/error/ExtendedMappingExceptionResolver.java   |  8 ++++----
 .../net/shibboleth/ext/spring/resource/HTTPResource.java     |  3 +--
 .../java/net/shibboleth/ext/spring/util/SpringSupport.java   |  2 +-
 .../shibboleth/ext/spring/velocity/VelocityConfigurer.java   |  3 ++-
 .../net/shibboleth/ext/spring/velocity/VelocityView.java     | 12 ++++++------
 .../ext/spring/testing/MockApplicationContext.java           |  5 +++++
 11 files changed, 33 insertions(+), 28 deletions(-)

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


More information about the commits mailing list