removed fixture-aspect as its own module

martinlau · Jul 2, 2013 · 21a8efd · 21a8efd
1 parent 191c136
commit 21a8efd
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 107 deletions.
diff --git a/fixture-aspect/pom.xml b/fixture-aspect/pom.xml
diff --git a/fixture-aspect/src/test/resources/logback-test.xml b/fixture-aspect/src/test/resources/logback-test.xml
diff --git a/fixture-web/pom.xml b/fixture-web/pom.xml
@@ -23,7 +23,6 @@
                 <artifactId>maven-dependency-plugin</artifactId>
                 <configuration>
                     <usedDependencies>
-                        <usedDependency>ch.qos.logback:logback-classic</usedDependency>
                         <usedDependency>com.h2database:h2</usedDependency>
                         <usedDependency>com.mchange:c3p0</usedDependency>
                         <usedDependency>info.cukes:cucumber-html</usedDependency>
@@ -50,10 +49,6 @@
                 <artifactId>aspectj-maven-plugin</artifactId>
                 <configuration>
                     <aspectLibraries>
-                        <aspectLibrary>
-                            <groupId>io.fixture</groupId>
-                            <artifactId>fixture-aspect</artifactId>
-                        </aspectLibrary>
                         <aspectLibrary>
                             <groupId>org.springframework</groupId>
                             <artifactId>spring-aspects</artifactId>
@@ -84,14 +79,13 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>io.fixture</groupId>
-            <artifactId>fixture-aspect</artifactId>
-            <version>0.1-SNAPSHOT</version>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <scope>test</scope>
+            <artifactId>logback-core</artifactId>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
@@ -187,6 +181,10 @@
             <artifactId>selenium-firefox-driver</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>

diff --git a/...o/fixture/aspect/AbstractLoggingAspect.aj → ...o/fixture/aspect/AbstractLoggingAspect.aj b/...o/fixture/aspect/AbstractLoggingAspect.aj → ...o/fixture/aspect/AbstractLoggingAspect.aj
diff --git a/...ixture/aspect/ConstructorLoggingAspect.aj → ...ixture/aspect/ConstructorLoggingAspect.aj b/...ixture/aspect/ConstructorLoggingAspect.aj → ...ixture/aspect/ConstructorLoggingAspect.aj
diff --git a/.../io/fixture/aspect/MethodLoggingAspect.aj → .../io/fixture/aspect/MethodLoggingAspect.aj b/.../io/fixture/aspect/MethodLoggingAspect.aj → .../io/fixture/aspect/MethodLoggingAspect.aj
diff --git a/...re/aspect/ConstructorLoggingAspectTest.kt → ...re/aspect/ConstructorLoggingAspectTest.kt b/...re/aspect/ConstructorLoggingAspectTest.kt → ...re/aspect/ConstructorLoggingAspectTest.kt
diff --git a/...fixture/aspect/MethodLoggingAspectTest.kt → ...fixture/aspect/MethodLoggingAspectTest.kt b/...fixture/aspect/MethodLoggingAspectTest.kt → ...fixture/aspect/MethodLoggingAspectTest.kt
diff --git a/...ure/aspect/test/LoggedConstructorClass.kt → ...ure/aspect/test/LoggedConstructorClass.kt b/...ure/aspect/test/LoggedConstructorClass.kt → ...ure/aspect/test/LoggedConstructorClass.kt
diff --git a/.../fixture/aspect/test/LoggedMethodClass.kt → .../fixture/aspect/test/LoggedMethodClass.kt b/.../fixture/aspect/test/LoggedMethodClass.kt → .../fixture/aspect/test/LoggedMethodClass.kt
diff --git a/pom.xml b/pom.xml
@@ -17,7 +17,6 @@
     <modules>
         <module>fixture-parent</module>
         <module>fixture-annotation</module>
-        <module>fixture-aspect</module>
         <module>fixture-web</module>
     </modules>