2022.0.0 release

baidu · Feb 16, 2022 · 749672a · 749672a
1 parent fe33f78
commit 749672a
Show file tree

Hide file tree

Showing 14 changed files with 95 additions and 89 deletions.
diff --git a/java/baiduads-sdk-auto/api/openapi.yaml b/java/baiduads-sdk-auto/api/openapi.yaml
@@ -2,7 +2,7 @@ openapi: 3.0.1
 info:
   description: '''dev2.baidu.com'' api schema'
   title: dev2 api schema
-  version: 2022.0.0-SNAPSHOT
+  version: 2022.0.0
 servers:
 - url: https://api.baidu.com/
 - url: http://api.baidu.com/

diff --git a/java/baiduads-sdk-auto/build.gradle b/java/baiduads-sdk-auto/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'idea'
 apply plugin: 'eclipse'
 
 group = 'com.baidu.dev2'
-version = '2022.0.0-SNAPSHOT'
+version = '2022.0.0'
 
 buildscript {
     repositories {

diff --git a/java/baiduads-sdk-auto/pom.xml b/java/baiduads-sdk-auto/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>com.baidu.dev2</groupId>
     <artifactId>baiduads-sdk-parent</artifactId>
-    <version>2022.0.0-SNAPSHOT</version>
+    <version>2022.0.0</version>
   </parent>
   <groupId>com.baidu.dev2</groupId>
   <artifactId>baiduads-sdk-auto</artifactId>
-  <version>2022.0.0-SNAPSHOT</version>
+  <version>2022.0.0</version>
   <name>baiduads-sdk-auto</name>
   <description>dev2-auto-sdk</description>
   <url>https://github.com/openapitools/openapi-generator</url>

diff --git a/java/baiduads-sdk-auto/src/main/java/com/baidu/dev2/api/sdk/invoke/ApiClient.java b/java/baiduads-sdk-auto/src/main/java/com/baidu/dev2/api/sdk/invoke/ApiClient.java
@@ -123,7 +123,7 @@ public ApiClient(CloseableHttpClient httpClient) {
     dateFormat = ApiClient.buildDefaultDateFormat();
 
     // Set default User-Agent.
-    setUserAgent("baiduads-sdk/2022.0.0-SNAPSHOT/java");
+    setUserAgent("baiduads-sdk/2022.0.0/java");
 
     // Setup authentications (key: authentication name, value: authentication).
     authentications = new HashMap<String, Authentication>();

diff --git a/...iduads-sdk-package-maven-plugin/src/main/java/com/baidu/dev2/maven/plugins/Constants.java b/...iduads-sdk-package-maven-plugin/src/main/java/com/baidu/dev2/maven/plugins/Constants.java
@@ -14,7 +14,7 @@ public class Constants {
     public static final String SDK_MODULE_NAME = "baiduads-sdk";
 
     public static final String SDK_AUTO_MODULE_NAME = "baiduads-sdk-auto";
-    
+
     public static final String SDK_THIRDPARTY_MODULE_NAME = "baiduads-sdk-thirdparty";
 
     public static final String BUILD_DIR_NAME = "target";

diff --git a/java/baiduads-sdk-thirdparty/pom.xml b/java/baiduads-sdk-thirdparty/pom.xml
@@ -1,27 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>com.baidu.dev2</groupId>
     <artifactId>baiduads-sdk-parent</artifactId>
-    <version>2022.0.0-SNAPSHOT</version>
+    <version>2022.0.0</version>
   </parent>
-
   <groupId>com.baidu.dev2</groupId>
   <artifactId>baiduads-sdk-thirdparty</artifactId>
-  <version>2022.0.0-SNAPSHOT</version>
-
+  <version>2022.0.0</version>
   <name>baiduads-sdk-thirdparty</name>
   <url>https://github.com/baidu/baiduads-sdk</url>
-
   <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.source>8</maven.compiler.source>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.target>8</maven.compiler.target>
   </properties>
-
   <dependencies>
     <dependency>
       <groupId>io.swagger</groupId>
@@ -103,14 +98,7 @@
       <artifactId>jackson-datatype-jsr310</artifactId>
       <version>2.12.1</version>
     </dependency>
-    <dependency>
-      <groupId>org.projectlombok</groupId>
-      <artifactId>lombok</artifactId>
-      <version>1.18.20</version>
-    </dependency>
   </dependencies>
-
-
   <build>
     <plugins>
       <plugin>
@@ -201,13 +189,11 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-deploy-plugin</artifactId>
         <configuration>
           <skip>true</skip>
         </configuration>
       </plugin>
     </plugins>
   </build>
-
 </project>
diff --git a/java/baiduads-sdk/dependency-reduced-pom.xml b/java/baiduads-sdk/dependency-reduced-pom.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <artifactId>baiduads-sdk-parent</artifactId>
+    <groupId>com.baidu.dev2</groupId>
+    <version>2022.0.0</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>baiduads-sdk</artifactId>
+  <version>2022.0.0</version>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>3.1.0</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <createSourcesJar>true</createSourcesJar>
+              <artifactSet>
+                <includes>
+                  <include>*:*</include>
+                </includes>
+              </artifactSet>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>hamcrest-core</artifactId>
+          <groupId>org.hamcrest</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
+</project>
+
diff --git a/java/baiduads-sdk/pom.xml b/java/baiduads-sdk/pom.xml
@@ -5,28 +5,25 @@
   <parent>
     <groupId>com.baidu.dev2</groupId>
     <artifactId>baiduads-sdk-parent</artifactId>
-    <version>2022.0.0-SNAPSHOT</version>
+    <version>2022.0.0</version>
   </parent>
   <artifactId>baiduads-sdk</artifactId>
-  <version>2022.0.0-SNAPSHOT</version>
+  <version>2022.0.0</version>
   <dependencies>
     <dependency>
       <groupId>com.baidu.dev2</groupId>
       <artifactId>baiduads-sdk-auto</artifactId>
-      <version>2022.0.0-SNAPSHOT</version>
+      <version>2022.0.0</version>
     </dependency>
-
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
-
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
         <version>3.1.0</version>
         <executions>

diff --git a/java/pom.xml b/java/pom.xml
@@ -1,58 +1,54 @@
 <?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.baidu.dev2</groupId>
   <artifactId>baiduads-sdk-parent</artifactId>
-  <version>2022.0.0-SNAPSHOT</version>
+  <version>2022.0.0</version>
   <packaging>pom</packaging>
   <name>${project.artifactId}</name>
   <description>baiduads-sdk for java</description>
   <url>https://github.com/baidu/baiduads-sdk</url>
-  <modules>
-    <module>baiduads-sdk</module>
-    <module>baiduads-sdk-auto</module>
-    <module>baiduads-sdk-thirdparty</module>
-  </modules>
-
-  <scm>
-    <connection>scm:git:https://github.com/baidu/baiduads-sdk.git</connection>
-    <developerConnection>scm:git:https://github.com/baidu/baiduads-sdk.git</developerConnection>
-    <url>https://github.com/baidu/baiduads-sdk/tree/main/java</url>
-  </scm>
-
   <licenses>
     <license>
       <name>The Apache License, Version 2.0</name>
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
     </license>
   </licenses>
-
-
   <developers>
     <developer>
       <name>joecqupt</name>
       <email>[email protected]</email>
     </developer>
   </developers>
-
-
+  <modules>
+    <module>baiduads-sdk</module>
+    <module>baiduads-sdk-auto</module>
+    <module>baiduads-sdk-thirdparty</module>
+  </modules>
+  <scm>
+    <connection>scm:git:https://github.com/baidu/baiduads-sdk.git</connection>
+    <developerConnection>scm:git:https://github.com/baidu/baiduads-sdk.git</developerConnection>
+    <url>https://github.com/baidu/baiduads-sdk/tree/main/java</url>
+  </scm>
+  <distributionManagement>
+    <repository>
+      <id>ossrh</id>
+      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+    </repository>
+    <snapshotRepository>
+      <id>ossrh</id>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+    </snapshotRepository>
+  </distributionManagement>
   <properties>
-    <junit.version>4.12</junit.version>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.source>1.8</maven.compiler.source>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.target>1.8</maven.compiler.target>
+    <junit.version>4.12</junit.version>
   </properties>
-
-
   <dependencyManagement>
     <dependencies>
-      <dependency>
-        <groupId>org.projectlombok</groupId>
-        <artifactId>lombok</artifactId>
-        <version>1.18.20</version>
-      </dependency>
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
@@ -61,19 +57,6 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
-
-  <distributionManagement>
-    <snapshotRepository>
-      <id>ossrh</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-    </snapshotRepository>
-    <repository>
-      <id>ossrh</id>
-      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-    </repository>
-  </distributionManagement>
-
-
   <build>
     <plugins>
       <plugin>
@@ -89,7 +72,6 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
         <version>3.3.0</version>
         <executions>
@@ -102,7 +84,6 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-gpg-plugin</artifactId>
         <version>1.5</version>
         <executions>
@@ -115,7 +96,6 @@
           </execution>
         </executions>
         <configuration>
-          <!-- Prevent `gpg` from using pinentry programs -->
           <gpgArguments>
             <arg>--pinentry-mode</arg>
             <arg>loopback</arg>
@@ -130,25 +110,18 @@
         <configuration>
           <serverId>ossrh</serverId>
           <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-          <!--这个配置会在版本号不带SNAPSHOT的时候，指定release你的jar包到maven官方仓库-->
           <autoReleaseAfterClose>true</autoReleaseAfterClose>
         </configuration>
       </plugin>
-
       <plugin>
         <groupId>com.baidu.dev2</groupId>
         <artifactId>baiduads-sdk-package-maven-plugin</artifactId>
         <version>2022.0.0-SNAPSHOT</version>
       </plugin>
-
-
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-deploy-plugin</artifactId>
         <version>2.8.2</version>
       </plugin>
-
     </plugins>
   </build>
-
 </project>
diff --git a/python/baiduads-sdk-auto/baiduads/api_client.py b/python/baiduads-sdk-auto/baiduads/api_client.py
@@ -75,7 +75,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'baiduads-sdk/2022.0.0-SNAPSHOT/python'
+        self.user_agent = 'baiduads-sdk/2022.0.0/python'
 
     def __enter__(self):
         return self

diff --git a/python/baiduads-sdk-auto/baiduads/configuration.py b/python/baiduads-sdk-auto/baiduads/configuration.py
@@ -378,8 +378,8 @@ def to_debug_report(self):
         return "Python SDK Debug Report:\n"\
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
-               "Version of the API: 2022.0.0-SNAPSHOT\n"\
-               "SDK Package Version: 2022.0.0-SNAPSHOT".\
+               "Version of the API: 2022.0.0\n"\
+               "SDK Package Version: 2022.0.0".\
                format(env=sys.platform, pyversion=sys.version)
 
     def get_host_settings(self):

diff --git a/python/baiduads-sdk-auto/setup.py b/python/baiduads-sdk-auto/setup.py
@@ -9,7 +9,7 @@
 
 from setuptools import setup, find_packages  # noqa: H301
 
-NAME = "baiduads-sdk-auto-snapshot"
+NAME = "baiduads-sdk-auto"
 VERSION = "2022.0.0"
 # To install the library, run the following
 #

diff --git a/python/baiduads-sdk/requirements.txt b/python/baiduads-sdk/requirements.txt
@@ -1 +1 @@
-baiduads-sdk-auto-snapshot >= 2022.0.0
+baiduads-sdk-auto >= 2022.0.0
diff --git a/python/baiduads-sdk/setup.py b/python/baiduads-sdk/setup.py
@@ -4,7 +4,7 @@
 
 from setuptools import setup, find_packages  # noqa: H301
 
-NAME = "baiduads-sdk-snapshot"
+NAME = "baiduads-sdk"
 VERSION = "2022.0.0"
 # To install the library, run the following
 #