Merge pull request #74 from assimbly/issues/issue-73/update-dependencies

Update dependencies
assimbly · Jan 10, 2023 · 79a8bf1 · 79a8bf1
2 parents 93a94a8 + b1748c3
commit 79a8bf1
Show file tree

Hide file tree

Showing 22 changed files with 931 additions and 147 deletions.
diff --git a/bin/mac/updateversion.sh b/bin/mac/updateversion.sh
@@ -1,6 +1,7 @@
 if [ -n "$1" ]; then
     printf "\nupdate version to: $1\n"
     mvn -f ../../pom.xml versions:set -DgenerateBackupPoms=false -DnewVersion="$1"
+    mvn -f ../../pom.xml versions:set-property -Dproperty=assimbly.version -DnewVersion="$1"
 else
     printf "\nUsage:\n"
     printf "\nupdateversion.sh <versionnumber>\n"

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:*
+mvn -f ..\..\pom.xml versions:display-dependency-updates -Dexcludes=org.apache.camel:* -DlogOutput=false
diff --git a/bin/win/updateversion.bat b/bin/win/updateversion.bat
@@ -5,6 +5,7 @@ echo:
 @echo update version to %1
 echo:
 mvn -f ..\..\pom.xml versions:set -DgenerateBackupPoms=false -DnewVersion=%1
+mvn -f ..\..\pom.xml versions:set-property -Dproperty=assimbly.version -DnewVersion=%1
 :usage
 echo:
 @echo updateversion ^<versionnumber^>

diff --git a/broker/pom.xml b/broker/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>runtime</artifactId>
     <groupId>org.assimbly</groupId>
-    <version>3.8.1</version>
+    <version>3.8.2</version>
   </parent>
 
   <name>broker</name>

diff --git a/brokerRest/pom.xml b/brokerRest/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>runtime</artifactId>
     <groupId>org.assimbly</groupId>
-    <version>3.8.1</version>
+    <version>3.8.2</version>
   </parent>
 
   <name>broker-rest</name>
@@ -34,11 +34,6 @@
 		  <artifactId>broker</artifactId>
 		  <version>${assimbly.version}</version>
 	  </dependency>
-      <dependency>
-		   <groupId>org.springdoc</groupId>
-		   <artifactId>springdoc-openapi-ui</artifactId>
-		   <version>${springdoc-openapi-ui.version}</version>
-	  </dependency>
   </dependencies>
 
 	<build>

diff --git a/dil/pom.xml b/dil/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>runtime</artifactId>
     <groupId>org.assimbly</groupId>
-    <version>3.8.1</version>
+    <version>3.8.2</version>
   </parent>
 
   <name>dil</name>

