From a77c2353b329218549e9812f68dc0a8ab946c294 Mon Sep 17 00:00:00 2001
From: Adriano Marcondes Machado <admachad@redhat.com>
Date: Mon, 26 Jul 2021 12:51:25 -0300
Subject: [PATCH] Changes to work with Weld 3.1+ (Wildfly 18)

---
 vraptor-core/pom.xml                                        | 6 +++---
 .../src/main/java/br/com/caelum/vraptor/VRaptor.java        | 2 +-
 .../main/java/br/com/caelum/vraptor/proxy/CDIProxies.java   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/vraptor-core/pom.xml b/vraptor-core/pom.xml
index b7d02f01e..bfc9a95a6 100644
--- a/vraptor-core/pom.xml
+++ b/vraptor-core/pom.xml
@@ -100,7 +100,7 @@
 		<dependency>
 			<groupId>org.jboss.weld.se</groupId>
 			<artifactId>weld-se-core</artifactId>
-			<version>3.0.4.Final</version>
+			<version>3.1.2.Final</version>
 			<scope>provided</scope>
 		</dependency>
 		
@@ -235,8 +235,8 @@
 		</dependency>
 		<dependency>
 			<groupId>org.jboss.arquillian.container</groupId>
-			<artifactId>arquillian-weld-ee-embedded-1.1</artifactId>
-			<version>1.0.0.CR3</version>
+			<artifactId>arquillian-weld-embedded</artifactId>
+			<version>2.1.0.Final</version>
 			<scope>test</scope>
 		</dependency>
 		<!-- /test libs -->
diff --git a/vraptor-core/src/main/java/br/com/caelum/vraptor/VRaptor.java b/vraptor-core/src/main/java/br/com/caelum/vraptor/VRaptor.java
index 68d3b6bb5..15883903e 100644
--- a/vraptor-core/src/main/java/br/com/caelum/vraptor/VRaptor.java
+++ b/vraptor-core/src/main/java/br/com/caelum/vraptor/VRaptor.java
@@ -58,7 +58,7 @@
 @WebFilter(filterName="vraptor", urlPatterns="/*", dispatcherTypes={DispatcherType.FORWARD, DispatcherType.REQUEST}, asyncSupported=true)
 public class VRaptor implements Filter {
 
-	public static final String VERSION = "4.3.0-beta-3-SNAPSHOT";
+	public static final String VERSION = "4.3.0-beta-4-SNAPSHOT";
 
 	private final Logger logger = getLogger(VRaptor.class);
 
diff --git a/vraptor-core/src/main/java/br/com/caelum/vraptor/proxy/CDIProxies.java b/vraptor-core/src/main/java/br/com/caelum/vraptor/proxy/CDIProxies.java
index f00af1d68..4e8e0fe35 100644
--- a/vraptor-core/src/main/java/br/com/caelum/vraptor/proxy/CDIProxies.java
+++ b/vraptor-core/src/main/java/br/com/caelum/vraptor/proxy/CDIProxies.java
@@ -47,7 +47,7 @@ public static <T> Class<?> extractRawTypeIfPossible(Class<T> type) {
 	public static <T> T unproxifyIfPossible(T source) {
 		if (source instanceof TargetInstanceProxy) {
 			TargetInstanceProxy<T> target = (TargetInstanceProxy) source;
-			return target.getTargetInstance();
+			return target.weld_getTargetInstance();
 		}
 		return source;
 	}