Update version to 1.1.0-SNAPSHOT

ambition119 · May 28, 2021 · 99090a3 · 99090a3
1 parent b7ccf90
commit 99090a3
Show file tree

Hide file tree

Showing 36 changed files with 175 additions and 344 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.streamxhub.streamx</groupId>
     <artifactId>streamx</artifactId>
-    <version>1.0.0</version>
+    <version>1.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>StreamX</name>
     <description>The flink and spark development scaffolding</description>
@@ -20,18 +20,4 @@
         <module>streamx-plugin</module>
     </modules>
 
-    <licenses>
-        <license>
-            <name>The Apache Software License, Version 2.0</name>
-            <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-
-    <scm>
-        <url>https://github.com/streamxhub/streamx</url>
-        <connection>[email protected]:streamxhub/streamx.git</connection>
-        <developerConnection>scm:git:ssh://[email protected]:streamxhub/streamx.git</developerConnection>
-    </scm>
-
 </project>
diff --git a/streamx-common/pom.xml b/streamx-common/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.streamxhub.streamx</groupId>
         <artifactId>streamx-parent</artifactId>
-        <version>1.0.0</version>
+        <version>1.1.0-SNAPSHOT</version>
         <relativePath>../streamx-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/streamx-console/pom.xml b/streamx-console/pom.xml
@@ -2,14 +2,12 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.streamxhub.streamx</groupId>
-        <artifactId>streamx-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath>../streamx-parent/pom.xml</relativePath>
-    </parent>
+    <groupId>com.streamxhub.streamx</groupId>
     <artifactId>streamx-console</artifactId>
+    <version>1.1.0-SNAPSHOT</version>
+
     <name>StreamX : Console Parent</name>
     <packaging>pom</packaging>
 

diff --git a/streamx-console/streamx-console-service/pom.xml b/streamx-console/streamx-console-service/pom.xml
@@ -9,7 +9,7 @@
         <relativePath/>
     </parent>
     <artifactId>streamx-console-service</artifactId>
-    <version>1.0.0</version>
+    <version>1.1.0-SNAPSHOT</version>
     <name>StreamX : Console Service</name>
 
     <!-- 定义统一版本号-->
@@ -291,7 +291,7 @@
         <dependency>
             <groupId>com.streamxhub.streamx</groupId>
             <artifactId>streamx-flink-repl</artifactId>
