Skip to content

Commit 9f040d5

Browse files
balamuruganaminio-trusted
balamurugana
authored and
minio-trusted
committed
move to simple-xml-safe (#908)
Fixes #905
1 parent d671f2c commit 9f040d5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+56
-104
lines changed

‎api/src/main/java/io/minio/SelectResponseStream.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import java.util.HashMap;
3232
import java.util.Map;
3333
import java.util.zip.CRC32;
34-
import org.xmlpull.v1.XmlPullParserException;
3534

3635
/** Select object content response stream. */
3736
public class SelectResponseStream extends InputStream {
@@ -85,8 +84,7 @@ private Map<String, String> decodeHeaderData(ByteArrayInputStream bais) throws I
8584
return headerMap;
8685
}
8786

88-
private boolean populate()
89-
throws EOFException, IOException, InternalException, MinioException, XmlPullParserException {
87+
private boolean populate() throws EOFException, IOException, InternalException, MinioException {
9088
ByteStreams.readFully(inputStream, prelude);
9189
ByteStreams.readFully(inputStream, preludeCrc);
9290
crcHasher.reset();
@@ -173,7 +171,7 @@ public int read() throws IOException {
173171
;
174172
} catch (EOFException e) {
175173
return -1;
176-
} catch (MinioException | XmlPullParserException e) {
174+
} catch (MinioException e) {
177175
throw new IOException(e);
178176
}
179177
}

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ apply plugin: 'io.codearte.nexus-staging'
3232

3333
allprojects {
3434
group = 'io.minio'
35-
version = '7.0.3'
35+
version = '7.1.0'
3636
if (!project.hasProperty('release')) {
3737
version += '-DEV'
3838
}
@@ -48,7 +48,7 @@ subprojects {
4848
}
4949

5050
dependencies {
51-
compile "org.simpleframework:simple-xml:2.7.1"
51+
compile "com.carrotsearch.thirdparty:simple-xml-safe:2.7.1"
5252
compile "com.google.guava:guava:25.1-jre"
5353
compile "com.squareup.okhttp3:okhttp:3.13.1"
5454
compile "com.squareup.okio:okio:1.17.2"

‎examples/BucketExists.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,11 @@
1919
import java.io.IOException;
2020
import java.security.InvalidKeyException;
2121
import java.security.NoSuchAlgorithmException;
22-
import org.xmlpull.v1.XmlPullParserException;
2322

2423
public class BucketExists {
2524
/** MinioClient.bucketExists() example. */
2625
public static void main(String[] args)
27-
throws IOException, NoSuchAlgorithmException, InvalidKeyException, XmlPullParserException {
26+
throws IOException, NoSuchAlgorithmException, InvalidKeyException {
2827
try {
2928
/* play.min.io for test and development. */
3029
MinioClient minioClient =

‎examples/ComposeObject.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,11 @@
2222
import java.security.NoSuchAlgorithmException;
2323
import java.util.ArrayList;
2424
import java.util.List;
25-
import org.xmlpull.v1.XmlPullParserException;
2625

2726
public class ComposeObject {
2827
/** MinioClient.composeObject() example. */
2928
public static void main(String[] args)
30-
throws IOException, NoSuchAlgorithmException, InvalidKeyException, XmlPullParserException {
29+
throws IOException, NoSuchAlgorithmException, InvalidKeyException {
3130
try {
3231
/* play.minio.io for test and development. */
3332
MinioClient minioClient =

‎examples/ComposeObjectEncrypted.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,11 @@
2626
import java.util.ArrayList;
2727
import java.util.List;
2828
import javax.crypto.spec.SecretKeySpec;
29-
import org.xmlpull.v1.XmlPullParserException;
3029

3130
public class ComposeObjectEncrypted {
3231
/** MinioClient.composeObject() example. */
3332
public static void main(String[] args)
34-
throws IOException, NoSuchAlgorithmException, InvalidKeyException, XmlPullParserException {
33+
throws IOException, NoSuchAlgorithmException, InvalidKeyException {
3534
try {
3635
/* play.minio.io for test and development. */
3736
MinioClient minioClient =

‎examples/CopyObject.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,11 @@
2222
import java.io.IOException;
2323
import java.security.InvalidKeyException;
2424
import java.security.NoSuchAlgorithmException;
25-
import org.xmlpull.v1.XmlPullParserException;
2625

2726
public class CopyObject {
2827
/** MinioClient.copyObject() example. */
2928
public static void main(String[] args)
30-
throws IOException, NoSuchAlgorithmException, InvalidKeyException, XmlPullParserException {
29+
throws IOException, NoSuchAlgorithmException, InvalidKeyException {
3130
try {
3231
/* play.min.io for test and development. */
3332
MinioClient minioClient =

‎examples/CopyObjectEncrypted.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@
77
import java.security.InvalidKeyException;
88
import java.security.NoSuchAlgorithmException;
99
import javax.crypto.spec.SecretKeySpec;
10-
import org.xmlpull.v1.XmlPullParserException;
1110

1211
public class CopyObjectEncrypted {
1312
/** MinioClient.copyObject() example using SSE_C. */
1413
public static void main(String[] args)
15-
throws NoSuchAlgorithmException, IOException, InvalidKeyException, XmlPullParserException {
14+
throws NoSuchAlgorithmException, IOException, InvalidKeyException {
1615
try {
1716
/* play.min.io for test and development. */
1817
MinioClient minioClient =

‎examples/CopyObjectEncryptedKms.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@
88
import java.security.NoSuchAlgorithmException;
99
import java.util.HashMap;
1010
import java.util.Map;
11-
import org.xmlpull.v1.XmlPullParserException;
1211

1312
public class CopyObjectEncryptedKms {
1413
/** MinioClient.copyObject() example using SSE_KMS. */
1514
public static void main(String[] args)
16-
throws NoSuchAlgorithmException, IOException, InvalidKeyException, XmlPullParserException {
15+
throws NoSuchAlgorithmException, IOException, InvalidKeyException {
1716
try {
1817
/* play.min.io for test and development. */
1918
MinioClient minioClient =

‎examples/CopyObjectEncryptedS3.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@
66
import java.io.IOException;
77
import java.security.InvalidKeyException;
88
import java.security.NoSuchAlgorithmException;
9-
import org.xmlpull.v1.XmlPullParserException;
109

1110
public class CopyObjectEncryptedS3 {
1211
/** MinioClient.copyObject() example using SSE_S3. */
1312
public static void main(String[] args)
14-
throws NoSuchAlgorithmException, IOException, InvalidKeyException, XmlPullParserException {
13+
throws NoSuchAlgorithmException, IOException, InvalidKeyException {
1514
try {
1615
/* play.min.io for test and development. */
1716
MinioClient minioClient =

‎examples/CopyObjectMetadata.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,11 @@
2525
import java.security.NoSuchAlgorithmException;
2626
import java.util.HashMap;
2727
import java.util.Map;
28-
import org.xmlpull.v1.XmlPullParserException;
2928

3029
public class CopyObjectMetadata {
3130
/** MinioClient.copyObject() example. */
3231
public static void main(String[] args)
33-
throws IOException, NoSuchAlgorithmException, InvalidKeyException, XmlPullParserException {
32+
throws IOException, NoSuchAlgorithmException, InvalidKeyException {
3433
try {
3534
/* play.min.io for test and development. */
3635
MinioClient minioClient =

0 commit comments

Comments
 (0)