Named GuiceContexts, SLF4J to Log4J2

GuicedEE · Oct 23, 2024 · 19a2528 · 19a2528
1 parent 9c96a18
commit 19a2528
Show file tree

Hide file tree

Showing 6 changed files with 80 additions and 129 deletions.
diff --git a/...rc/main/java/org/hibernate/boot/archive/internal/shade/JarFileBasedArchiveDescriptor.java b/...rc/main/java/org/hibernate/boot/archive/internal/shade/JarFileBasedArchiveDescriptor.java
@@ -80,10 +80,12 @@ protected class JRTModuleWalker extends java.nio.file.SimpleFileVisitor<java.nio
 		public java.nio.file.FileVisitResult visitFile(java.nio.file.Path path, java.nio.file.attribute.BasicFileAttributes attrs) throws java.io.IOException
 		{
 			String name = path.toString();
+		//	System.out.println("visiting - " + name);
 			if (name.startsWith("/modules/"))
 			{
 				name = name.substring(9);
 				name = name.substring(name.indexOf('/') + 1);
+		//		System.out.println("visiting clean - " + name);
 			}
 			java.nio.file.Path lateralPath = null;
 			try
@@ -92,6 +94,8 @@ public java.nio.file.FileVisitResult visitFile(java.nio.file.Path path, java.nio
 			}
 			catch (java.net.URISyntaxException e)
 			{
+	//			System.err.println("Cannot walk tree - " + e.getMessage());
+	//			e.printStackTrace(System.err);
 				visitFileFailed(path, new java.io.IOException("Unable to walk file", e));
 			}
 			String basePrefix = getEntryBasePrefix();

diff --git a/Vert.x/rest.vertx/pom.xml b/Vert.x/rest.vertx/pom.xml
@@ -25,8 +25,6 @@
         <version.zandero.http>1.3</version.zandero.http>
         <version.zandero.utils.junit>1.1</version.zandero.utils.junit>
 
-        <version.java.annotation>1.3.2</version.java.annotation>
-
         <version.guice>7.0.0</version.guice>
         <version.glassfish>3.1.8</version.glassfish>
 
@@ -119,12 +117,6 @@
             <artifactId>jackson-databind</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
-            <version>${version.java.annotation}</version>
-        </dependency>
-
         <!-- ========== TESTS ================= -->
         <!--Testing stuff bellow-->
         <dependency>

diff --git a/Vert.x/rest.vertx/src/main/java/module-info.java b/Vert.x/rest.vertx/src/main/java/module-info.java
@@ -1,15 +1,15 @@
 module com.zandero.rest.vertx {
     requires transitive io.vertx.core;
 
+    requires transitive jakarta.ws.rs;
+
     requires jakarta.validation;
     requires jakarta.annotation;
-    requires jakarta.ws.rs;
+
     requires org.slf4j;
 
-   // requires java.annotation;
     requires com.fasterxml.jackson.databind;
 
-
     exports com.zandero.rest;
     exports com.zandero.rest.authentication;
     exports com.zandero.rest.authorization;
@@ -19,7 +19,6 @@
     exports com.zandero.rest.bean;
     exports com.zandero.rest.reader;
     exports com.zandero.rest.writer;
-
     exports com.zandero.rest.events;
 
 }
diff --git a/guice-inject-client/pom.xml b/guice-inject-client/pom.xml
@@ -32,22 +32,30 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
+            <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j2-impl</artifactId>
+            <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-jul</artifactId>
-            <version>${log4j2.version}</version>
+            <scope>compile</scope>
         </dependency>
+
     </dependencies>
 
     <build>
@@ -86,6 +94,13 @@
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-bom</artifactId>
+                <version>${log4j2.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>