Skip to content

Commit 2f060bf

Browse files
Hyq0719Hyq0719
committed
Merge remote-tracking branch 'origin/feature/hyq/2022/01/init' into feature/hyq/2022/01/init
2 parents 6b2dbb9 + f1c5417 commit 2f060bf

File tree

8 files changed

+68
-26
lines changed

8 files changed

+68
-26
lines changed

‎code-generators/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>io.github.hyq0719</groupId>
1010
<artifactId>marketing-api-sdk</artifactId>
11-
<version>1.0.0-SNAPSHOT</version>
11+
<version>1.0.0-beta.1</version>
1212
</parent>
1313

1414
<artifactId>marketing-api-generators</artifactId>
@@ -19,6 +19,7 @@
1919
<properties>
2020
<maven.compiler.source>${java.version}</maven.compiler.source>
2121
<maven.compiler.target>${java.version}</maven.compiler.target>
22+
<maven.deploy.skip>true</maven.deploy.skip>
2223
</properties>
2324

2425
<modules>

‎marketing-api-common/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<parent>
88
<groupId>io.github.hyq0719</groupId>
99
<artifactId>marketing-api-sdk</artifactId>
10-
<version>1.0.0-SNAPSHOT</version>
10+
<version>1.0.0-beta.1</version>
1111
</parent>
1212

1313
<artifactId>marketing-api-common</artifactId>
14-
<version>1.0.0-SNAPSHOT</version>
14+
<version>1.0.0-beta.1</version>
1515
<name>Marketing API - Common Java SDK</name>
1616
<description>Marketing API Java SDK公共模块</description>
1717

‎marketing-api-oceanengine/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<parent>
88
<groupId>io.github.hyq0719</groupId>
99
<artifactId>marketing-api-sdk</artifactId>
10-
<version>1.0.0-SNAPSHOT</version>
10+
<version>1.0.0-beta.1</version>
1111
</parent>
1212

1313
<artifactId>marketing-api-oceanengine</artifactId>
14-
<version>1.0.0-SNAPSHOT</version>
14+
<version>1.0.0-beta.1</version>
1515
<name>Marketing API - Ocean Engine Java SDK</name>
1616
<description>巨量引擎开放平台 Java SDK</description>
1717

‎marketing-api-vivo/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<parent>
88
<groupId>io.github.hyq0719</groupId>
99
<artifactId>marketing-api-sdk</artifactId>
10-
<version>1.0.0-SNAPSHOT</version>
10+
<version>1.0.0-beta.1</version>
1111
</parent>
1212

1313
<artifactId>marketing-api-vivo</artifactId>
14-
<version>1.0.0-SNAPSHOT</version>
14+
<version>1.0.0-beta.1</version>
1515
<name>Marketing API - VIVO Java SDK</name>
1616
<description>VIVO商业开放平台 Java SDK</description>
1717

‎pom.xml‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66

77
<groupId>io.github.hyq0719</groupId>
88
<artifactId>marketing-api-sdk</artifactId>
9-
<version>1.0.0-SNAPSHOT</version>
9+
<version>1.0.0-beta.1</version>
1010
<name>Marketing API Java SDK</name>
1111
<description>Marketing API Java SDK</description>
12+
<url>https://github.com/Hyq0719/marketing-api-java-sdks</url>
1213

1314
<licenses>
1415
<license>
@@ -32,19 +33,16 @@
3233
</developers>
3334

3435
<scm>
35-
<connection>scm:git:https://github.com/Hyq0719/marketing-api-java-sdks.git</connection>
36-
<developerConnection>scm:git:git@github.com:Hyq0719/marketing-api-java-sdks.git</developerConnection>
36+
<connection>https://github.com/Hyq0719/marketing-api-java-sdks.git</connection>
37+
<developerConnection>https://github.com/Hyq0719/marketing-api-java-sdks.git</developerConnection>
3738
<url>https://github.com/Hyq0719/marketing-api-java-sdks</url>
3839
</scm>
3940

4041
<modules>
4142
<module>marketing-api-common</module>
42-
<module>marketing-api-kuaishou</module>
4343
<module>marketing-api-oceanengine</module>
44-
<module>marketing-api-tencent</module>
4544
<module>marketing-api-vivo</module>
4645
<module>spring-boot-starters</module>
47-
<module>spring-boot-demo</module>
4846
<module>code-generators</module>
4947
</modules>
5048

@@ -59,7 +57,7 @@
5957
<dependency>
6058
<groupId>org.springframework</groupId>
6159
<artifactId>spring-beans</artifactId>
62-
<version>5.0.5.RELEASE</version>
60+
<version>5.3.9</version>
6361
<scope>compile</scope>
6462
</dependency>
6563
<dependency>
@@ -123,9 +121,9 @@
123121
<maven.compiler.target>${java.version}</maven.compiler.target>
124122
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
125123
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
126-
<common.version>1.0.0-SNAPSHOT</common.version>
124+
<common.version>1.0.0-beta.1</common.version>
127125
<gson-fire-version>1.8.0</gson-fire-version>
128-
<okhttp-version>3.11.0</okhttp-version>
126+
<okhttp-version>4.5.0</okhttp-version>
129127
<apache.http-version>4.5.13</apache.http-version>
130128
<gson-version>2.8.1</gson-version>
131129
<threetenbp-version>1.3.5</threetenbp-version>

