Skip to content

Commit

Permalink
Merge pull request #103 from assimbly/next
Browse files Browse the repository at this point in the history 
Next
  • Loading branch information
@skin27
skin27 authored Dec 17, 2024
2 parents 4421905 + 32cb771 commit 55cfba0
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 26 deletions.
4 changes: 2 additions & 2 deletions camelComponents/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,11 +188,11 @@
<artifactId>camel-kamelets</artifactId>
<version>${kamelet.version}</version>
</dependency>
<dependency>
<!-- <dependency>
<groupId>org.apache.camel.kamelets</groupId>
<artifactId>camel-kamelets-utils</artifactId>
<version>${kamelet.version}</version>
</dependency>
</dependency>-->
<dependency>
<groupId>org.apache.camel.kamelets</groupId>
<artifactId>camel-kamelets-catalog</artifactId>
Expand Down
40 changes: 20 additions & 20 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,68 +42,68 @@
<aopalliance.version>1.0</aopalliance.version>
<axiom.version>1.4.0</axiom.version>
<assimbly.version>5.0.2-SNAPSHOT</assimbly.version>
<activemq-classic.version>6.1.3</activemq-classic.version>
<activemq-classic.version>6.1.4</activemq-classic.version>
<activemq-artemis.version>2.38.0</activemq-artemis.version>
<activemq-artemis-native.version>2.0.0</activemq-artemis-native.version>
<bouncycastle.version>1.70</bouncycastle.version>
<camel.version>4.8.1</camel.version>
<camel.version>4.9.0</camel.version>
<commons-beanutils.version>1.9.4</commons-beanutils.version>
<commons-cli.version>1.9.0</commons-cli.version>
<commons-codec.version>1.17.1</commons-codec.version>
<commons-collections4.version>4.4</commons-collections4.version>
<commons-compress.version>1.27.1</commons-compress.version>
<commons-configuration2.version>2.11.0</commons-configuration2.version>
<commons-dbcp.version>2.12.0</commons-dbcp.version>
<commons-io.version>2.17.0</commons-io.version>
<commons-dbcp.version>2.13.0</commons-dbcp.version>
<commons-io.version>2.18.0</commons-io.version>
<commons-jxpath.version>1.3</commons-jxpath.version>
<commons-lang3.version>3.17.0</commons-lang3.version>
<commons-net.version>3.11.1</commons-net.version>
<commons-math3.version>3.6.1</commons-math3.version>
<commons-text.version>1.12.0</commons-text.version>
<commons-text.version>1.13.0</commons-text.version>
<db2-jdbc.version>db2jcc4</db2-jdbc.version>
<docconverter.version>1.11.0</docconverter.version>
<dropwizard-metrics.version>4.2.28</dropwizard-metrics.version>
<elasticsearch-rest-client.version>8.15.3</elasticsearch-rest-client.version>
<docconverter.version>1.12.1</docconverter.version>
<dropwizard-metrics.version>4.2.29</dropwizard-metrics.version>
<elasticsearch-rest-client.version>8.17.0</elasticsearch-rest-client.version>
<gson.version>2.11.0</gson.version>
<groovy-script.version>4.0.23</groovy-script.version>
<groovy-script.version>4.0.24</groovy-script.version>
<guava.version>33.3.1-jre</guava.version>
<ibmmq-client.version>9.4.1.0</ibmmq-client.version>
<informix-jdbc.version>4.50.11</informix-jdbc.version>
<jackson.version>2.18.1</jackson.version>
<informix-jdbc.version>15.0.0.0</informix-jdbc.version>
<jackson.version>2.18.2</jackson.version>
<jakarta-activation-api.version>2.1.3</jakarta-activation-api.version>
<jakarta-annotation-api.version>3.0.0</jakarta-annotation-api.version>
<jakarta-json-api.version>2.1.3</jakarta-json-api.version>
<jakarta-servlet-api.version>6.1.0</jakarta-servlet-api.version>
<jakarta-xml-soap-api.version>3.0.2</jakarta-xml-soap-api.version>
<jakarta-xml-bind-api.version>4.0.2</jakarta-xml-bind-api.version>
<jasypt.version>1.9.3</jasypt.version>
<jeka.version>0.10.49</jeka.version>
<jeka.version>0.11.4</jeka.version>
<json.version>20240303</json.version>
<jsonassert.version>1.5.3</jsonassert.version>
<json-path.version>2.9.0</json-path.version>
<junit.version>5.11.3</junit.version>
<jwt.version>0.12.6</jwt.version>
<jolokia.version>2.1.1</jolokia.version>
<jolokia.version>2.1.2</jolokia.version>
<httpclient.version>4.5.14</httpclient.version>
<kamelet.version>4.8.0</kamelet.version>
<kamelet.version>4.9.0</kamelet.version>
<logback-classic.version>1.5.12</logback-classic.version>
<messaginghub.version>3.1.7</messaginghub.version>
<mssql-jdbc.version>12.8.1.jre11</mssql-jdbc.version> <!-- use jre21 when it comes out -->
<mockito.version>5.14.2</mockito.version>
<mockserver.version>5.15.0</mockserver.version>
<mongo.version>3.12.11</mongo.version>
<mysql-connector-java.version>9.1.0</mysql-connector-java.version>
<netty.version>4.1.114.Final</netty.version>
<oracle12.version>23.5.0.24.07</oracle12.version>
<netty.version>4.1.115.Final</netty.version>
<oracle12.version>23.6.0.24.10</oracle12.version>
<postgresql.version>42.7.4</postgresql.version>
<powermock.version>2.0.9</powermock.version>
<qpid-proton-j.version>0.34.1</qpid-proton-j.version>
<slf4j.version>2.0.16</slf4j.version>
<sonic.version>12.0.2</sonic.version>
<spring.version>6.1.14</spring.version>
<spring-data.version>3.3.5</spring-data.version>
<springdoc.version>2.6.0</springdoc.version>
<sqlite-jdbc.version>3.47.0.0</sqlite-jdbc.version>
<spring.version>6.2.0</spring.version>
<spring-data.version>3.4.0</spring-data.version>
<springdoc.version>2.7.0</springdoc.version>
<sqlite-jdbc.version>3.47.1.0</sqlite-jdbc.version>
<tika.version>1.28.5</tika.version>
<xalan.version>2.7.3</xalan.version>
<xerces.version>2.12.2</xerces.version>
Expand Down
9 changes: 5 additions & 4 deletions utils/src/main/java/org/assimbly/util/helper/ExchangeHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public static String interpolate(String text, Exchange exchange){
for(String regex : Arrays.asList(HEADER_VARIABLE_REGEX, BODY_VARIABLE_REGEX)){
text = replaceVariables(text, exchange, regex);
}

return text;
}

Expand Down Expand Up @@ -53,11 +53,12 @@ private static String replaceVariables(String text, Exchange exchange, String re

public static String unescapeExceptionalCharacters(String str) {
return str.replaceAll("\\\\n", "\n")
.replaceAll("\\\\t", "\t")
.replaceAll("\\\\r", "\r");
.replaceAll("\\\\t", "\t")
.replaceAll("\\\\r", "\r");
}

static String escapeDollarSign(String str) {
return str.replace("$", "\\$");
}
}

}

0 comments on commit 55cfba0

Please sign in to comment.