Skip to content

Commit 891e35c

Browse files
redabcredabc
committed
Update to 3.21.8
1 parent 52debe6 commit 891e35c

File tree

5 files changed

+75
-138
lines changed

5 files changed

+75
-138
lines changed

‎app/pom.xml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
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.huawei.storage</groupId>
5+
<groupId>com.huaweicloud</groupId>
66
<artifactId>esdk-obs-java-android</artifactId>
7-
<version>3.21.4.1</version>
7+
<version>3.21.8</version>
88

99
<name>OBS SDK for Java/Android</name>
1010
<description>The OBS SDK for Android used for accessing Object Storage Service</description>
@@ -31,12 +31,12 @@
3131
<dependency>
3232
<groupId>com.squareup.okhttp3</groupId>
3333
<artifactId>okhttp</artifactId>
34-
<version>3.14.9</version>
34+
<version>4.8.0</version>
3535
</dependency>
3636
<dependency>
3737
<groupId>com.squareup.okio</groupId>
3838
<artifactId>okio</artifactId>
39-
<version>1.17.5</version>
39+
<version>2.7.0</version>
4040
</dependency>
4141

4242
<dependency>
@@ -58,12 +58,12 @@
5858
<dependency>
5959
<groupId>org.apache.logging.log4j</groupId>
6060
<artifactId>log4j-core</artifactId>
61-
<version>2.13.2</version>
61+
<version>2.13.3</version>
6262
</dependency>
6363
<dependency>
6464
<groupId>org.apache.logging.log4j</groupId>
6565
<artifactId>log4j-api</artifactId>
66-
<version>2.13.2</version>
66+
<version>2.13.3</version>
6767
</dependency>
6868
</dependencies>
6969

@@ -130,8 +130,7 @@
130130
<artifactId>maven-javadoc-plugin</artifactId>
131131
<version>3.0.0-M1</version>
132132
<configuration>
133-
<source>1.7</source>
134-
<target>1.7</target>
133+
<source>1.8</source>
135134
<docencoding>UTF-8</docencoding>
136135
<charset>UTF-8</charset>
137136
<excludePackageNames>*.internal.*:*.log:*.proxy:okio</excludePackageNames>