‎spring-boot-starters/oceanengine-spring-boot-starter/pom.xml‎

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<parent>
66
<groupId>io.github.hyq0719</groupId>
77
<artifactId>marketing-api-spring-boot-starters</artifactId>
8-
<version>1.0.0-SNAPSHOT</version>
8+
<version>1.0.0-beta.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

1212
<artifactId>oceanengine-spring-boot-starter</artifactId>
13-
<version>1.0.0-SNAPSHOT</version>
13+
<version>1.0.0-beta.1</version>
1414
<name>Marketing API - Spring Boot Starter for Ocean Engine</name>
1515
<description>巨量引擎 Spring Boot Starter</description>
1616

@@ -27,4 +27,27 @@
2727
</dependency>
2828
</dependencies>
2929

30+
<build>
31+
<plugins>
32+
<plugin>
33+
<groupId>org.springframework.boot</groupId>
34+
<artifactId>spring-boot-maven-plugin</artifactId>
35+
<version>${spring.boot.version}</version>
36+
</plugin>
37+
<plugin>
38+
<groupId>org.apache.maven.plugins</groupId>
39+
<artifactId>maven-source-plugin</artifactId>
40+
<version>2.2.1</version>
41+
<executions>
42+
<execution>
43+
<id>attach-sources</id>
44+
<goals>
45+
<goal>jar-no-fork</goal>
46+
</goals>
47+
</execution>
48+
</executions>
49+
</plugin>
50+
</plugins>
51+
</build>
52+
3053
</project>

‎spring-boot-starters/pom.xml‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,24 @@
77
<parent>
88
<groupId>io.github.hyq0719</groupId>
99
<artifactId>marketing-api-sdk</artifactId>
10-
<version>1.0.0-SNAPSHOT</version>
10+
<version>1.0.0-beta.1</version>
1111
</parent>
1212
<packaging>pom</packaging>
1313

1414
<artifactId>marketing-api-spring-boot-starters</artifactId>
15-
<version>1.0.0-SNAPSHOT</version>
15+
<version>1.0.0-beta.1</version>
1616
<name>Marketing API - Spring Boot Starters</name>
1717
<description>Marketing API 各个模块的 Spring Boot Starter</description>
1818

1919
<modules>
20-
<module>kuaishou-spring-boot-starter</module>
2120
<module>oceanengine-spring-boot-starter</module>
22-
<module>tencent-spring-boot-starter</module>
2321
<module>vivo-spring-boot-starter</module>
24-
<module>production-spring-boot-starter</module>
2522
</modules>
2623

2724
<properties>
2825
<maven.compiler.source>${java.version}</maven.compiler.source>
2926
<maven.compiler.target>${java.version}</maven.compiler.target>
30-
<spring.boot.version>2.0.1.RELEASE</spring.boot.version>
27+
<spring.boot.version>2.5.3</spring.boot.version>
3128
</properties>
3229

3330
<dependencies>

‎spring-boot-starters/vivo-spring-boot-starter/pom.xml‎

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<parent>
66
<artifactId>marketing-api-spring-boot-starters</artifactId>
77
<groupId>io.github.hyq0719</groupId>
8-
<version>1.0.0-SNAPSHOT</version>
8+
<version>1.0.0-beta.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

1212
<artifactId>vivo-spring-boot-starter</artifactId>
13-
<version>1.0.0-SNAPSHOT</version>
13+
<version>1.0.0-beta.1</version>
1414
<name>Marketing API - Spring Boot Starter for VIVO</name>
1515
<description>VIVO Spring Boot Starter</description>
1616

@@ -26,4 +26,27 @@
2626
<version>${project.version}</version>
2727
</dependency>
2828
</dependencies>
29+
30+
<build>
31+
<plugins>
32+
<plugin>
33+
<groupId>org.springframework.boot</groupId>
34+
<artifactId>spring-boot-maven-plugin</artifactId>
35+
<version>${spring.boot.version}</version>
36+
</plugin>
37+
<plugin>
38+
<groupId>org.apache.maven.plugins</groupId>
39+
<artifactId>maven-source-plugin</artifactId>
40+
<version>2.2.1</version>
41+
<executions>
42+
<execution>
43+
<id>attach-sources</id>
44+
<goals>
45+
<goal>jar-no-fork</goal>
46+
</goals>
47+
</execution>
48+
</executions>
49+
</plugin>
50+
</plugins>
51+
</build>
2952
</project>

0 commit comments

Comments
 (0)