Merge pull request #12 from JohT/update/quarkus/1.3.0.Final

#11 Update quarkus to 1.3.0.Final and axon to 4.2.2
JohT · Mar 14, 2020 · c773948 · c773948
2 parents 9a8b8f3 + 881ef8d
commit c773948
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 21 deletions.
diff --git a/showcase-quarkus-eventsourcing/pom.xml b/showcase-quarkus-eventsourcing/pom.xml
@@ -13,8 +13,8 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<surefire-plugin.version>2.22.2</surefire-plugin.version>
 
-		<quarkus.version>1.2.0.Final</quarkus.version>
-		<axon.version>4.2.1</axon.version>
+		<quarkus.version>1.3.0.Final</quarkus.version>
+		<axon.version>4.2.2</axon.version>
 		<reactor.version>3.3.0.RELEASE</reactor.version>
 		<dom4j.version>1.6.1</dom4j.version>
 		<xom.version>1.2.5</xom.version>
@@ -79,6 +79,16 @@
 			<optional>true</optional>
 		</dependency>
 
+		<!-- Quarkus - Dependencies workaround for native image build with reportErrorsAtRuntime -->
+		<dependency>
+			<groupId>jakarta.security.jacc</groupId>
+			<artifactId>jakarta.security.jacc-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>net.java.dev.jna</groupId>
+			<artifactId>jna</artifactId>
+		</dependency>
+
 		<!-- Quarkus - Database JDBC driver for PostgreSql -->
 		<dependency>
 			<groupId>io.quarkus</groupId>
@@ -201,7 +211,6 @@
 			<artifactId>junit-jupiter-api</artifactId>
 			<scope>test</scope>
 		</dependency>
-
 	</dependencies>
 
 	<build>
@@ -347,6 +356,7 @@
 								</goals>
 								<configuration>
 									<enableHttpUrlHandler>true</enableHttpUrlHandler>
+									<reportErrorsAtRuntime>true</reportErrorsAtRuntime>
 									<additionalBuildArgs>
 										<additionalBuildArg>
 											-H:ReflectionConfigurationFiles=${project.basedir}/reflection-config.json

diff --git a/showcase-quarkus-eventsourcing/reflection-config.json b/showcase-quarkus-eventsourcing/reflection-config.json
@@ -66,6 +66,36 @@
 		"allDeclaredMethods": true,
 		"allDeclaredFields": true
 	},
+	{
+		"name":"org.axonframework.serialization.upcasting.SingleEntryUpcaster",
+		"allDeclaredConstructors": true,
+		"allDeclaredMethods": true,
+		"allDeclaredFields": true
+	},
+	{
+		"name":"org.axonframework.serialization.upcasting.Upcaster",
+		"allDeclaredConstructors": true,
+		"allDeclaredMethods": true,
+		"allDeclaredFields": true
+	},
+	{
+		"name":"org.axonframework.serialization.upcasting.event.EventUpcaster",
+		"allDeclaredConstructors": true,
+		"allDeclaredMethods": true,
+		"allDeclaredFields": true
+	},
+	{
+		"name":"org.axonframework.serialization.upcasting.event.IntermediateEventRepresentation",
+		"allDeclaredConstructors": true,
+		"allDeclaredMethods": true,
+		"allDeclaredFields": true
+	},
+	{
+		"name":"org.axonframework.serialization.upcasting.event.SingleEventUpcaster",
+		"allDeclaredConstructors": true,
+		"allDeclaredMethods": true,
+		"allDeclaredFields": true
+	},
 	{
 		"name": "org.axonframework.modelling.command.AggregateIdentifier",
 		"allDeclaredMethods": true

diff --git a/showcase-quarkus-eventsourcing/resources-config.json b/showcase-quarkus-eventsourcing/resources-config.json
@@ -1,22 +1,10 @@
 {
 	"resources": [
-		{
-			"pattern": "META-INF/services/org.axonframework.messaging.annotation.HandlerDefinition"
-		},
-		{
-			"pattern": "META-INF/services/org.axonframework.messaging.annotation.HandlerEnhancerDefinition"
-		},
-		{
-			"pattern": "META-INF/services/org.axonframework.messaging.annotation.ParameterResolverFactory"
-		},
-		{
-			"pattern": "META-INF/services/org.axonframework.modelling.command.inspection.ChildEntityDefinition"
-		},
-		{
-			"pattern": "META-INF/services/org.axonframework.serialization.ContentTypeConverter"
-		},
-		{
-			"pattern": ".*\\.sql$"
-		}
+	    {"pattern":"\\QMETA-INF/services/org.axonframework.messaging.annotation.HandlerDefinition\\E"}, 
+    	{"pattern":"\\QMETA-INF/services/org.axonframework.messaging.annotation.HandlerEnhancerDefinition\\E"}, 
+    	{"pattern":"\\QMETA-INF/services/org.axonframework.messaging.annotation.ParameterResolverFactory\\E"}, 
+    	{"pattern":"\\QMETA-INF/services/org.axonframework.modelling.command.inspection.ChildEntityDefinition\\E"}, 
+    	{"pattern":"\\QMETA-INF/services/org.axonframework.serialization.ContentTypeConverter\\E"}, 
+		{"pattern": ".*\\.sql$"}
 	]
 }