diff --git a/bin/win/checkversions.bat b/bin/win/checkversions.bat index a9b8f9e3..499aec3e 100644 --- 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 \ No newline at end of file +mvn -f ..\..\pom.xml versions:display-dependency-updates -DlogOutput=false \ No newline at end of file diff --git a/broker/pom.xml b/broker/pom.xml index 6ef250d6..d804daa2 100644 --- a/broker/pom.xml +++ b/broker/pom.xml @@ -17,7 +17,7 @@ UTF-8 11 - file:///${project.parent.basedir}/rules.xml + file:///${project.basedir}/../rules.xml diff --git a/brokerRest/pom.xml b/brokerRest/pom.xml index 2ab97eef..2f63ab37 100644 --- a/brokerRest/pom.xml +++ b/brokerRest/pom.xml @@ -17,7 +17,7 @@ UTF-8 11 - file:///${project.parent.basedir}/rules.xml + file:///${project.basedir}/../rules.xml diff --git a/dil/pom.xml b/dil/pom.xml index 41a21de7..c92a91f6 100644 --- a/dil/pom.xml +++ b/dil/pom.xml @@ -15,7 +15,7 @@ UTF-8 11 - file:///${project.parent.basedir}/rules.xml + file:///${project.basedir}/../rules.xml diff --git a/dil/src/main/java/org/assimbly/dil/loader/FlowLoaderReport.java b/dil/src/main/java/org/assimbly/dil/loader/FlowLoaderReport.java index aa79f199..6e275da7 100644 --- 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 index c490b177..4ce19b6e 100644 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -15,7 +15,7 @@ UTF-8 11 - file:///${project.parent.basedir}/rules.xml + file:///${project.basedir}/../rules.xml diff --git a/integration/src/main/java/org/assimbly/integration/impl/CamelIntegration.java b/integration/src/main/java/org/assimbly/integration/impl/CamelIntegration.java index 14d8e11c..113ad946 100644 --- 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 index 5c76a562..a67d1336 100644 --- a/integrationRest/pom.xml +++ b/integrationRest/pom.xml @@ -17,7 +17,7 @@ UTF-8 11 - file:///${project.parent.basedir}/rules.xml + file:///${project.basedir}/../rules.xml diff --git a/pom.xml b/pom.xml index bcf57525..6eabc110 100644 --- a/pom.xml +++ b/pom.xml @@ -26,10 +26,11 @@ ${project.basedir} 4.0.0 2.2 - 2.7.11 - 3.9.1 - 3.20.4 + 2.7.12 + 3.9.2 + 3.20.5 2.1.214 + file:///${project.basedir}/rules.xml @@ -70,11 +71,11 @@ maven-resources-plugin - 3.3.0 + 3.3.1 maven-compiler-plugin - 3.10.1 + 3.11.0 maven-toolchains-plugin @@ -96,7 +97,7 @@ maven-surefire-plugin - 2.22.2 + 3.1.0 maven-jar-plugin @@ -108,7 +109,7 @@ maven-deploy-plugin - 3.0.0 + 3.1.1 @@ -117,7 +118,7 @@ maven-project-info-reports-plugin - 3.4.1 + 3.4.3 @@ -130,15 +131,15 @@ 11 - - org.codehaus.mojo - versions-maven-plugin - 2.15.0 - - ${maven-versions-rules} - - - + + org.codehaus.mojo + versions-maven-plugin + 2.15.0 + + ${maven.versions.rules} + + +