diff --git a/dil/src/main/java/org/assimbly/dil/blocks/templates/Javascript.java b/dil/src/main/java/org/assimbly/dil/blocks/templates/Javascript.java
@@ -0,0 +1,30 @@
+package org.assimbly.dil.blocks.templates;
+
+import org.apache.camel.builder.RouteBuilder;
+
+public class Javascript extends RouteBuilder {
+
+     @Override
+     public void configure() throws Exception {
+
+         routeTemplate("javascript-action")
+                 .templateParameter("routeconfiguration_id","0")
+                 .templateOptionalParameter("path")
+                 .templateParameter("in")
+                 .templateParameter("out")
+                 .from("{{in}}")
+                     .routeConfigurationId("{{routeconfiguration_id}}")
+                        .setBody().js("{{path}}")
+                        .to("{{out}}");
+
+         routeTemplate("javascript-sink")
+                 .templateParameter("routeconfiguration_id","0")
+                 .templateOptionalParameter("path")
+                 .templateParameter("in")
+                 .from("{{in}}")
+                     .routeConfigurationId("{{routeconfiguration_id}}")
+                     .setBody().js("{{path}}");
+
+    }
+
+}
diff --git a/dil/src/main/java/org/assimbly/dil/blocks/templates/Link.java b/dil/src/main/java/org/assimbly/dil/blocks/templates/Link.java
@@ -11,7 +11,6 @@ public void configure() throws Exception {
                  .templateParameter("routeconfiguration_id","0")
                  .templateParameter("uri")
                  .templateParameter("out")
-                 .templateParameter("exchangePattern","InOnly")
                  .from("{{in}}")
                      .routeConfigurationId("{{routeconfiguration_id}}")
                         .to("{{out}}");
@@ -23,13 +22,12 @@ public void configure() throws Exception {
                  .templateParameter("out")
                  .from("{{in}}")
                     .routeConfigurationId("{{routeconfiguration_id}}")
-                    .to("{{out}}");
+                     .to("{{out}}");
 
          routeTemplate("link-sink")
                  .templateParameter("routeconfiguration_id","0")
                  .templateParameter("uri")
                  .templateParameter("in")
-                 .templateParameter("exchangePattern","InOnly")
                  .from("{{in}}")
                      .routeConfigurationId("{{routeconfiguration_id}}");
 

diff --git a/dil/src/main/java/org/assimbly/dil/blocks/templates/Python.java b/dil/src/main/java/org/assimbly/dil/blocks/templates/Python.java
@@ -0,0 +1,30 @@
+package org.assimbly.dil.blocks.templates;
+
+import org.apache.camel.builder.RouteBuilder;
+
+public class Python extends RouteBuilder {
+
+     @Override
+     public void configure() throws Exception {
+
+         routeTemplate("python-action")
+                 .templateParameter("routeconfiguration_id","0")
+                 .templateOptionalParameter("path")
+                 .templateParameter("in")
+                 .templateParameter("out")
+                 .from("{{in}}")
+                     .routeConfigurationId("{{routeconfiguration_id}}")
+                        .setBody().python("{{path}}")
+                        .to("{{out}}");
+
+         routeTemplate("python-sink")
+                 .templateParameter("routeconfiguration_id","0")
+                 .templateOptionalParameter("path")
+                 .templateParameter("in")
+                 .from("{{in}}")
+                     .routeConfigurationId("{{routeconfiguration_id}}")
+                     .setBody().python("{{path}}");
+
+    }
+
+}
diff --git a/dil/src/main/java/org/assimbly/dil/blocks/templates/SetPattern.java b/dil/src/main/java/org/assimbly/dil/blocks/templates/SetPattern.java
@@ -12,11 +12,11 @@ public void configure() throws Exception {
                  .templateParameter("path")
                  .templateParameter("in")
                  .templateParameter("out")
+                 .templateParameter("pattern","InOnly")
                  .from("{{in}}")
                  .routeConfigurationId("{{routeconfiguration_id}}")
-                 .setProperty("pattern").constant("{{path}}")
-                 .process("SetPatternProcessor")
-                 .to("{{out}}");
+                     .setExchangePattern("{{pattern}}")
+                     .to("{{out}}");
 
      }
 }
diff --git a/dil/src/main/java/org/assimbly/dil/blocks/templates/Simple.java b/dil/src/main/java/org/assimbly/dil/blocks/templates/Simple.java
@@ -0,0 +1,30 @@
+package org.assimbly.dil.blocks.templates;
+
+import org.apache.camel.builder.RouteBuilder;
+
+public class Simple extends RouteBuilder {
+
+     @Override
+     public void configure() throws Exception {
+
+         routeTemplate("simple-action")
+                 .templateParameter("routeconfiguration_id","0")
+                 .templateOptionalParameter("path")
+                 .templateParameter("in")
+                 .templateParameter("out")
+                 .from("{{in}}")
+                     .routeConfigurationId("{{routeconfiguration_id}}")
+                        .setBody().simple("{{path}}")
+                        .to("{{out}}");
+
+         routeTemplate("simple-sink")
+                 .templateParameter("routeconfiguration_id","0")
+                 .templateOptionalParameter("path")
+                 .templateParameter("in")
+                 .from("{{in}}")
+                     .routeConfigurationId("{{routeconfiguration_id}}")
+                     .setBody().simple("{{path}}");
+
+    }
+
+}
diff --git a/dil/src/main/java/org/assimbly/dil/blocks/templates/Split.java b/dil/src/main/java/org/assimbly/dil/blocks/templates/Split.java
@@ -1,13 +1,14 @@
 package org.assimbly.dil.blocks.templates;
 
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.language.xpath.XPathBuilder;
 
 public class Split extends RouteBuilder {
 
      @Override
      public void configure() throws Exception {
 
-         //XPathBuilder myXpath = new XPathBuilder("").saxon().threadSafety(true);
+         //currently using the regular split / xpathbuilder wit saxon needs to be tested)
 
          routeTemplate("split-xpath-router")
                  .templateParameter("routeconfiguration_id","0")
@@ -19,6 +20,7 @@ public void configure() throws Exception {
                  .from("{{in}}")
                      .routeConfigurationId("{{routeconfiguration_id}}")
                          .split().xpath("{{expression}}")
+                         //.split(new XPathBuilder("{{expression}}").saxon().threadSafety(true))
                          .setHeader("CamelSplitIndex").simple("${exchangeProperty.CamelSplitIndex}")
                          .setHeader("CamelSplitSize").simple("${exchangeProperty.CamelSplitSize}")
                          .setHeader("CamelSplitComplete").simple("${exchangeProperty.CamelSplitComplete.toString().trim()}")

diff --git a/integration/pom.xml b/integration/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>runtime</artifactId>
     <groupId>org.assimbly</groupId>
-    <version>3.8.1</version>
+    <version>3.8.2</version>
   </parent>
 
   <name>integration</name>
@@ -28,12 +28,6 @@
 
   <dependencies>
 
-      <dependency>
-          <groupId>org.assimbly</groupId>
-          <artifactId>dil</artifactId>
-          <version>${assimbly.version}</version>
-      </dependency>
-
       <dependency>
           <groupId>org.assimbly</groupId>
           <artifactId>common-base</artifactId>
@@ -44,6 +38,11 @@
 		  <artifactId>camel-components</artifactId>
   		  <version>${assimbly.version}</version>
 	  </dependency>
+      <dependency>
+          <groupId>org.assimbly</groupId>
+          <artifactId>dil</artifactId>
+          <version>${assimbly.version}</version>
+      </dependency>
 	  <dependency>
 		  <groupId>org.assimbly</groupId>
 		  <artifactId>database-drivers</artifactId>
@@ -55,29 +54,6 @@
           <version>${assimbly.version}</version>
       </dependency>
 
-		<dependency>
-			<groupId>io.dropwizard.metrics</groupId>
-			<artifactId>metrics-core</artifactId>
-			<version>${dropwizard-metrics.version}</version>
-		</dependency>
-
-		<!-- jolokia dependencies -->
-		<dependency>
-		    <groupId>org.jolokia</groupId>
-		    <artifactId>jolokia-core</artifactId>
-		    <version>${jolokia.version}</version>
-		</dependency>		
-		<dependency>
-		    <groupId>org.jolokia</groupId>
-		    <artifactId>jolokia-jvm</artifactId>
-		    <version>${jolokia.version}</version>
-		</dependency>
-		<dependency>
-		    <groupId>org.jolokia</groupId>
-		    <artifactId>jolokia-client-java</artifactId>
-		    <version>${jolokia.version}</version>
-		</dependency>
-
   </dependencies>
 
 	<build>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		mvn -f ..\..\pom.xml versions:display-dependency-updates -Dexcludes=org.apache.camel:*
		mvn -f ..\..\pom.xml versions:display-dependency-updates -Dexcludes=org.apache.camel:* -DlogOutput=false