Merge pull request #129 from assimbly/master

Master
assimbly · May 26, 2023 · 2fa519f · 2fa519f
2 parents 8344c8a + a694944
commit 2fa519f
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 27 deletions.
diff --git a/bin/win/checkversions.bat b/bin/win/checkversions.bat
@@ -1 +1 @@
-mvn -f ..\..\pom.xml versions:display-dependency-updates -Dexcludes=org.apache.camel:* -DlogOutput=false
+mvn -f ..\..\pom.xml versions:display-dependency-updates -DlogOutput=false
diff --git a/broker/pom.xml b/broker/pom.xml
@@ -17,7 +17,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.release>11</maven.compiler.release>
-    <maven-versions-rules>file:///${project.parent.basedir}/rules.xml</maven-versions-rules>    
+    <maven.versions.rules>file:///${project.basedir}/../rules.xml</maven.versions.rules>
   </properties>
 
   <distributionManagement> 

diff --git a/brokerRest/pom.xml b/brokerRest/pom.xml
@@ -17,7 +17,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.release>11</maven.compiler.release>
-    <maven-versions-rules>file:///${project.parent.basedir}/rules.xml</maven-versions-rules>    
+    <maven.versions.rules>file:///${project.basedir}/../rules.xml</maven.versions.rules>
   </properties>
 
   <distributionManagement> 

diff --git a/dil/pom.xml b/dil/pom.xml
@@ -15,7 +15,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.release>11</maven.compiler.release>
-    <maven-versions-rules>file:///${project.parent.basedir}/rules.xml</maven-versions-rules>
+    <maven.versions.rules>file:///${project.basedir}/../rules.xml</maven.versions.rules>
   </properties>
 
   <distributionManagement> 

diff --git a/dil/src/main/java/org/assimbly/dil/loader/FlowLoaderReport.java b/dil/src/main/java/org/assimbly/dil/loader/FlowLoaderReport.java
@@ -96,16 +96,16 @@ public void logResult(String flowId, String flowName, String event){
 		//logging
 		if(loaded == loadedSuccess) {
 			if(loadedSuccess == 1){
-				log.info(loadedSuccess + " step loaded successfully");
+				log.info(loadedSuccess + " step loaded successfully | flowid=" + flowId);
 			}else if(loadedSuccess > 1){
-				log.info(loadedSuccess + " steps loaded successfully");
+				log.info(loadedSuccess + " steps loaded successfully | flowid=" + flowId);
 			}
 			log.info("Start flow | name=" + flowName + " | flowid=" + flowId);
 		}else{
 			if(loadedError == 1){
-				log.error(loadedError + " step failed to load");
+				log.error(loadedError + " step failed to load | flowid=" + flowId);
 			}else if(loadedError > 1){
-				log.error(loadedError + " steps failed to load");
+				log.error(loadedError + " steps failed to load | flowid=" + flowId);
 			}
 			log.error("Event=" + event + " | name=" + flowName + " | flowid=" + flowId);
 		}

diff --git a/integration/pom.xml b/integration/pom.xml
@@ -15,7 +15,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.release>11</maven.compiler.release>
-    <maven-versions-rules>file:///${project.parent.basedir}/rules.xml</maven-versions-rules>
+    <maven.versions.rules>file:///${project.basedir}/../rules.xml</maven.versions.rules>
   </properties>
 
   <distributionManagement> 

diff --git a/integration/src/main/java/org/assimbly/integration/impl/CamelIntegration.java b/integration/src/main/java/org/assimbly/integration/impl/CamelIntegration.java
@@ -211,6 +211,7 @@ public void setHistoryMetrics(boolean setHistoryMetrics){
 		factory.setPrettyPrint(true);
 		factory.setMetricsRegistry(metricRegistry);
 		context.setMessageHistoryFactory(factory);
+		context.setSourceLocationEnabled(true);
 	}
 
 	public void setDefaultBlocks() throws Exception {

diff --git a/integrationRest/pom.xml b/integrationRest/pom.xml
@@ -17,7 +17,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.release>11</maven.compiler.release>
-    <maven-versions-rules>file:///${project.parent.basedir}/rules.xml</maven-versions-rules>
+    <maven.versions.rules>file:///${project.basedir}/../rules.xml</maven.versions.rules>
   </properties>
 
   <distributionManagement> 

diff --git a/pom.xml b/pom.xml
@@ -26,10 +26,11 @@
         <main.basedir>${project.basedir}</main.basedir>
         <assimbly.version>4.0.0</assimbly.version>
 		<hamcrest.version>2.2</hamcrest.version>
-		<spring-boot.version>2.7.11</spring-boot.version>
-		<maven-api.version>3.9.1</maven-api.version>
-		<camel-spring-junit5.version>3.20.4</camel-spring-junit5.version>
+		<spring-boot.version>2.7.12</spring-boot.version>
+		<maven-api.version>3.9.2</maven-api.version>
+		<camel-spring-junit5.version>3.20.5</camel-spring-junit5.version>
 		<h2database.version>2.1.214</h2database.version>
+		<maven.versions.rules>file:///${project.basedir}/rules.xml</maven.versions.rules>
 	</properties>
 
 	<distributionManagement> 
@@ -70,11 +71,11 @@
 				<!-- default lifecycle, jar packaging: see https://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging -->
 				<plugin>
 					<artifactId>maven-resources-plugin</artifactId>
-					<version>3.3.0</version>
+					<version>3.3.1</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.10.1</version>
+					<version>3.11.0</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-toolchains-plugin</artifactId>
@@ -96,7 +97,7 @@
 				</plugin>
 				<plugin>
 					<artifactId>maven-surefire-plugin</artifactId>
-					<version>2.22.2</version>
+					<version>3.1.0</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-jar-plugin</artifactId>
@@ -108,7 +109,7 @@
 				</plugin>
 				<plugin>
 					<artifactId>maven-deploy-plugin</artifactId>
-					<version>3.0.0</version>
+					<version>3.1.1</version>
 				</plugin>
 				<!-- site lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#site_Lifecycle -->
 				<plugin>
@@ -117,7 +118,7 @@
 				</plugin>
 				<plugin>
 					<artifactId>maven-project-info-reports-plugin</artifactId>
-					<version>3.4.1</version>
+					<version>3.4.3</version>
 				</plugin>
 			</plugins>
 		</pluginManagement>
@@ -130,15 +131,15 @@
                     <target>11</target>
                 </configuration>
             </plugin>
-            <plugin>
-		      <groupId>org.codehaus.mojo</groupId>
-		      <artifactId>versions-maven-plugin</artifactId>
-		      <version>2.15.0</version>
-	          <configuration>
-		          <rulesUri>${maven-versions-rules}</rulesUri>
-	    	  </configuration>
-		    </plugin>           
-        </plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>versions-maven-plugin</artifactId>
+				<version>2.15.0</version>
+				<configuration>
+					<rulesUri>${maven.versions.rules}</rulesUri>
+				</configuration>
+			</plugin>
+		</plugins>
     </build>
 
 </project>