-            <version>1.0.0</version>
+            <version>${project.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
@@ -303,13 +303,13 @@
         <dependency>
             <groupId>com.streamxhub.streamx</groupId>
             <artifactId>streamx-flink-core</artifactId>
-            <version>1.0.0</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>com.streamxhub.streamx</groupId>
             <artifactId>streamx-flink-submit</artifactId>
-            <version>1.0.0</version>
+            <version>${project.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>ch.qos.logback</groupId>
@@ -325,20 +325,20 @@
         <dependency>
             <groupId>com.streamxhub.streamx</groupId>
             <artifactId>streamx-jvm-profiler</artifactId>
-            <version>1.0.0</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>com.streamxhub.streamx</groupId>
             <artifactId>streamx-flink-sqlclient</artifactId>
-            <version>1.0.0</version>
+            <version>${project.version}</version>
         </dependency>
 
         <!--以下依赖会自动隔离处理,针对flink1.12和flink1.13不同版本同时支持-->
         <dependency>
             <groupId>com.streamxhub.streamx</groupId>
             <artifactId>streamx-flink-shims_flink-1.12</artifactId>
-            <version>1.0.0</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
@@ -413,13 +413,13 @@
                         <dependency>
                             <groupId>com.streamxhub.streamx</groupId>
                             <artifactId>streamx-flink-shims_flink-1.12</artifactId>
-                            <version>1.0.0</version>
+                            <version>${project.version}</version>
                             <outputDirectory>${basedir}/src/assembly/shims/flink-1.12</outputDirectory>
                         </dependency>
                         <dependency>
                             <groupId>com.streamxhub.streamx</groupId>
                             <artifactId>streamx-flink-shims_flink-1.13</artifactId>
-                            <version>1.0.0</version>
+                            <version>${project.version}</version>
                             <outputDirectory>${basedir}/src/assembly/shims/flink-1.13</outputDirectory>
                         </dependency>
                     </artifactItems>

diff --git a/streamx-console/streamx-console-webapp/pom.xml b/streamx-console/streamx-console-webapp/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.streamxhub.streamx</groupId>
   <artifactId>streamx-console-webapp</artifactId>
-  <version>1.0.0</version>
+  <version>1.1.0-SNAPSHOT</version>
   <name>StreamX : Console Webapp</name>
 
   <properties>

diff --git a/streamx-flink/pom.xml b/streamx-flink/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.streamxhub.streamx</groupId>
         <artifactId>streamx-parent</artifactId>
-        <version>1.0.0</version>
+        <version>1.1.0-SNAPSHOT</version>
         <relativePath>../streamx-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/streamx-flink/streamx-flink-core/pom.xml b/streamx-flink/streamx-flink-core/pom.xml
@@ -3,13 +3,12 @@
          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">
     <modelVersion>4.0.0</modelVersion>
-
-
     <parent>
         <groupId>com.streamxhub.streamx</groupId>
         <artifactId>streamx-flink</artifactId>
-        <version>1.0.0</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
+
     <artifactId>streamx-flink-core</artifactId>
 
     <name>StreamX : Flink Core</name>
@@ -24,13 +23,13 @@
         <dependency>
             <groupId>com.streamxhub.streamx</groupId>
             <artifactId>streamx-common</artifactId>
-            <version>1.0.0</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>com.streamxhub.streamx</groupId>
             <artifactId>streamx-flink-shims_flink-1.12</artifactId>
-            <version>1.0.0</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
 

diff --git a/...ore/src/main/java/com/streamxhub/streamx/flink/core/java/function/HBaseQueryFunction.java b/...ore/src/main/java/com/streamxhub/streamx/flink/core/java/function/HBaseQueryFunction.java
@@ -32,8 +32,8 @@ public interface HBaseQueryFunction<T> extends Serializable {
     /**
      * 获取一个查询对象.
      *
-     * @param last
-     * @return
+     * @param last: last one
+     * @return HBaseQuery: HBaseQuery
      */
     HBaseQuery query(T last);
 }
diff --git a/...re/src/main/java/com/streamxhub/streamx/flink/core/java/function/HBaseResultFunction.java b/...re/src/main/java/com/streamxhub/streamx/flink/core/java/function/HBaseResultFunction.java
@@ -32,8 +32,8 @@ public interface HBaseResultFunction<T> extends Serializable {
     /**
      * 返回结合处理
      *
-     * @param result
-     * @return
+     * @param result Result
+     * @return T t
      */
     T result(Result result);
 }
diff --git a/...ore/src/main/java/com/streamxhub/streamx/flink/core/java/function/MongoQueryFunction.java b/...ore/src/main/java/com/streamxhub/streamx/flink/core/java/function/MongoQueryFunction.java
@@ -34,9 +34,9 @@ public interface MongoQueryFunction<T> {
     /**
      * 返回一个查询条件
      *
-     * @param last
-     * @param collection
-     * @return
+     * @param last: last one
+     * @param collection MongoCollection
+     * @return FindIterable
      */
     FindIterable<Document> query(T last, MongoCollection<Document> collection);
 

diff --git a/...re/src/main/java/com/streamxhub/streamx/flink/core/java/function/MongoResultFunction.java b/...re/src/main/java/com/streamxhub/streamx/flink/core/java/function/MongoResultFunction.java
@@ -32,8 +32,8 @@ public interface MongoResultFunction<T> {
     /**
      * 处理查询结果
      *
-     * @param cursor
-     * @return
+     * @param cursor: MongoCursor
+     * @return Iterable: Iterable
      */
     Iterable<T> result(MongoCursor<Document> cursor);
 

diff --git a/...k-core/src/main/java/com/streamxhub/streamx/flink/core/java/function/RunningFunction.java b/...k-core/src/main/java/com/streamxhub/streamx/flink/core/java/function/RunningFunction.java
@@ -30,7 +30,7 @@ public interface RunningFunction extends Serializable {
 
     /**
      * 是否running...
-     * @return
+     * @return Boolean: isRunning
      */
     Boolean running();
 }

diff --git a/...k-core/src/main/java/com/streamxhub/streamx/flink/core/java/function/SQLFromFunction.java b/...k-core/src/main/java/com/streamxhub/streamx/flink/core/java/function/SQLFromFunction.java
@@ -29,8 +29,8 @@
 @FunctionalInterface
 public interface SQLFromFunction<T> extends Serializable {
     /**
-     * @param bean
-     * @return
+     * @param bean: bean
+     * @return String: sql
      */
     String from(T bean);
 }
diff --git a/...-core/src/main/java/com/streamxhub/streamx/flink/core/java/function/SQLQueryFunction.java b/...-core/src/main/java/com/streamxhub/streamx/flink/core/java/function/SQLQueryFunction.java
@@ -31,8 +31,8 @@ public interface SQLQueryFunction<T> extends Serializable {
     /**
      * 获取要查询的SQL
      *
-     * @return
-     * @throws Exception
+     * @param last: last one
+     * @return String: sql
      */
     String query(T last) throws Exception;
 

diff --git a/...core/src/main/java/com/streamxhub/streamx/flink/core/java/function/SQLResultFunction.java b/...core/src/main/java/com/streamxhub/streamx/flink/core/java/function/SQLResultFunction.java
@@ -32,8 +32,8 @@ public interface SQLResultFunction<T> extends Serializable {
     /**
      * 将查下结果以Map的方式返回,用户去实现转成对象.
      *
-     * @param map
-     * @return
+     * @param map: sqlQuery result
+     * @return Iterable: Iterable
      */
     Iterable<T> result(Iterable<Map<String, ?>> map);
 }
diff --git a/...rc/main/java/com/streamxhub/streamx/flink/core/java/function/StreamEnvConfigFunction.java b/...rc/main/java/com/streamxhub/streamx/flink/core/java/function/StreamEnvConfigFunction.java
@@ -31,8 +31,8 @@ public interface StreamEnvConfigFunction {
     /**
      * 用于初始化StreamExecutionEnvironment的时候,用于可以实现该函数,自定义要设置的参数...
      *
-     * @param environment
-     * @param parameterTool
+     * @param environment: StreamExecutionEnvironment instance
+     * @param parameterTool: ParameterTool
      */
     void configuration(StreamExecutionEnvironment environment, ParameterTool parameterTool);
 

diff --git a/...src/main/java/com/streamxhub/streamx/flink/core/java/function/TableEnvConfigFunction.java b/...src/main/java/com/streamxhub/streamx/flink/core/java/function/TableEnvConfigFunction.java
@@ -31,8 +31,8 @@ public interface TableEnvConfigFunction {
     /**
      * 用于初始化TableEnvironment的时候,用于可以实现该函数,自定义要设置的参数...
      *
-     * @param tableConfig
-     * @param parameterTool
+     * @param tableConfig: flink tableConfig
+     * @param parameterTool: parameterTool
      */
     void configuration(TableConfig tableConfig, ParameterTool parameterTool);
 

diff --git a/...reamx-flink-core/src/main/java/com/streamxhub/streamx/flink/core/java/sink/KafkaSink.java b/...reamx-flink-core/src/main/java/com/streamxhub/streamx/flink/core/java/sink/KafkaSink.java
@@ -60,8 +60,8 @@ public KafkaSink<T> alias(String alias) {
     /**
      * 设置要下沉的topic
      *
-     * @param topic
-     * @return
+     * @param topic: topic name
+     * @return KafkaSink: KafkaSink instance
      */
     public KafkaSink<T> topic(String topic) {
         this.topic = topic;
@@ -71,8 +71,9 @@ public KafkaSink<T> topic(String topic) {
     /**
      * set SerializationSchema
      *
-     * @param serializer
-     * @return
+     * @param serializer: serializer
+     * @return KafkaSink: KafkaSink instance
+     *
      */
     public KafkaSink<T> serializer(SerializationSchema<T> serializer) {
         this.serializer = serializer;
@@ -82,9 +83,10 @@ public KafkaSink<T> serializer(SerializationSchema<T> serializer) {
     /**
      * set FlinkKafkaPartitioner
      *
-     * @param partitioner
-     * @return
-     */
+     * @param partitioner: FlinkKafkaPartitioner
+     * @return KafkaSink: KafkaSink
+     *
+     * */
     public KafkaSink<T> partitioner(FlinkKafkaPartitioner<T> partitioner) {
         this.partitioner = partitioner;
         return this;

diff --git a/...mx-flink-core/src/main/java/com/streamxhub/streamx/flink/core/java/source/JdbcSource.java b/...mx-flink-core/src/main/java/com/streamxhub/streamx/flink/core/java/source/JdbcSource.java
@@ -47,8 +47,8 @@ public JdbcSource(StreamingContext context) {
     /**
      * 允许手动指定一个jdbc的连接信息
      *
-     * @param jdbc
-     * @return
+     * @param jdbc: jdbc connection info
+     * @return JdbcSource: JdbcSource
      */
     public JdbcSource<T> jdbc(Properties jdbc) {
         this.jdbc = jdbc;

diff --git a/...x-flink-core/src/main/java/com/streamxhub/streamx/flink/core/java/wrapper/HBaseQuery.java b/...x-flink-core/src/main/java/com/streamxhub/streamx/flink/core/java/wrapper/HBaseQuery.java
@@ -44,7 +44,6 @@ public class HBaseQuery extends Scan implements Serializable {
     /**
      * @param table 要查询的Hbase table表名
      * @param scan  根据scan为查询条件进行查询
-     * @throws IOException
      */
     public HBaseQuery(String table, Scan scan) throws IOException {
         super(scan);
@@ -55,7 +54,6 @@ public HBaseQuery(String table, Scan scan) throws IOException {
     /**
      * @param table 要查询的Hbase table表名
      * @param get   根据get为查询条件进行查询
-     * @throws IOException
      */
     public HBaseQuery(String table, Get get) {
         super(get);

diff --git a/streamx-flink/streamx-flink-shims/pom.xml b/streamx-flink/streamx-flink-shims/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.streamxhub.streamx</groupId>
         <artifactId>streamx-flink</artifactId>
-        <version>1.0.0</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>streamx-flink-shims</artifactId>