Skip to content

Commit cc00b8a

Browse files
zzq996zzq996
committed
Version 3.23.3
1 parent 87f366f commit cc00b8a

File tree

4 files changed

+63
-71
lines changed

4 files changed

+63
-71
lines changed

‎assembly-java.xml‎

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
55
<id>assembly_zip</id>
66
<formats>
77
<format>zip</format>
@@ -16,8 +16,8 @@
1616
<unpack>false</unpack>
1717
<scope>runtime</scope>
1818
<excludes>
19-
<exclude>com.jamesmurty.utils:java-xmlbuilder</exclude>
20-
</excludes>
19+
<exclude>com.jamesmurty.utils:java-xmlbuilder</exclude>
20+
</excludes>
2121
</dependencySet>
2222
</dependencySets>
2323

@@ -31,10 +31,6 @@
3131
<source>${project.basedir}/app/src/main/resource/log4j2.xml</source>
3232
<outputDirectory>/</outputDirectory>
3333
</file>
34-
<file>
35-
<source>${project.basedir}/app/src/test/resource/test_data.properties</source>
36-
<outputDirectory>/source/src/test/resource</outputDirectory>
37-
</file>
3834
<file>
3935
<source>${project.basedir}/assembly-android.xml</source>
4036
<outputDirectory>/</outputDirectory>
@@ -44,25 +40,21 @@
4440
<outputDirectory>/</outputDirectory>
4541
</file>
4642
<file>
47-
<source>${project.basedir}/poms/pom-android.xml</source>
43+
<source>${project.basedir}/pom-android.xml</source>
4844
<outputDirectory>/</outputDirectory>
4945
</file>
5046
<file>
51-
<source>${project.basedir}/poms/pom-dependencies.xml</source>
47+
<source>${project.basedir}/pom-dependencies.xml</source>
5248
<outputDirectory>/</outputDirectory>
5349
</file>
5450
<file>
55-
<source>${project.basedir}/poms/pom-java-optimization.xml</source>
51+
<source>${project.basedir}/pom-java-optimization.xml</source>
5652
<outputDirectory>/</outputDirectory>
5753
</file>
5854
<file>
5955
<source>${project.basedir}/pom-java.xml</source>
6056
<outputDirectory>/</outputDirectory>
6157
</file>
62-
<file>
63-
<source>${project.basedir}/poms/pom-for-ci.xml</source>
64-
<outputDirectory>/</outputDirectory>
65-
</file>
6658
<file>
6759
<source>${project.basedir}/LICENSE</source>
6860
<outputDirectory>/</outputDirectory>
@@ -75,10 +67,12 @@
7567
<source>${project.basedir}/Help on License</source>
7668
<outputDirectory>/</outputDirectory>
7769
</file>
70+
7871
<file>
7972
<source>${project.basedir}/README-Java.md</source>
8073
<outputDirectory>/</outputDirectory>
8174
</file>
75+
8276
<file>
8377
<source>${project.basedir}/README-Android.md</source>
8478
<outputDirectory>/</outputDirectory>
@@ -93,6 +87,10 @@
9387
<directory>${project.basedir}/app/src/test/java/samples_android</directory>
9488
<outputDirectory>/samples_android</outputDirectory>
9589
</fileSet>
90+
<fileSet>
91+
<directory>${project.basedir}/app/src/third_part</directory>
92+
<outputDirectory>/third_part</outputDirectory>
93+
</fileSet>
9694
<fileSet>
9795
<directory>${project.build.directory}/doc</directory>
9896
<outputDirectory>/doc</outputDirectory>
@@ -108,9 +106,5 @@
108106
<exclude>proguard-rules.pro</exclude>
109107
</excludes>
110108
</fileSet>
111-
<fileSet>
112-
<directory>${project.basedir}/app/src/test/java/com</directory>
113-
<outputDirectory>/source/src/test/java/com</outputDirectory>
114-
</fileSet>
115109
</fileSets>
116110
</assembly>

‎pom-android.xml‎

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44

55
<groupId>com.huaweicloud</groupId>
66
<artifactId>esdk-obs-android</artifactId>
7-
<version>3.22.3</version>
7+
<version>3.22.12</version>
88
<packaging>jar</packaging>
99

