removed fixture-security as its own module

martinlau · Jul 2, 2013 · fa22189 · fa22189
1 parent 75f51ff
commit fa22189
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 3 deletions.
diff --git a/fixture-web/pom.xml b/fixture-web/pom.xml
@@ -24,10 +24,11 @@
                 <configuration>
                     <usedDependencies>
                         <usedDependency>io.fixture:fixture-annotation</usedDependency>
-                        <usedDependency>io.fixture:fixture-security</usedDependency>
+                        <usedDependency>io.fixture:fixture-data-test</usedDependency>
                         <usedDependency>javax.servlet:jstl</usedDependency>
                         <usedDependency>org.apache.tiles:tiles-jsp</usedDependency>
                         <usedDependency>org.springframework.data:spring-data-rest-webmvc</usedDependency>
+                        <usedDependency>org.springframework.security:spring-security-config</usedDependency>
                         <usedDependency>org.webjars:bootswatch</usedDependency>
                         <usedDependency>org.webjars:font-awesome</usedDependency>
                         <usedDependency>org.webjars:html5shiv</usedDependency>
@@ -44,6 +45,10 @@
                             <groupId>io.fixture</groupId>
                             <artifactId>fixture-aspect</artifactId>
                         </aspectLibrary>
+                        <aspectLibrary>
+                            <groupId>org.springframework</groupId>
+                            <artifactId>spring-aspects</artifactId>
+                        </aspectLibrary>
                     </aspectLibraries>
                 </configuration>
             </plugin>
@@ -93,8 +98,14 @@
         </dependency>
         <dependency>
             <groupId>io.fixture</groupId>
-            <artifactId>fixture-security</artifactId>
+            <artifactId>fixture-data</artifactId>
+            <version>0.1-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>io.fixture</groupId>
+            <artifactId>fixture-data-test</artifactId>
             <version>0.1-SNAPSHOT</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
@@ -108,6 +119,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.aspectj</groupId>
@@ -121,6 +133,14 @@
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-stdlib</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aspects</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
@@ -134,6 +154,10 @@
             <artifactId>spring-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-tx</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
@@ -147,6 +171,19 @@
             <artifactId>spring-data-rest-webmvc</artifactId>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-config</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-web</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.tiles</groupId>
             <artifactId>tiles-jsp</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -20,7 +20,6 @@
         <module>fixture-aspect</module>
         <module>fixture-data-test</module>
         <module>fixture-data</module>
-        <module>fixture-security</module>
         <module>fixture-web</module>
         <module>fixture-feature</module>
     </modules>