[Build] restructure dependency listings

This mainly affects the logging-dependencies.
HannesWell · Sep 3, 2021 · 0215cb6 · 0215cb6
1 parent dadeb65
commit 0215cb6
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 48 deletions.
diff --git a/symja_android_library/matheclipse-core/pom.xml b/symja_android_library/matheclipse-core/pom.xml
@@ -43,22 +43,6 @@
 			<artifactId>apfloat</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-core</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-simple</artifactId>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>log4j-over-slf4j</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.hipparchus</groupId>
 			<artifactId>hipparchus-clustering</artifactId>
@@ -120,5 +104,23 @@
 			<artifactId>univocity-parsers</artifactId>
 		</dependency>
 
+		<!-- logging dependencies -->
+
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-core</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-simple</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>log4j-over-slf4j</artifactId>
+		</dependency>
+
 	</dependencies>
 </project>
diff --git a/symja_android_library/matheclipse-external/pom.xml b/symja_android_library/matheclipse-external/pom.xml
@@ -27,22 +27,6 @@
 
 	<dependencies>
 
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-core</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-simple</artifactId>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>log4j-over-slf4j</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
@@ -73,10 +57,28 @@
 			<artifactId>commons-text</artifactId>
 		</dependency>
 
-		<!-- <dependency> <groupId>edu.stanford.nlp</groupId> <artifactId>stanford-corenlp</artifactId> 
-			<version>4.0.0</version> </dependency> <dependency> <groupId>edu.stanford.nlp</groupId> 
-			<artifactId>stanford-corenlp</artifactId> <version>4.0.0</version> <classifier>models</classifier> 
+		<!-- <dependency> <groupId>edu.stanford.nlp</groupId> <artifactId>stanford-corenlp</artifactId>
+			<version>4.0.0</version> </dependency> <dependency> <groupId>edu.stanford.nlp</groupId>
+			<artifactId>stanford-corenlp</artifactId> <version>4.0.0</version> <classifier>models</classifier>
 			</dependency> -->
 
+		<!-- logging dependencies -->
+
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-core</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-simple</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>log4j-over-slf4j</artifactId>
+		</dependency>
+
 	</dependencies>
 </project>
diff --git a/symja_android_library/matheclipse-io/pom.xml b/symja_android_library/matheclipse-io/pom.xml
@@ -83,6 +83,8 @@
 			<artifactId>poi-ooxml</artifactId>
 		</dependency>
 
+		<!-- test dependencies -->
+
 		<dependency>
 			<groupId>com.tngtech.archunit</groupId>
 			<artifactId>archunit-junit4</artifactId>

diff --git a/symja_android_library/pom.xml b/symja_android_library/pom.xml
@@ -206,12 +206,6 @@
 				<version>1.8</version>
 			</dependency>
 
-			<dependency>
-				<groupId>org.apache.logging.log4j</groupId>
-				<artifactId>log4j-core</artifactId>
-				<version>2.13.2</version>
-			</dependency>
-
 			<dependency>
 				<groupId>org.apache.lucene</groupId>
 				<artifactId>lucene-analyzers-common</artifactId>
@@ -224,7 +218,7 @@
 				<version>4.1.1</version>
 			</dependency>
 
-			<!-- <dependency> <groupId>de.uni-mannheim.rz.krum</groupId> <artifactId>jas</artifactId> 
+			<!-- <dependency> <groupId>de.uni-mannheim.rz.krum</groupId> <artifactId>jas</artifactId>
 				<version>2.6.6025</version> </dependency> -->
 
 			<dependency>
@@ -249,7 +243,7 @@
 				<groupId>org.gavaghan</groupId>
 				<artifactId>geodesy</artifactId>
 				<version>1.1.3</version>
-			</dependency> 
+			</dependency>
 
 			<dependency>
 				<groupId>org.hipparchus</groupId>
@@ -305,6 +299,14 @@
 				<version>0.8.12</version>
 			</dependency>
 
+			<!-- logging dependencies -->
+
+			<dependency>
+				<groupId>org.apache.logging.log4j</groupId>
+				<artifactId>log4j-core</artifactId>
+				<version>2.13.2</version>
+			</dependency>
+
 			<dependency>
 				<groupId>org.slf4j</groupId>
 				<artifactId>log4j-over-slf4j</artifactId>
@@ -338,8 +340,8 @@
 
 	</dependencies>
 
-	<!-- <repositories> <repository> <id>orekit</id> <url>https://packages.orekit.org/repository/maven-public/</url> 
-		</repository> <repository> <id>sonatype</id> <url>https://oss.sonatype.org/content/groups/public/</url> 
+	<!-- <repositories> <repository> <id>orekit</id> <url>https://packages.orekit.org/repository/maven-public/</url>
+		</repository> <repository> <id>sonatype</id> <url>https://oss.sonatype.org/content/groups/public/</url>
 		</repository> </repositories> -->
 
 	<build>
@@ -429,9 +431,9 @@
 					</configuration>
 				</plugin>
 
-				<!-- <plugin> <groupId>com.google.cloud.tools</groupId> <artifactId>jib-maven-plugin</artifactId> 
-					<version>2.7.0</version> <configuration> <to> <image>servletserver</image> 
-					</to> <container> <mainClass>org.matheclipse.io.servlet.ServletServer</mainClass> 
+				<!-- <plugin> <groupId>com.google.cloud.tools</groupId> <artifactId>jib-maven-plugin</artifactId>
+					<version>2.7.0</version> <configuration> <to> <image>servletserver</image>
+					</to> <container> <mainClass>org.matheclipse.io.servlet.ServletServer</mainClass>
 					</container> </configuration> </plugin> -->
 
 			</plugins>