Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies #74

Merged
merged 5 commits into from
Jan 10, 2023
Merged

Update dependencies #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fa4b5e1
Create draft PR for #73
skin27 Jan 2, 2023
11a0e0a
update dependencies
skin27 Jan 2, 2023
ad9ed7a
Remove dependencies
skin27 Jan 6, 2023
3aca73d
update integration api
skin27 Jan 6, 2023
b1748c3
updateversion to 3.8.2
skin27 Jan 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions bin/mac/updateversion.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion bin/win/checkversions.bat
View file
Open in desktop
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
1 change: 1 addition & 0 deletions bin/win/updateversion.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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^>
Expand Down
2 changes: 1 addition & 1 deletion broker/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 1 addition & 6 deletions brokerRest/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion dil/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
30 changes: 30 additions & 0 deletions dil/src/main/java/org/assimbly/dil/blocks/templates/Javascript.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}}");

}

}
4 changes: 1 addition & 3 deletions dil/src/main/java/org/assimbly/dil/blocks/templates/Link.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}");
Expand All @@ -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}}");

Expand Down
30 changes: 30 additions & 0 deletions dil/src/main/java/org/assimbly/dil/blocks/templates/Python.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}}");

}

}
6 changes: 3 additions & 3 deletions dil/src/main/java/org/assimbly/dil/blocks/templates/SetPattern.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}");

}
}
30 changes: 30 additions & 0 deletions dil/src/main/java/org/assimbly/dil/blocks/templates/Simple.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}}");

}

}
4 changes: 3 additions & 1 deletion dil/src/main/java/org/assimbly/dil/blocks/templates/Split.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
Expand All @@ -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()}")
Expand Down
36 changes: 6 additions & 30 deletions integration/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
Loading