ref #10009 try to remove spring-security-config

diff --git a/.gitignore b/.gitignore
index 51a633fa983b51c1e1a464aa5cf87e48de1c020f..5fad05636a791e388727d4d38c9633e294327e43 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -68,7 +68,6 @@ eu.etaxonomy.taxeditor.cdmlib/lib/spring-core-4.*.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/spring-expression-4.*.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/spring-jdbc-4.*.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/spring-oxm-4.*.jar
-eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-config-4.*.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-core-4.*.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/spring-test-4.*.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/spring-tx-4.*.jar

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index c4bd0bf9b30b3823ce5bc96448ddd8117458e070..2d1a354cafdff1ea46f0937d48a7ff3ea5d5206f 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -300,7 +300,6 @@ Export-Package: com.sun.istack.internal.tools,
  org.springframework.security.authentication.dao,
  org.springframework.security.authentication.encoding,
  org.springframework.security.authentication.event,
- org.springframework.security.config,
  org.springframework.security.core,
  org.springframework.security.core.context,
  org.springframework.security.core.userdetails,
@@ -391,7 +390,6 @@ Bundle-ClassPath: .,
  lib/spring-context-4.3.30.RELEASE.jar,
  lib/spring-core-4.3.30.RELEASE.jar,
  lib/spring-jdbc-4.3.30.RELEASE.jar,
- lib/spring-security-config-4.2.20.RELEASE.jar,
  lib/spring-security-core-4.2.20.RELEASE.jar,
  lib/spring-tx-4.3.30.RELEASE.jar,
  lib/spring-web-4.3.30.RELEASE.jar,

diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index cd22812a7156c14cc12cb15824cb6d4ef4ec9793..c7980877e4a913fd1b345cf2c7602ed9649e6436 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -74,7 +74,7 @@
                 hibernate-validator,\r
                 spring-context,spring-aspects,spring-beans,\r
                 spring-tx,spring-web,spring-core,spring-aop,\r
-                spring-jdbc,spring-security-config,spring-security-core,\r
+                spring-jdbc,spring-security-core,\r
                 aspectjweaver,\r
                 byte-buddy,\r
                 hibernate-core,hibernate-envers,antlr,\r
@@ -588,16 +588,7 @@
       <artifactId>jcl-over-slf4j</artifactId>\r
       <version>1.7.36</version>\r
     </dependency>\r
-    \r
-    <!-- Only added for correct package export -->\r
-    <!-- \r
-    <dependency>\r
-      <groupId>org.springframework.security</groupId>\r
-      <artifactId>spring-security-config</artifactId>\r
-      <version>${spring-security.version}</version>\r
-    </dependency>\r
-     -->\r
-     \r
+\r
     <dependency>\r
       <!-- https://stackoverflow.com/questions/38727655/maven-dependency-plugin-nosuchelementexception-for-aether-repositorysystem -->\r
       <groupId>org.apache.maven.resolver</groupId>\r