This is an automated email from the ASF dual-hosted git repository.
onders pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 3d91555 Upgrade ASN.1 and change group and artifact Ids according to
new release
3d91555 is described below
commit 3d91555dde3075994da00029642f33201d29c259
Author: onders <[email protected]>
AuthorDate: Thu Apr 11 14:09:12 2019 +0300
Upgrade ASN.1 and change group and artifact Ids according to new release
---
components/camel-asn1/pom.xml | 10 +++++-----
.../java/org/apache/camel/dataformat/asn1/ASN1DataFormat.java | 3 ++-
parent/pom.xml | 2 +-
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/components/camel-asn1/pom.xml b/components/camel-asn1/pom.xml
index 9b66b45..57e144f 100644
--- a/components/camel-asn1/pom.xml
+++ b/components/camel-asn1/pom.xml
@@ -46,7 +46,7 @@
<version>${bouncycastle-version}</version>
</dependency>
<dependency>
- <groupId>org.openmuc</groupId>
+ <groupId>com.beanit</groupId>
<artifactId>jasn1</artifactId>
<version>${jasn1-version}</version>
</dependency>
@@ -92,7 +92,7 @@
doesn't obbey the plugin's dependencies and only supports
compile and runtime dependencies -->
<dependency>
- <groupId>org.openmuc</groupId>
+ <groupId>com.beanit</groupId>
<artifactId>jasn1-compiler</artifactId>
<version>${jasn1-version}</version>
<optional>true</optional>
@@ -122,12 +122,12 @@
<arguments>
<argument>-classpath</argument>
<classpath>
-
<dependency>org.openmuc:jasn1-compiler</dependency>
- <dependency>org.openmuc:jasn1</dependency>
+
<dependency>com.beanit:jasn1-compiler</dependency>
+ <dependency>com.beanit:jasn1</dependency>
<dependency>antlr:antlr</dependency>
<dependency>javax.xml.bind:jaxb-api</dependency>
</classpath>
-
<argument>org.openmuc.jasn1.compiler.Compiler</argument>
+
<argument>com.beanit.jasn1.compiler.Compiler</argument>
<argument>-o</argument>
<argument>${basedir}/target/generated/src/test/java</argument>
<argument>-p</argument>
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 3c645e0..414651a 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,6 +24,8 @@ import java.io.OutputStream;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import com.beanit.jasn1.ber.ReverseByteArrayOutputStream;
+
import org.apache.camel.Exchange;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.DataFormatName;
@@ -33,7 +35,6 @@ import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
import org.bouncycastle.asn1.ASN1InputStream;
import org.bouncycastle.asn1.ASN1Primitive;
-import org.openmuc.jasn1.ber.ReverseByteArrayOutputStream;
@Dataformat("asn1")
public class ASN1DataFormat extends ServiceSupport implements DataFormat,
DataFormatName {
diff --git a/parent/pom.xml b/parent/pom.xml
index dff22ae..61d62ba 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -321,7 +321,7 @@
<jackrabbit-guava-version>15.0</jackrabbit-guava-version>
<jain-sip-ri-bundle-version>1.2.154_2</jain-sip-ri-bundle-version>
<jandex-version>2.1.0.Final</jandex-version>
- <jasn1-version>1.10.0</jasn1-version>
+ <jasn1-version>1.11.0</jasn1-version>
<jasper-bundle-version>6.0.44_1</jasper-bundle-version>
<jasypt-bundle-version>1.9.2_1</jasypt-bundle-version>
<jasypt-version>1.9.2</jasypt-version>