Merge pull request #285 from anotheria/develop.4x

Migration of develop.4x back into develop
anotheria · Apr 29, 2024 · 51c546c · 51c546c
2 parents a541b11 + 28fa297
commit 51c546c
Show file tree

Hide file tree

Showing 221 changed files with 746 additions and 764 deletions.
diff --git a/moskito-aop/pom.xml b/moskito-aop/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <groupId>net.anotheria</groupId>
 		<artifactId>moskito</artifactId>
-		<version>3.2.9-SNAPSHOT</version>
+		<version>4.0.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>moskito-aop</artifactId>
-  	<version>3.2.9-SNAPSHOT</version>
+  	<version>4.0.2-SNAPSHOT</version>
     <name>moskito aop</name>
 
     <build>
@@ -34,12 +34,12 @@
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjrt</artifactId>
-			<version>1.8.8</version>
+			<version>1.9.20</version>
         </dependency>
 		<dependency>
 			<groupId>org.aspectj</groupId>
 			<artifactId>aspectjweaver</artifactId>
-			<version>1.8.8</version>
+			<version>1.9.20</version>
 		</dependency>
 	  <dependency>
 	      <groupId>ch.qos.logback</groupId>
@@ -52,4 +52,4 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-</project>
+</project>
diff --git a/moskito-aop/src/main/java/net/anotheria/moskito/aop/aspect/MonitoringBaseAspect.java b/moskito-aop/src/main/java/net/anotheria/moskito/aop/aspect/MonitoringBaseAspect.java
@@ -293,7 +293,7 @@ private StringBuilder getSpecialTreatmentForCall(String methodName, Object targe
 	private static final ConcurrentMap<String, SpecialCase> specialCases = new ConcurrentHashMap<>();
 
 	static{
-    	specialCases.put("doFilter", new SpecialCase("doFilter", "javax.servlet.Filter", new HttpFilterHandler()));
+    	specialCases.put("doFilter", new SpecialCase("doFilter", "jakarta.servlet.Filter", new HttpFilterHandler()));
 	}
 
 	/**
@@ -322,4 +322,4 @@ static class SpecialCase{
 
 	}
 
-}
+}
diff --git a/...-aop/src/main/java/net/anotheria/moskito/aop/aspect/specialtreater/HttpFilterHandler.java b/...-aop/src/main/java/net/anotheria/moskito/aop/aspect/specialtreater/HttpFilterHandler.java
@@ -17,7 +17,7 @@ public StringBuilder getCallDescription(Class clazz, String methodName, Object t
 
 		//this is special treater for http filter.
 		try {
-			Class requestClazz = Class.forName("javax.servlet.http.HttpServletRequest");
+			Class requestClazz = Class.forName("jakarta.servlet.http.HttpServletRequest");
 			Object requestObject = args[0];
 			if (!requestClazz.isInstance(requestObject))
 				return null;

diff --git a/moskito-core/pom.xml b/moskito-core/pom.xml
@@ -3,12 +3,12 @@
   <parent>
 	<groupId>net.anotheria</groupId>
 	<artifactId>moskito</artifactId>
-	<version>3.2.9-SNAPSHOT</version>
+	<version>4.0.2-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>moskito-core</artifactId>
-  <version>3.2.9-SNAPSHOT</version>
+  <version>4.0.2-SNAPSHOT</version>
   <name>moskito core</name>
 
   <dependencies>
@@ -20,6 +20,7 @@
       <dependency>
           <groupId>org.apache.logging.log4j</groupId>
           <artifactId>log4j-core</artifactId>
+          <version>2.21.1</version>
           <scope>provided</scope>
       </dependency>
 	<dependency>
@@ -57,7 +58,12 @@
 	  <dependency>
 		  <groupId>org.apache.commons</groupId>
 		  <artifactId>commons-lang3</artifactId>
-		  <version>3.11</version>
+		  <version>3.13.0</version>
 	  </dependency>
+      <dependency>
+          <groupId>jakarta.xml.bind</groupId>
+          <artifactId>jakarta.xml.bind-api</artifactId>
+          <version>4.0.1</version>
+      </dependency>
   </dependencies>
 </project>
diff --git a/moskito-core/src/main/java/net/anotheria/moskito/core/config/dashboards/ChartPattern.java b/moskito-core/src/main/java/net/anotheria/moskito/core/config/dashboards/ChartPattern.java
@@ -36,7 +36,7 @@ public class ChartPattern implements Serializable {
     /**
      * Stores compiled accumulatorPatterns
      */
-    private Pattern[] patterns;
+    private transient Pattern[] patterns;
 
     /**
      * Graph data mode (single charts or combined chart).

diff --git a/moskito-core/src/main/java/net/anotheria/moskito/core/config/dashboards/DashboardConfig.java b/moskito-core/src/main/java/net/anotheria/moskito/core/config/dashboards/DashboardConfig.java
@@ -84,7 +84,7 @@ public class DashboardConfig implements Serializable{
 	/**
 	 * Stores compiled producerNamePatterns
 	 */
-	private Pattern[] patterns;
+	private transient Pattern[] patterns;
 
 	/**
 	 * Widgets that should be present on dashboard.

diff --git a/...o-core/src/main/java/net/anotheria/moskito/core/threshold/guard/LongBarrierPassGuard.java b/...o-core/src/main/java/net/anotheria/moskito/core/threshold/guard/LongBarrierPassGuard.java
@@ -2,7 +2,7 @@
 
 import net.anotheria.moskito.core.threshold.ThresholdStatus;
 
-import javax.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElement;
 import java.io.Serializable;
 
 /**

diff --git a/moskito-extensions/moskito-additional-producers/pom.xml b/moskito-extensions/moskito-additional-producers/pom.xml
@@ -3,13 +3,13 @@
   <parent>
 	<groupId>net.anotheria</groupId>
 	<artifactId>moskito</artifactId>
-	<version>3.2.9-SNAPSHOT</version>
+	<version>4.0.2-SNAPSHOT</version>
 	<relativePath>../../pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>moskito-additional-producers</artifactId>
-  <version>3.2.9-SNAPSHOT</version>
+  <version>4.0.2-SNAPSHOT</version>
   <name>additional producers</name>
 
   <dependencies>
@@ -31,7 +31,7 @@
       <dependency>
           <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
           <artifactId>concurrentlinkedhashmap-lru</artifactId>
-          <version>1.4</version>
+          <version>1.4.2</version>
       </dependency>
   </dependencies>
-</project>
+</project>
diff --git a/moskito-extensions/moskito-disk-space-monitoring/pom.xml b/moskito-extensions/moskito-disk-space-monitoring/pom.xml
@@ -3,13 +3,13 @@
   <parent>
 	<groupId>net.anotheria</groupId>
 	<artifactId>moskito</artifactId>
-	<version>3.2.9-SNAPSHOT</version>
+	<version>4.0.2-SNAPSHOT</version>
 	<relativePath>../../pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>moskito-disk-space-monitoring</artifactId>
-  <version>3.2.9-SNAPSHOT</version>
+  <version>4.0.2-SNAPSHOT</version>
   <name>moskito disk space monitoring</name>
 
   <dependencies>
@@ -37,4 +37,4 @@
           <artifactId>gson</artifactId>
       </dependency>
   </dependencies>
-</project>
+</project>
diff --git a/moskito-extensions/moskito-mongodb/pom.xml b/moskito-extensions/moskito-mongodb/pom.xml
@@ -3,12 +3,12 @@
     <parent>
         <artifactId>moskito-extensions</artifactId>
         <groupId>net.anotheria</groupId>
-        <version>3.2.9-SNAPSHOT</version>
+        <version>4.0.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>moskito-mongodb</artifactId>
-    <version>3.2.9-SNAPSHOT</version>
+    <version>4.0.2-SNAPSHOT</version>
     <name>moskito mongodb monitoring</name>
 
     <dependencies>
@@ -31,4 +31,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>
diff --git a/moskito-extensions/moskito-monitoring-plugin/pom.xml b/moskito-extensions/moskito-monitoring-plugin/pom.xml
@@ -3,12 +3,12 @@
     <parent>
         <artifactId>moskito-extensions</artifactId>
         <groupId>net.anotheria</groupId>
-        <version>3.2.9-SNAPSHOT</version>
+        <version>4.0.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>moskito-monitoring-plugin</artifactId>
-    <version>3.2.9-SNAPSHOT</version>
+    <version>4.0.2-SNAPSHOT</version>
     <name>moskito generic monitoring plugin</name>
     <packaging>jar</packaging>
 
@@ -33,4 +33,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>
diff --git a/...-plugin/src/main/java/net/anotheria/moskito/extensions/monitoring/fetcher/HttpHelper.java b/...-plugin/src/main/java/net/anotheria/moskito/extensions/monitoring/fetcher/HttpHelper.java
@@ -1,6 +1,6 @@
 package net.anotheria.moskito.extensions.monitoring.fetcher;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;

diff --git a/...-plugin/src/main/java/net/anotheria/moskito/extensions/monitoring/stats/GenericStats.java b/...-plugin/src/main/java/net/anotheria/moskito/extensions/monitoring/stats/GenericStats.java
@@ -54,7 +54,7 @@ protected GenericStats(String aName, List<T> metrics) {
 
     /**
      * Get 'neverUpdated' status of this GenericStats.
-     * @return <tt>false</tt> until first values update and <tt>true</tt> - after.
+     * @return false until first values update and true - after.
      */
     public boolean isNeverUpdated() {
         return neverUpdated;

diff --git a/moskito-extensions/moskito-notification-providers/pom.xml b/moskito-extensions/moskito-notification-providers/pom.xml
@@ -3,13 +3,13 @@
   <parent>
 	<groupId>net.anotheria</groupId>
 	<artifactId>moskito</artifactId>
-	<version>3.2.9-SNAPSHOT</version>
+	<version>4.0.2-SNAPSHOT</version>
 	<relativePath>../../pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>moskito-notification-providers</artifactId>
-  <version>3.2.9-SNAPSHOT</version>
+  <version>4.0.2-SNAPSHOT</version>
   <name>notification providers</name>
 
   <dependencies>
@@ -37,5 +37,10 @@
           <groupId>net.anotheria</groupId>
           <artifactId>ano-comm</artifactId>
       </dependency>
+      <dependency>
+          <groupId>jakarta.ws.rs</groupId>
+          <artifactId>jakarta.ws.rs-api</artifactId>
+          <version>3.1.0</version>
+      </dependency>
   </dependencies>
-</project>
+</project>
diff --git a/...a/net/anotheria/moskito/extensions/notificationproviders/MailgunNotificationProvider.java b/...a/net/anotheria/moskito/extensions/notificationproviders/MailgunNotificationProvider.java
@@ -1,23 +1,22 @@
 package net.anotheria.moskito.extensions.notificationproviders;
 
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.MediaType;
 import net.anotheria.moskito.core.config.thresholds.NotificationProviderConfig;
 import net.anotheria.moskito.core.threshold.alerts.NotificationProvider;
 import net.anotheria.moskito.core.threshold.alerts.ThresholdAlert;
 import net.anotheria.moskito.core.util.IOUtils;
 import net.anotheria.moskito.extensions.notificationtemplate.ThresholdAlertTemplate;
 import net.anotheria.util.StringUtils;
-import org.glassfish.jersey.client.ClientConfig;
 import org.glassfish.jersey.client.ClientResponse;
 import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;
 import org.glassfish.jersey.internal.util.collection.MultivaluedStringMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
 import java.util.ArrayList;
 
 /**
@@ -97,11 +96,9 @@ public MailgunNotificationProvider() {
         sender = System.getProperty(SYSTEM_PROPERTY_SENDER, DEFAULT_SENDER);
         log.debug("Sender is " + sender);
 
-        ClientConfig config = new ClientConfig();
         HttpAuthenticationFeature feature = HttpAuthenticationFeature.basicBuilder().nonPreemptive().credentials("api", anApiKey).build();
-        config.register(feature);
-        client = ClientBuilder.newClient(config);
-
+        client = ClientBuilder.newClient();
+        client.register(feature);
 
     }
 

diff --git a/moskito-extensions/moskito-php/pom.xml b/moskito-extensions/moskito-php/pom.xml
@@ -3,12 +3,12 @@
     <parent>
         <artifactId>moskito-extensions</artifactId>
         <groupId>net.anotheria</groupId>
-        <version>3.2.9-SNAPSHOT</version>
+        <version>4.0.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>moskito-php</artifactId>
-
+    <version>4.0.2-SNAPSHOT</version>
     <dependencies>
 
         <dependency>
@@ -20,14 +20,14 @@
         <dependency>
             <groupId>com.rabbitmq</groupId>
             <artifactId>amqp-client</artifactId>
-            <version>5.18.0</version>
+            <version>5.20.0</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.9</version>
+            <version>2.10.1</version>
         </dependency>
 
     </dependencies>
 
-</project>
+</project>
diff --git a/moskito-extensions/moskito-saas/pom.xml b/moskito-extensions/moskito-saas/pom.xml
@@ -3,13 +3,13 @@
   <parent>
 	<groupId>net.anotheria</groupId>
 	<artifactId>moskito</artifactId>
-	<version>3.2.9-SNAPSHOT</version>
+	<version>4.0.2-SNAPSHOT</version>
 	<relativePath>../../pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>moskito-saas-plugin</artifactId>
-  <version>3.2.9-SNAPSHOT</version>
+  <version>4.0.2-SNAPSHOT</version>
   <name>moskito-saas-plugin</name>
 
   <dependencies>
@@ -33,4 +33,4 @@
           <scope>test</scope>
       </dependency>
   </dependencies>
-</project>
+</project>
diff --git a/moskito-extensions/moskito-sampling-api/pom.xml b/moskito-extensions/moskito-sampling-api/pom.xml
@@ -3,13 +3,13 @@
   <parent>
 	<groupId>net.anotheria</groupId>
 	<artifactId>moskito</artifactId>
-	<version>3.2.9-SNAPSHOT</version>
+	<version>4.0.2-SNAPSHOT</version>
 	<relativePath>../../pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>moskito-sampling-api</artifactId>
-  <version>3.2.9-SNAPSHOT</version>
+  <version>4.0.2-SNAPSHOT</version>
   <name>sampling api</name>
 
   <dependencies>
@@ -33,10 +33,10 @@
           <scope>test</scope>
       </dependency>
       <dependency>
-          <groupId>javax.servlet</groupId>
-          <artifactId>javax.servlet-api</artifactId>
+          <groupId>jakarta.servlet</groupId>
+          <artifactId>jakarta.servlet-api</artifactId>
           <scope>provided</scope>
       </dependency>
 
   </dependencies>
-</project>
+</project>