Merge branch 'master' into fix/bump-wss4j

Author: sgrampone

gxcloudstorage-azureblob/pom.xml

@@ -36,5 +36,11 @@
                 </exclusion>
             </exclusions>
 		</dependency>
+        <!-- overwrite azure-storage jackson-core dependency due to CVEs -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
 	</dependencies>
 </project>

gxobservability/pom.xml

@@ -36,9 +36,9 @@
             <version>${io.opentelemetry.version}</version>
         </dependency>
         <dependency>
-            <groupId>io.opentelemetry</groupId>
+            <groupId>io.opentelemetry.semconv</groupId>
             <artifactId>opentelemetry-semconv</artifactId>
-            <version>1.30.1-alpha</version>
+            <version>1.37.0</version>
         </dependency>
         <dependency>
             <groupId>io.opentelemetry</groupId>

gxspringboot/src/main/java/com/genexus/springboot/GXConfig.java

@@ -6,11 +6,17 @@
 import com.genexus.diagnostics.core.LogManager;
 import com.genexus.servlet.CorsFilter;
 import com.genexus.xml.GXXMLSerializable;
+
 import jakarta.annotation.PreDestroy;
+import org.glassfish.jersey.server.ResourceConfig;
+import org.glassfish.jersey.servlet.ServletContainer;
+import org.glassfish.jersey.servlet.ServletProperties;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.web.servlet.ServletContextInitializer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.Ordered;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.util.AntPathMatcher;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
@@ -19,6 +25,10 @@
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.tuckey.web.filters.urlrewrite.UrlRewriteFilter;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
 @Configuration
 @EnableWebMvc
 public class GXConfig implements WebMvcConfigurer {
@@ -82,6 +92,32 @@ public FilterRegistrationBean<UrlRewriteFilter> urlRewriteFilter() {
 		return registrationBean;
 	}
 
+	@Bean
+	public ServletContextInitializer jerseyFilter() {
+		Set<Class<?>> rrcs = JaxrsResourcesHolder.getAll();
+
+		if (rrcs.isEmpty()) {
+			return sc -> {};
+		}
+
+		ResourceConfig rc = new ResourceConfig();
+		rc.registerClasses(rrcs.toArray(new Class<?>[0]));
+		rc.property(ServletProperties.FILTER_FORWARD_ON_404, true);
+
+		ServletContainer container = new ServletContainer(rc);
+
+		FilterRegistrationBean<ServletContainer> reg = new FilterRegistrationBean<>(container);
+		reg.addUrlPatterns("/rest/*");
+		reg.setName("jersey-filter");
+		reg.setOrder(Ordered.HIGHEST_PRECEDENCE + 1);
+
+		Map<String, String> initParams = new HashMap<>();
+		initParams.put(ServletProperties.FILTER_CONTEXT_PATH, "/rest");
+		reg.setInitParameters(initParams);
+
+		return reg;
+	}
+
 	@PreDestroy
 	public void onDestroy() {
 		GXXMLSerializable.classesCacheMethods.clear();

gxspringboot/src/main/java/com/genexus/springboot/GXImportSelector.java

@@ -7,6 +7,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Set;
 
 import org.springframework.context.annotation.ImportSelector;
 import org.springframework.core.io.ClassPathResource;
@@ -20,26 +22,28 @@ public class GXImportSelector implements ImportSelector {
 	@Override
 	public String[] selectImports(AnnotationMetadata importingClassMetadata) {
 		ArrayList<String> restImports = new ArrayList<>();
+		Set<Class<?>> rrcs = new HashSet<Class<?>>();
 		try {
 			Resource[] resources = new PathMatchingResourcePatternResolver().getResources("classpath*:*.services");
 			for (Resource resource : resources) {
-				selectImport(restImports, resource.getFilename());
+				selectImport(rrcs, restImports, resource.getFilename());
 			}
 		}
 		catch (IOException e){
 			logger.error("Error loading External Services classes ", e);
 		}
 
+		JaxrsResourcesHolder.setAll(rrcs);
 		addWebSocketsImport(restImports);
 
 		return restImports.toArray(new String[0]);
 	}
 
-	private void selectImport(ArrayList<String> restImports, String servicesClassesFileName) {
+	private void selectImport(Set<Class<?>> rrcs, ArrayList<String> restImports, String servicesClassesFileName) {
 		try {
 			InputStream is = new ClassPathResource(servicesClassesFileName).getInputStream();
 			if (is != null) {
-				WebUtils.AddExternalServicesFile(null, restImports, is);
+				WebUtils.AddExternalServicesFile(rrcs, restImports, is);
 
 				is.close();
 			}

gxspringboot/src/main/java/com/genexus/springboot/JaxrsResourcesHolder.java

@@ -0,0 +1,19 @@
+package com.genexus.springboot;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+public final class JaxrsResourcesHolder {
+	private static final Set<Class<?>> RESOURCES = new LinkedHashSet<>();
+	private JaxrsResourcesHolder() {}
+
+	public static void setAll(Set<Class<?>> rrcs) {
+		RESOURCES.clear();
+		if (rrcs != null) RESOURCES.addAll(rrcs);
+	}
+
+	public static Set<Class<?>> getAll() {
+		return new LinkedHashSet<>(RESOURCES);
+	}
+}
+

java/pom.xml

@@ -157,7 +157,7 @@
 		<dependency>
             <groupId>io.opentelemetry.instrumentation</groupId>
             <artifactId>opentelemetry-instrumentation-annotations</artifactId>
-            <version>${io.opentelemetry.version}</version>
+            <version>2.21.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

java/src/main/java/com/genexus/webpanels/WebUtils.java

@@ -523,7 +523,7 @@ public static void AddExternalServicesFile(Set<Class<?>> rrcs, ArrayList<String>
 				if (serviceClass != null)
 					if (rrcs != null)
 						rrcs.add(serviceClass);
-					else
+					if (restImports != null)
 						restImports.add(serviceClass.getName());
 			}
 			reader.close();

pom.xml

@@ -22,12 +22,12 @@
 		<jersey.jakarta.version>3.0.4</jersey.jakarta.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<poi.version>5.4.1</poi.version>
-		<jackson.version>2.14.1</jackson.version>
+		<jackson.version>2.16.2</jackson.version>
 		<junit.version>4.13.2</junit.version>
 		<software.awssdk.version>2.35.6</software.awssdk.version>
 		<software.azure.cosmos.version>4.74.0</software.azure.cosmos.version>
 		<log4j.version>2.21.1</log4j.version>
-        <io.opentelemetry.version>1.28.0</io.opentelemetry.version>
+        <io.opentelemetry.version>1.56.0</io.opentelemetry.version>
         <org.bouncycastle.version>1.82</org.bouncycastle.version>
         <commons-io.version>2.15.1</commons-io.version>
         <commons-codec.version>1.15</commons-codec.version>

wrapperjakarta/pom.xml

@@ -123,6 +123,7 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
             <version>5.3.28</version>
+            <scope>provided</scope>
         </dependency>        
     </dependencies>
 

wrapperjavax/pom.xml

@@ -104,6 +104,12 @@
                 </exclusion>
     	</exclusions>
 		</dependency>
+        <!-- overwrite jaxws-rt  woodstox-core dependency due to CVEs -->
+        <dependency>
+            <groupId>com.fasterxml.woodstox</groupId>
+            <artifactId>woodstox-core</artifactId>
+            <version>6.5.1</version>
+        </dependency>
     </dependencies>
 
 	<build>