From 7683d5434c90f6d7a4cf00c838537a5cf84b80a6 Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 18 Nov 2016 15:25:17 -0800 Subject: [PATCH] SGF-560 - Perform additional post release cleanup. --- .../AbstractGeodeSecurityIntegrationTests.java | 2 +- template.mf | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/test/java/org/springframework/data/gemfire/config/annotation/AbstractGeodeSecurityIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/config/annotation/AbstractGeodeSecurityIntegrationTests.java index c8b43730..076bb6b9 100644 --- a/src/test/java/org/springframework/data/gemfire/config/annotation/AbstractGeodeSecurityIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/config/annotation/AbstractGeodeSecurityIntegrationTests.java @@ -48,7 +48,6 @@ import org.apache.geode.security.AuthInitialize; import org.apache.geode.security.AuthenticationFailedException; import org.apache.geode.security.NotAuthorizedException; import org.apache.geode.security.ResourcePermission; -import org.apache.shiro.util.Assert; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.FixMethodOrder; @@ -69,6 +68,7 @@ import org.springframework.data.gemfire.test.support.ClientServerIntegrationTest import org.springframework.data.gemfire.util.CollectionUtils; import org.springframework.data.gemfire.util.PropertiesBuilder; import org.springframework.test.annotation.DirtiesContext; +import org.springframework.util.Assert; import org.springframework.util.StringUtils; import lombok.EqualsAndHashCode; diff --git a/template.mf b/template.mf index 12eedcb0..44517494 100644 --- a/template.mf +++ b/template.mf @@ -3,15 +3,15 @@ Bundle-Name: Spring Data Geode Bundle-SymbolicName: org.springframework.data.gemfire Bundle-Vendor: Pivotal Software, Inc. Import-Package: sun.reflect;version="0";resolution:=optional -Import-Template: javax.annotation.*;version="[1.0,2.0)";resolution:=optional, - javax.enterprise.*;version="[1.0,2.0)";resolution:=optional, - org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", - org.apache.shiro.*;version="[1.3.0, 2.0.0)";resolutioin:=optional, +Import-Template: javax.annotation.*;version="[1.0, 2.0)";resolution:=optional, + javax.enterprise.*;version="[1.0, 2.0)";resolution:=optional, org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional, + org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", + org.apache.geode.*;version="[1.0.0, 9.0.0)", + org.apache.shiro.*;version="[1.3.0, 2.0.0)";resolution:=optional, org.aspectj.*;version="[1.8.2, 2.0.0)";resolution:=optional, - com.fasterxml.jackson.*;version="[2.4.1,3.0.0)";resolution:=optional, - org.apache.geode.*;version="[1.0.0,9.0.0)", - org.slf4j.*;version="[1.7.0,2.0)", - org.springframework.*;version="[4.0.6, 5.0.0)", - org.springframework.data.*;version="[1.9.0,2.0.0)", + com.fasterxml.jackson.*;version="[2.4.1, 3.0.0)";resolution:=optional, + org.slf4j.*;version="[1.7.0, 2.0)", + org.springframework.*;version="[4.3.4, 5.0.0)", + org.springframework.data.*;version="[1.12.5, 2.0.0)", org.w3c.dom.*;version="0"