‎app/src/main/java/com/obs/log/InterfaceLogBean.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public class InterfaceLogBean {
113113
* Interface name
114114
* @param targetAddr
115115
* IP address of the target host
116-
* @param requestParams
116+
* @param reqParams
117117
* Request parameters
118118
*/
119119
public InterfaceLogBean(String name, String targetAddr, String reqParams) {

‎pom-android.xml‎

Lines changed: 42 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
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.huawei.storage</groupId>
5+
<groupId>com.huaweicloud</groupId>
66
<artifactId>esdk-obs-android</artifactId>
7-
<version>3.21.4.1</version>
7+
<version>3.21.8</version>
88
<packaging>jar</packaging>
99

1010
<name>OBS SDK for Android</name>
@@ -15,101 +15,51 @@
1515
</properties>
1616

1717
<dependencies>
18-
<dependency>
19-
<groupId>com.jamesmurty.utils</groupId>
20-
<artifactId>java-xmlbuilder</artifactId>
21-
<version>1.3</version>
22-
<exclusions>
23-
<exclusion>
24-
<groupId>net.iharder</groupId>
25-
<artifactId>base64</artifactId>
26-
</exclusion>
27-
</exclusions>
28-
</dependency>
29-
<dependency>
30-
<groupId>com.squareup.okhttp3</groupId>
31-
<artifactId>okhttp</artifactId>
32-
<version>3.14.9</version>
33-
</dependency>
34-
<dependency>
35-
<groupId>com.squareup.okio</groupId>
36-
<artifactId>okio</artifactId>
37-
<version>1.17.5</version>
38-
</dependency>
39-
40-
<dependency>
41-
<groupId>com.fasterxml.jackson.core</groupId>
42-
<artifactId>jackson-core</artifactId>
43-
<version>2.11.1</version>
44-
</dependency>
45-
<dependency>
46-
<groupId>com.fasterxml.jackson.core</groupId>
47-
<artifactId>jackson-databind</artifactId>
48-
<version>2.11.1</version>
49-
</dependency>
50-
<dependency>
51-
<groupId>com.fasterxml.jackson.core</groupId>
52-
<artifactId>jackson-annotations</artifactId>
53-
<version>2.11.1</version>
54-
</dependency>
55-
56-
<dependency>
57-
<groupId>org.apache.logging.log4j</groupId>
58-
<artifactId>log4j-core</artifactId>
59-
<version>2.13.2</version>
60-
</dependency>
61-
<dependency>
62-
<groupId>org.apache.logging.log4j</groupId>
63-
<artifactId>log4j-api</artifactId>
64-
<version>2.13.2</version>
65-
</dependency>
66-
6718

6819
<dependency>
69-
<groupId>org.mockito</groupId>
70-
<artifactId>mockito-core</artifactId>
71-
<version>1.10.19</version>
72-
<scope>test</scope>
73-
</dependency>
74-
75-
<dependency>
76-
<groupId>org.powermock</groupId>
77-
<artifactId>powermock-api-mockito</artifactId>
78-
<version>1.6.5</version>
79-
<scope>test</scope>
80-
</dependency>
81-
<dependency>
82-
<groupId>org.powermock</groupId>
83-
<artifactId>powermock-module-junit4</artifactId>
84-
<version>1.6.5</version>
85-
<scope>test</scope>
86-
</dependency>
20+
<groupId>com.jamesmurty.utils</groupId>
21+
<artifactId>java-xmlbuilder</artifactId>
22+
<version>1.3</version>
23+
<exclusions>
24+
<exclusion>
25+
<groupId>net.iharder</groupId>
26+
<artifactId>base64</artifactId>
27+
</exclusion>
28+
</exclusions>
29+
</dependency>
30+
<dependency>
31+
<groupId>com.squareup.okhttp3</groupId>
32+
<artifactId>okhttp</artifactId>
33+
<version>4.8.0</version>
34+
</dependency>
35+
<dependency>
36+
<groupId>com.squareup.okio</groupId>
37+
<artifactId>okio</artifactId>
38+
<version>2.7.0</version>
39+
</dependency>
40+
41+
<dependency>
42+
<groupId>com.fasterxml.jackson.core</groupId>
43+
<artifactId>jackson-core</artifactId>
44+
<version>2.11.1</version>
45+
</dependency>
46+
<dependency>
47+
<groupId>com.fasterxml.jackson.core</groupId>
48+
<artifactId>jackson-databind</artifactId>
49+
<version>2.11.1</version>
50+
</dependency>
51+
<dependency>
52+
<groupId>com.fasterxml.jackson.core</groupId>
53+
<artifactId>jackson-annotations</artifactId>
54+
<version>2.11.1</version>
55+
</dependency>
8756

8857
</dependencies>
8958

9059
<build>
91-
<sourceDirectory>app/src/main/java</sourceDirectory>
60+
<sourceDirectory>app/src/main/java/com</sourceDirectory>
9261
<testSourceDirectory>app/src/test/java</testSourceDirectory>
9362
<plugins>
94-
<plugin>
95-
<groupId>org.codehaus.mojo</groupId>
96-
<artifactId>exec-maven-plugin</artifactId>
97-
<version>1.2</version>
98-
<executions>
99-
<execution>
100-
<phase>package</phase>
101-
<goals>
102-
<goal>exec</goal>
103-
</goals>
104-
<configuration>
105-
<executable>${basedir}/gradlew</executable>
106-
<arguments>
107-
<argument>build</argument>
108-
</arguments>
109-
</configuration>
110-
</execution>
111-
</executions>
112-
</plugin>
11363

11464
<plugin>
11565
<groupId>org.apache.maven.plugins</groupId>
@@ -129,8 +79,8 @@
12979
<artifactId>maven-compiler-plugin</artifactId>
13080
<configuration>
13181
<encoding>UTF-8</encoding>
132-
<source>1.7</source>
133-
<target>1.7</target>
82+
<source>1.8</source>
83+
<target>1.8</target>
13484
</configuration>
13585
<executions>
13686
<execution>
@@ -143,8 +93,7 @@
14393
<artifactId>maven-javadoc-plugin</artifactId>
14494
<version>3.0.0-M1</version>
14595
<configuration>
146-
<source>1.7</source>
147-
<target>1.7</target>
96+
<source>1.8</source>
14897
<docencoding>UTF-8</docencoding>
14998
<charset>UTF-8</charset>
15099
<excludePackageNames>*.internal.*:*.log:*.proxy:okio</excludePackageNames>

‎pom-java-optimization.xml‎

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
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.huawei.storage</groupId>
6-
<artifactId>esdk-obs-java</artifactId>
7-
<version>optimization-3.21.4.1</version>
5+
<groupId>com.huaweicloud</groupId>
6+
<artifactId>esdk-obs-java-optimised</artifactId>
7+
<version>3.21.8</version>
88
<packaging>jar</packaging>
99

1010
<name>OBS SDK for Java</name>
@@ -56,25 +56,18 @@
5656
<dependency>
5757
<groupId>org.apache.logging.log4j</groupId>
5858
<artifactId>log4j-core</artifactId>
59-
<version>2.13.2</version>
59+
<version>2.13.3</version>
6060
</dependency>
6161
<dependency>
6262
<groupId>org.apache.logging.log4j</groupId>
6363
<artifactId>log4j-api</artifactId>
64-
<version>2.13.2</version>
64+
<version>2.13.3</version>
6565
</dependency>
6666

6767
</dependencies>
6868

6969
<build>
7070
<sourceDirectory>app/src/main/java</sourceDirectory>
71-
<!--
72-
<resources>
73-
<resource>
74-
<directory>app/src/main/resource</directory>
75-
</resource>
76-
</resources>
77-
-->
7871
<testSourceDirectory>app/src/test/java</testSourceDirectory>
7972
<plugins>
8073
<plugin>
@@ -96,8 +89,8 @@
9689
<artifactId>maven-compiler-plugin</artifactId>
9790
<configuration>
9891
<encoding>UTF-8</encoding>
99-
<source>1.7</source>
100-
<target>1.7</target>
92+
<source>1.8</source>
93+
<target>1.8</target>
10194
</configuration>
10295
<executions>
10396
<execution>
@@ -111,8 +104,8 @@
111104
<artifactId>maven-javadoc-plugin</artifactId>
112105
<version>3.0.0-M1</version>
113106
<configuration>
114-
<source>1.7</source>
115-
<target>1.7</target>
107+
<source>1.8</source>
108+
<target>1.8</target>
116109
<docencoding>UTF-8</docencoding>
117110
<charset>UTF-8</charset>
118111
<excludePackageNames>*.internal.*:*.log:*.proxy:okio</excludePackageNames>

‎pom-java.xml‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
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.huawei.storage</groupId>
5+
<groupId>com.huaweicloud</groupId>
66
<artifactId>esdk-obs-java</artifactId>
7-
<version>3.21.4.1</version>
7+
<version>3.21.8</version>
88
<packaging>jar</packaging>
99

1010
<name>OBS SDK for Java</name>
@@ -29,12 +29,12 @@
2929
<dependency>
3030
<groupId>com.squareup.okhttp3</groupId>
3131
<artifactId>okhttp</artifactId>
32-
<version>3.14.9</version>
32+
<version>4.8.0</version>
3333
</dependency>
3434
<dependency>
3535
<groupId>com.squareup.okio</groupId>
3636
<artifactId>okio</artifactId>
37-
<version>1.17.5</version>
37+
<version>2.7.0</version>
3838
</dependency>
3939

4040
<dependency>
@@ -56,12 +56,12 @@
5656
<dependency>
5757
<groupId>org.apache.logging.log4j</groupId>
5858
<artifactId>log4j-core</artifactId>
59-
<version>2.13.2</version>
59+
<version>2.13.3</version>
6060
</dependency>
6161
<dependency>
6262
<groupId>org.apache.logging.log4j</groupId>
6363
<artifactId>log4j-api</artifactId>
64-
<version>2.13.2</version>
64+
<version>2.13.3</version>
6565
</dependency>
6666

6767

@@ -88,14 +88,7 @@
8888
</dependencies>
8989

9090
<build>
91-
<sourceDirectory>app/src/main/java</sourceDirectory>
92-
<!--
93-
<resources>
94-
<resource>
95-
<directory>app/src/main/resource</directory>
96-
</resource>
97-
</resources>
98-
-->
91+
<sourceDirectory>app/src/main/java/com</sourceDirectory>
9992
<testSourceDirectory>app/src/test/java</testSourceDirectory>
10093
<plugins>
10194
<plugin>
@@ -117,8 +110,8 @@
117110
<artifactId>maven-compiler-plugin</artifactId>
118111
<configuration>
119112
<encoding>UTF-8</encoding>
120-
<source>1.7</source>
121-
<target>1.7</target>
113+
<source>1.8</source>
114+
<target>1.8</target>
122115
<compilerArgs>
123116
<arg>-Xlint:deprecation</arg>
124117
<arg>-Xlint:unchecked</arg>
@@ -133,12 +126,12 @@
133126
<plugin>
134127
<groupId>org.apache.maven.plugins</groupId>
135128
<artifactId>maven-javadoc-plugin</artifactId>
136-
<version>3.0.0-M1</version>
129+
<version>3.0.1</version>
137130
<configuration>
138-
<source>1.7</source>
139-
<target>1.7</target>
131+
<source>1.8</source>
140132
<docencoding>UTF-8</docencoding>
141133
<charset>UTF-8</charset>
134+
<doclint>none</doclint>
142135
<excludePackageNames>*.internal.*:*.log:*.proxy:okio</excludePackageNames>
143136
<destDir>${project.build.directory}/doc</destDir>
144137
</configuration>
@@ -196,10 +189,13 @@
196189
<artifactSet>
197190
<excludes>
198191
<exclude>com.squareup.okhttp3:okhttp:jar:</exclude>
199-
<exclude>com.squareup.okio:okio:jar:</exclude>
200192
<exclude>com.fasterxml.jackson.core:jackson-core:jar:</exclude>
201193
<exclude>com.fasterxml.jackson.core:jackson-databind:jar:</exclude>
202194
<exclude>com.fasterxml.jackson.core:jackson-annotations:jar:</exclude>
195+
<exclude>org.jetbrains.kotlin:kotlin-stdlib:jar:</exclude>
196+
<exclude>org.jetbrains:annotations:jar:</exclude>
197+
<exclude>org.jetbrains.kotlin:kotlin-stdlib-common:jar:</exclude>
198+
<exclude>com.squareup.okio:okio:jar:</exclude>
203199
<exclude>org.apache.logging.log4j:log4j-core:jar:</exclude>
204200
<exclude>org.apache.logging.log4j:log4j-api:jar:</exclude>
205201
</excludes>

0 commit comments

Comments
 (0)