1010
<name>OBS SDK for Android</name>
1111
<description>The OBS SDK for Android used for accessing Object Storage Service</description>
1212

1313
<properties>
1414
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
15+
<maven.javadoc.skip>true</maven.javadoc.skip>
1516
</properties>
1617

1718
<dependencies>
18-
1919
<dependency>
2020
<groupId>com.jamesmurty.utils</groupId>
2121
<artifactId>java-xmlbuilder</artifactId>
@@ -30,30 +30,29 @@
3030
<dependency>
3131
<groupId>com.squareup.okhttp3</groupId>
3232
<artifactId>okhttp</artifactId>
33-
<version>4.9.3</version>
33+
<version>4.10.0</version>
3434
</dependency>
3535
<dependency>
3636
<groupId>com.squareup.okio</groupId>
3737
<artifactId>okio</artifactId>
3838
<version>2.10.0</version>
3939
</dependency>
40-
40+
4141
<dependency>
4242
<groupId>com.fasterxml.jackson.core</groupId>
4343
<artifactId>jackson-core</artifactId>
44-
<version>2.13.0</version>
44+
<version>2.13.3</version>
4545
</dependency>
4646
<dependency>
4747
<groupId>com.fasterxml.jackson.core</groupId>
4848
<artifactId>jackson-databind</artifactId>
49-
<version>2.13.0</version>
49+
<version>2.13.4.1</version>
5050
</dependency>
5151
<dependency>
5252
<groupId>com.fasterxml.jackson.core</groupId>
5353
<artifactId>jackson-annotations</artifactId>
54-
<version>2.13.0</version>
54+
<version>2.13.3</version>
5555
</dependency>
56-
5756
</dependencies>
5857

