Merge PR #1343

Author: hlg

BimServer/pom.xml

@@ -56,7 +56,7 @@
 		<dependency>
 			<groupId>commons-fileupload</groupId>
 			<artifactId>commons-fileupload</artifactId>
-			<version>1.4</version>
+			<version>1.5</version>
 		</dependency>
 		<dependency>
 			<groupId>com.sun.mail</groupId>
@@ -76,7 +76,7 @@
 		<dependency>
 			<groupId>com.googlecode.cqengine</groupId>
 			<artifactId>cqengine</artifactId>
-			<version>3.0.0</version>
+			<version>3.6.0</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.javassist</groupId>
@@ -87,7 +87,7 @@
 		<dependency>
 			<groupId>com.rometools</groupId>
 			<artifactId>rome</artifactId>
-			<version>1.7.1</version>
+			<version>1.19.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.quartz-scheduler</groupId>
@@ -112,7 +112,7 @@
 		<dependency>
 			<groupId>org.codehaus.jettison</groupId>
 			<artifactId>jettison</artifactId>
-			<version>1.5.2</version>
+			<version>1.5.4</version>
 		</dependency>
 		<dependency>
 			<groupId>com.thetransactioncompany</groupId>
@@ -127,7 +127,7 @@
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-javascript</artifactId>
-			<version>3.3.1</version>
+			<version>${cxf.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.oltu.oauth2</groupId>

BimServerClientLib/pom.xml

@@ -8,9 +8,6 @@
 		<artifactId>parent</artifactId>
 		<version>1.5.187-SNAPSHOT</version>
 	</parent>
-	<properties>
-		<cxf.version>3.3.2</cxf.version>
-	</properties>
 	<build>
 		<sourceDirectory>src</sourceDirectory>
 		<testSourceDirectory>test</testSourceDirectory>
@@ -52,7 +49,7 @@
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
-			<version>1.2.3</version>
+			<version>1.3.14</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

BimServerJar/pom.xml

@@ -96,17 +96,17 @@
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-core</artifactId>
-			<version>1.2.9</version>
+			<version>1.3.14</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-alpn-java-client</artifactId>
-			<version>9.4.19.v20190610</version>
+			<version>${jetty.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
-			<version>1.2.0</version>
+			<version>1.3.14</version>
 		</dependency>
 	</dependencies>
 	<licenses>

BimServerWar/pom.xml

@@ -92,7 +92,7 @@
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
-			<version>1.2.3</version>
+			<version>1.3.14</version>
 		</dependency>
 	</dependencies>
 	<licenses>

PluginBase/pom.xml

@@ -45,7 +45,7 @@
 		<dependency>
 			<groupId>com.sun.xml.ws</groupId>
 			<artifactId>jaxws-ri</artifactId>
-			<version>2.3.2</version>
+			<version>2.3.7</version>
 			<type>pom</type>
 		</dependency>
 		<dependency>
@@ -118,7 +118,7 @@
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>26.0-jre</version>
+			<version>33.3.1-jre</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
@@ -138,7 +138,7 @@
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
-			<version>2.7</version>
+			<version> 2.18.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
@@ -163,17 +163,17 @@
 		<dependency>
 			<groupId>org.eclipse.emf</groupId>
 			<artifactId>org.eclipse.emf.common</artifactId>
-			<version>2.15.0</version>
+			<version>2.40.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.emf</groupId>
 			<artifactId>org.eclipse.emf.ecore</artifactId>
-			<version>2.15.0</version>
+			<version>2.38.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.emf</groupId>
 			<artifactId>org.eclipse.emf.ecore.xmi</artifactId>
-			<version>2.15.0</version>
+			<version>2.38.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.opensourcebim</groupId>
@@ -183,7 +183,7 @@
 		<dependency>
 			<groupId>org.glassfish</groupId>
 			<artifactId>javax.json</artifactId>
-			<version>1.0.4</version>
+			<version>1.1.4</version>
 		</dependency>
 	</dependencies>
 	<licenses>

Shared/pom.xml

@@ -40,7 +40,7 @@
 		<dependency>
 			<groupId>com.google.protobuf</groupId>
 			<artifactId>protobuf-java</artifactId>
-			<version>3.16.3</version>
+			<version>3.25.5</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.maven</groupId>

Tests/pom.xml

@@ -43,7 +43,7 @@
 		<dependency>
 			<groupId>org.opensourcebim</groupId>
 			<artifactId>ifcplugins</artifactId>
-			<version>0.0.101-SNAPSHOT</version>
+			<version>0.0.104-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

pom.xml

@@ -7,7 +7,8 @@
 	<description>This is the parent pom, no idea why this is being released</description>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<jetty.version>9.4.44.v20210927</jetty.version>
+		<jetty.version>9.4.56.v20240826</jetty.version>
+		<cxf.version>3.5.10</cxf.version>
 	</properties>
 	<scm>
 		<url>https://github.com/opensourceBIM/BIMserver.git</url>