This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push: new 2bba7e15239 camel-asn1 : update jasn1 to asn1bean (#8114) 2bba7e15239 is described below commit 2bba7e15239263f43f0c367d01ba09e10004f9ed Author: önder sezgin <ondersezgin+git...@gmail.com> AuthorDate: Fri Aug 5 06:24:28 2022 +0100 camel-asn1 : update jasn1 to asn1bean (#8114) --- components/camel-asn1/pom.xml | 15 +++++++-------- .../org/apache/camel/dataformat/asn1/ASN1DataFormat.java | 2 +- parent/pom.xml | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/components/camel-asn1/pom.xml b/components/camel-asn1/pom.xml index cfe142ad433..f3bb6bcee2e 100644 --- a/components/camel-asn1/pom.xml +++ b/components/camel-asn1/pom.xml @@ -46,8 +46,8 @@ </dependency> <dependency> <groupId>com.beanit</groupId> - <artifactId>jasn1</artifactId> - <version>${jasn1-version}</version> + <artifactId>asn1bean</artifactId> + <version>${asn1bean-version}</version> </dependency> <!-- test dependencies --> @@ -82,8 +82,8 @@ compile and runtime dependencies --> <dependency> <groupId>com.beanit</groupId> - <artifactId>jasn1-compiler</artifactId> - <version>${jasn1-version}</version> + <artifactId>asn1bean-compiler</artifactId> + <version>${asn1bean-version}</version> <optional>true</optional> </dependency> <dependency> @@ -111,19 +111,18 @@ <arguments> <argument>-classpath</argument> <classpath> - <dependency>com.beanit:jasn1-compiler</dependency> - <dependency>com.beanit:jasn1</dependency> + <dependency>com.beanit:asn1bean-compiler</dependency> + <dependency>com.beanit:asn1bean</dependency> <dependency>antlr:antlr</dependency> <dependency>javax.xml.bind:jaxb-api</dependency> </classpath> - <argument>com.beanit.jasn1.compiler.Compiler</argument> + <argument>com.beanit.asn1bean.compiler.Compiler</argument> <argument>-o</argument> <argument>${basedir}/target/generated/src/test/java</argument> <argument>-p</argument> <argument>org.apache.camel.dataformat.asn1.model</argument> <argument>-f</argument> <argument>${basedir}/src/test/resources/asn1_structure/TestSMSCBerCdr.asn1</argument> - <argument>-il</argument> </arguments> <testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot> <longModulepath>false</longModulepath> diff --git a/components/camel-asn1/src/main/java/org/apache/camel/dataformat/asn1/ASN1DataFormat.java b/components/camel-asn1/src/main/java/org/apache/camel/dataformat/asn1/ASN1DataFormat.java index 5245131f1b8..88d8d1abfdf 100644 --- a/components/camel-asn1/src/main/java/org/apache/camel/dataformat/asn1/ASN1DataFormat.java +++ b/components/camel-asn1/src/main/java/org/apache/camel/dataformat/asn1/ASN1DataFormat.java @@ -24,7 +24,7 @@ import java.io.OutputStream; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import com.beanit.jasn1.ber.ReverseByteArrayOutputStream; +import com.beanit.asn1bean.ber.ReverseByteArrayOutputStream; import org.apache.camel.Exchange; import org.apache.camel.spi.DataFormat; import org.apache.camel.spi.DataFormatName; diff --git a/parent/pom.xml b/parent/pom.xml index 6ee312b9311..6762b0493ca 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -69,6 +69,7 @@ <arquillian-version>1.6.0.Final</arquillian-version> <arquillian-weld-embedded-version>2.0.0.Final</arquillian-weld-embedded-version> <asm-version>8.0.1</asm-version> + <asn1bean-version>1.13.0</asn1bean-version> <assertj-version>3.23.1</assertj-version> <asterisk-java-version>3.12.0</asterisk-java-version> <atlasmap-version>2.5.0</atlasmap-version> @@ -262,7 +263,6 @@ <jasminb-jsonapi-version>0.11</jasminb-jsonapi-version> <jandex-version>2.4.3.Final</jandex-version> <jansi-version>2.4.0</jansi-version> - <jasn1-version>1.11.3</jasn1-version> <jasypt-version>1.9.3</jasypt-version> <java-grok-version>0.1.9</java-grok-version> <java-util-version>2.0.0</java-util-version>