5958
<build>
@@ -109,34 +108,39 @@
109108
</execution>
110109
</executions>
111110
</plugin>
112-
111+
113112
<plugin>
114113
<groupId>org.apache.maven.plugins</groupId>
115114
<artifactId>maven-jar-plugin</artifactId>
116115
<configuration>
117116
<excludes>
118-
<exclude>okio/*</exclude>
117+
<exclude>okio/*</exclude>
119118
</excludes>
120119
</configuration>
121120
</plugin>
122-
121+
123122
<plugin>
124123
<groupId>org.apache.maven.plugins</groupId>
125124
<artifactId>maven-assembly-plugin</artifactId>
125+
<configuration>
126+
<archive>
127+
<manifest>
128+
<mainClass>com.test.MainClassName</mainClass>
129+
</manifest>
130+
</archive>
131+
<descriptorRefs>
132+
<descriptorRef>jar-with-dependencies</descriptorRef>
133+
</descriptorRefs>
134+
</configuration>
126135
<executions>
127136
<execution>
128-
<phase>install</phase>
137+
<id>make-assembly</id>
138+
<phase>package</phase>
129139
<goals>
130140
<goal>single</goal>
131141
</goals>
132142
</execution>
133143
</executions>
134-
<configuration>
135-
<appendAssemblyId>false</appendAssemblyId>
136-
<descriptors>
137-
<descriptor>assembly-android.xml</descriptor>
138-
</descriptors>
139-
</configuration>
140144
</plugin>
141145
</plugins>
142146
</build>

‎pom-dependencies.xml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44

5-
<groupId>com.huaweicloud</groupId>
5+
<groupId>com.huawei.storage</groupId>
66
<artifactId>esdk-obs-java</artifactId>
7-
<version>3.22.3</version>
7+
<version>3.21.4.1</version>
88
<packaging>jar</packaging>
99

1010
<name>OBS SDK for Java</name>
@@ -26,47 +26,47 @@
2626
</exclusion>
2727
</exclusions>
2828
</dependency>
29-
29+
3030
<dependency>
31-
<groupId>com.squareup.okhttp3</groupId>
32-
<artifactId>okhttp</artifactId>
33-
<version>4.9.3</version>
31+
<groupId>com.squareup.okhttp3</groupId>
32+
<artifactId>okhttp</artifactId>
33+
<version>3.14.9</version>
3434
</dependency>
3535
<dependency>
3636
<groupId>com.squareup.okio</groupId>
3737
<artifactId>okio</artifactId>
38-
<version>2.10.0</version>
38+
<version>1.17.5</version>
3939
</dependency>
40-
40+
4141
<dependency>
4242
<groupId>com.fasterxml.jackson.core</groupId>
4343
<artifactId>jackson-core</artifactId>
44-
<version>2.13.0</version>
44+
<version>2.11.1</version>
4545
</dependency>
4646
<dependency>
4747
<groupId>com.fasterxml.jackson.core</groupId>
4848
<artifactId>jackson-databind</artifactId>
49-
<version>2.13.0</version>
49+
<version>2.11.1</version>
5050
</dependency>
5151
<dependency>
5252
<groupId>com.fasterxml.jackson.core</groupId>
5353
<artifactId>jackson-annotations</artifactId>
54-
<version>2.13.0</version>
54+
<version>2.11.1</version>
5555
</dependency>
56-
56+
5757
<dependency>
5858
<groupId>org.apache.logging.log4j</groupId>
5959
<artifactId>log4j-core</artifactId>
60-
<version>2.17.1</version>
60+
<version>2.13.2</version>
6161
</dependency>
6262
<dependency>
6363
<groupId>org.apache.logging.log4j</groupId>
6464
<artifactId>log4j-api</artifactId>
65-
<version>2.17.1</version>
65+
<version>2.13.2</version>
6666
</dependency>
67-
67+
6868
</dependencies>
6969

70-
71-
70+
71+
7272
</project>

‎pom-java-optimization.xml‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44

55
<groupId>com.huaweicloud</groupId>
66
<artifactId>esdk-obs-java-optimised</artifactId>
7-
<version>3.22.12</version>
7+
<version>3.22.12.1</version>
88
<packaging>jar</packaging>
99

10-
<name>OBS SDK for Java Optimised</name>
10+
<name>OBS SDK for Java</name>
1111
<description>The OBS SDK for Java used for accessing Object Storage Service</description>
1212

1313
<properties>
@@ -50,7 +50,7 @@
5050
<dependency>
5151
<groupId>com.fasterxml.jackson.core</groupId>
5252
<artifactId>jackson-annotations</artifactId>
53-
<version>2.13.2</version>
53+
<version>2.13.3</version>
5454
</dependency>
5555

5656
<dependency>
@@ -62,25 +62,19 @@
6262
<groupId>org.apache.logging.log4j</groupId>
6363
<artifactId>log4j-api</artifactId>
6464
<version>2.18.0</version>
65-
</dependency>
66-
<dependency>
67-
<groupId>org.powermock</groupId>
68-
<artifactId>powermock-module-junit4</artifactId>
69-
<version>1.6.5</version>
70-
<scope>test</scope>
7165
</dependency>
7266
</dependencies>
7367

7468
<build>
75-
<sourceDirectory>../app/src/main/java</sourceDirectory>
76-
<!--
69+
<sourceDirectory>app/src/main/java</sourceDirectory>
70+
<!--
7771
<resources>
7872
<resource>
7973
<directory>app/src/main/resource</directory>
8074
</resource>
8175
</resources>
8276
-->
83-
<testSourceDirectory>../app/src/test/java</testSourceDirectory>
77+
<testSourceDirectory>app/src/test/java</testSourceDirectory>
8478
<plugins>
8579
<plugin>
8680
<groupId>org.apache.maven.plugins</groupId>
@@ -110,7 +104,7 @@
110104
</execution>
111105
</executions>
112106
</plugin>
113-
<!--
107+
<!--
114108
<plugin>
115109
<groupId>org.apache.maven.plugins</groupId>
116110
<artifactId>maven-javadoc-plugin</artifactId>
@@ -134,7 +128,7 @@
134128
</executions>
135129
</plugin> -->
136130

137-
<!--
131+
<!--
138132
<plugin>
139133
<groupId>org.apache.maven.plugins</groupId>
140134
<artifactId>maven-assembly-plugin</artifactId>

0 commit comments

Comments
 (0)