Update

aspectran · Mar 12, 2024 · 02828bb · 02828bb
1 parent 2ef8aef
commit 02828bb
Show file tree

Hide file tree

Showing 16 changed files with 107 additions and 105 deletions.
diff --git a/all/pom.xml b/all/pom.xml
@@ -123,7 +123,7 @@
             <artifactId>log4j-api</artifactId>
             <optional>true</optional>
         </dependency>
-        <!-- Test dependencies -->
+        <!-- Additional testing dependencies -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>

diff --git a/core/pom.xml b/core/pom.xml
@@ -37,15 +37,15 @@
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>aspectran-utils</artifactId>
+            <artifactId>aspectran-with-logback</artifactId>
             <version>${project.version}</version>
+            <type>pom</type>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>aspectran-with-logback</artifactId>
+            <artifactId>aspectran-utils</artifactId>
             <version>${project.version}</version>
-            <type>pom</type>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.javassist</groupId>
@@ -62,7 +62,7 @@
             <artifactId>ognl</artifactId>
             <version>3.4.2</version>
         </dependency>
-        <!-- Test dependencies -->
+        <!-- Additional testing dependencies -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>

diff --git a/daemon/pom.xml b/daemon/pom.xml
@@ -37,21 +37,22 @@
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>aspectran-core</artifactId>
+            <artifactId>aspectran-with-logback</artifactId>
             <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>aspectran-with-logback</artifactId>
+            <artifactId>aspectran-core</artifactId>
             <version>${project.version}</version>
-            <type>pom</type>
         </dependency>
         <dependency>
             <groupId>commons-daemon</groupId>
             <artifactId>commons-daemon</artifactId>
             <version>1.3.4</version>
         </dependency>
-        <!-- Test dependencies -->
+        <!-- Additional testing dependencies -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>

diff --git a/demo/pom.xml b/demo/pom.xml
@@ -143,6 +143,12 @@
     </build>
 
     <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>aspectran-with-logback</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>aspectran-shell-jline</artifactId>

diff --git a/embed/pom.xml b/embed/pom.xml
@@ -37,17 +37,17 @@
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>aspectran-core</artifactId>
+            <artifactId>aspectran-with-logback</artifactId>
             <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
         </dependency>
-        <!-- Test dependencies -->
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>aspectran-with-logback</artifactId>
+            <artifactId>aspectran-core</artifactId>
             <version>${project.version}</version>
-            <type>pom</type>
-            <scope>test</scope>
         </dependency>
+        <!-- Additional testing dependencies -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -116,19 +116,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <!-- Redundantly declared to automatically omit lower version dependencies -->
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>2.0.12</version>
-                <optional>true</optional>
-            </dependency>
-            <dependency>
-                <groupId>ch.qos.logback</groupId>
-                <artifactId>logback-classic</artifactId>
-                <version>1.5.3</version>
-                <optional>true</optional>
-            </dependency>
             <!-- All optional dependencies -->
             <dependency>
                 <groupId>commons-logging</groupId>

diff --git a/rss-lettuce/pom.xml b/rss-lettuce/pom.xml
@@ -36,6 +36,13 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>aspectran-with-logback</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>aspectran-core</artifactId>
@@ -52,20 +59,13 @@
             <artifactId>commons-pool2</artifactId>
             <version>2.12.0</version>
         </dependency>
-        <!-- Test dependencies -->
+        <!-- Additional testing dependencies -->
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>aspectran-embed</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>aspectran-with-logback</artifactId>
-            <version>${project.version}</version>
-            <type>pom</type>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>

diff --git a/shell-jline/pom.xml b/shell-jline/pom.xml
@@ -36,6 +36,13 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>aspectran-with-logback</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>aspectran-shell</artifactId>
@@ -62,7 +69,7 @@
             <artifactId>jna</artifactId>
             <version>5.14.0</version>
         </dependency>
-        <!-- Test dependencies -->
+        <!-- Additional testing dependencies -->
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>aspectran-with-freemarker</artifactId>

diff --git a/shell/pom.xml b/shell/pom.xml
@@ -37,16 +37,17 @@
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>aspectran-core</artifactId>
+            <artifactId>aspectran-with-logback</artifactId>
             <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>aspectran-with-logback</artifactId>
+            <artifactId>aspectran-core</artifactId>
             <version>${project.version}</version>
-            <type>pom</type>
         </dependency>
-        <!-- Test dependencies -->
+        <!-- Additional testing dependencies -->
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>aspectran-with-freemarker</artifactId>

diff --git a/utils/pom.xml b/utils/pom.xml
@@ -34,21 +34,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <version>3.0.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jasypt</groupId>
-            <artifactId>jasypt</artifactId>
-            <version>1.9.3</version>
-        </dependency>
-        <dependency>
-            <groupId>net.java.dev.jna</groupId>
-            <artifactId>jna</artifactId>
-            <version>5.14.0</version>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>aspectran-with-logback</artifactId>
@@ -66,7 +51,22 @@
             <artifactId>log4j-api</artifactId>
             <optional>true</optional>
         </dependency>
-        <!-- Test dependencies -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jasypt</groupId>
+            <artifactId>jasypt</artifactId>
+            <version>1.9.3</version>
+        </dependency>
+        <dependency>
+            <groupId>net.java.dev.jna</groupId>
+            <artifactId>jna</artifactId>
+            <version>5.14.0</version>
+        </dependency>
+        <!-- Additional testing dependencies -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>

diff --git a/web/pom.xml b/web/pom.xml
@@ -34,6 +34,13 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>aspectran-with-logback</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>aspectran-core</artifactId>
@@ -73,14 +80,7 @@
             <version>2.1.1</version>
             <scope>provided</scope>
         </dependency>
-        <!-- Test dependencies -->
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>aspectran-with-logback</artifactId>
-            <version>${project.version}</version>
-            <type>pom</type>
-            <scope>test</scope>
-        </dependency>
+        <!-- Additional testing dependencies -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>

diff --git a/with-freemarker/pom.xml b/with-freemarker/pom.xml
@@ -36,6 +36,13 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>aspectran-with-logback</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>aspectran-core</artifactId>
@@ -47,20 +54,13 @@
             <artifactId>freemarker</artifactId>
             <version>${freemarker.version}</version>
         </dependency>
-        <!-- Test dependencies -->
+        <!-- Additional testing dependencies -->
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>aspectran-embed</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>aspectran-with-logback</artifactId>
-            <version>${project.version}</version>
-            <type>pom</type>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>

diff --git a/with-jetty/pom.xml b/with-jetty/pom.xml
@@ -36,6 +36,13 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>aspectran-with-logback</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>aspectran-web</artifactId>
@@ -80,20 +87,13 @@
             <artifactId>jetty-ee10-glassfish-jstl</artifactId>
             <version>${jetty.version}</version>
         </dependency>
-        <!-- Test dependencies -->
+        <!-- Additional testing dependencies -->
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>aspectran-embed</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>aspectran-with-logback</artifactId>
-            <version>${project.version}</version>
-            <type>pom</type>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>

diff --git a/with-mybatis/pom.xml b/with-mybatis/pom.xml
@@ -36,6 +36,13 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>aspectran-with-logback</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>aspectran-core</artifactId>
@@ -47,20 +54,13 @@
             <artifactId>mybatis</artifactId>
             <version>${mybatis.version}</version>
         </dependency>
-        <!-- Test dependencies -->
+        <!-- Additional testing dependencies -->
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>aspectran-embed</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>aspectran-with-logback</artifactId>
-            <version>${project.version}</version>
-            <type>pom</type>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>