Merge pull request #9 from taosdata/3.0

merge to main

.github/workflows/release.yml

@@ -0,0 +1,30 @@
+name: Jar Release
+
+on:
+  pull_request:
+    branches: [ release ]
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        java: [ 8 ]
+        os: [ Ubuntu-20.04 ]
+        maven: [ '3.6.3' ]
+    runs-on: {{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 8
+        uses: actions/setup-java@v3
+        with:
+          java-version: {{ matrix.java }}
+          java-package: jdk
+          maven-version: {{ matrix.maven }}
+          distribution: 'temurin'
+          cache: maven
+      - name: Build with Maven
+        run: mvn -B package --file pom.xml -DskipTests
+
+      # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
+      - name: Update dependency graph
+        uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6

.github/workflows/version3.yml

@@ -0,0 +1,85 @@
+name: version3
+
+on:
+  push:
+    branches:
+      - main
+      - '3.0'
+    paths-ignore:
+      - 'LICENSE'
+      - '*.md'
+      - '*.txt'
+  pull_request:
+    branches:
+      - main
+      - '3.0'
+    paths-ignore:
+      - 'LICENSE'
+      - '*.md'
+      - '*.txt'
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        #        os: [ ubuntu-latest,macos-latest,windows-latest ]
+        os: [ Ubuntu-22.04 ]
+        java: [ 8 ]
+        maven: [ '3.6.3' ]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: checkout TDengine
+        uses: actions/checkout@v3
+        with:
+          repository: 'taosdata/TDengine'
+          path: 'TDengine'
+          ref: ${{ github.base_ref }}
+
+      - name: prepare install
+        run: | 
+          sudo apt-get install  -y libgeos-dev
+          geos-config --version
+     
+      - name: install TDengine
+        run: cd TDengine && mkdir debug && cd debug && cmake .. -DBUILD_JDBC=false -DBUILD_TOOLS=false -DBUILD_HTTP=false -DBUILD_DEPENDENCY_TESTS=false && make && sudo make install
+
+      - name: shell
+        run: |
+          cat >start.sh<<EOF 
+          ulimit -n 65535 && TAOS_SUPPORT_VNODES=256 taosd
+          EOF
+
+      - name: taosd
+        run: nohup sudo sh ./start.sh &
+
+      - name: start taosadapter
+        run: sudo taosadapter &
+
+      - name: checkout
+        uses: actions/checkout@v3
+
+      - name: set up java
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin' # See 'Supported distributions' for available options
+          java-version: ${{ matrix.java }}
+          java-package: jdk
+          maven-version: ${{ matrix.maven }}
+
+      - name: Test
+        env:
+          TDENGINE_CLOUD_URL: ${{ secrets.TDENGINE_CLOUD_URL }}
+        run: mvn -B clean verify --file pom.xml
+
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v4
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          files: target/site/jacoco/jacoco.xml
+          flags: unittests
+          name: codecov-umbrella
+          fail_ci_if_error: false
+          verbose: true
+
+
+

deploy-pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.taosdata.flink</groupId>
     <artifactId>flink-connector-tdengine</artifactId>
-    <version>1.0.1</version>
+    <version>2.0.0</version>
     <packaging>jar</packaging>
 
     <name>flink-connector-tdengine</name>
@@ -106,24 +106,32 @@
 
     <build>
         <plugins>
+<!--            <plugin>-->
+<!--                <groupId>org.apache.maven.plugins</groupId>-->
+<!--                <artifactId>maven-assembly-plugin</artifactId>-->
+<!--                <version>3.0.0</version>-->
+<!--                <configuration>-->
+<!--                    <descriptors>-->
+<!--                        <descriptor>src/main/assembly/assembly-jar.xml</descriptor>-->
+<!--                    </descriptors>-->
+<!--                </configuration>-->
+<!--                <executions>-->
+<!--                    <execution>-->
+<!--                        <id>make-assembly</id>-->
+<!--                        <phase>package</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>single</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--            </plugin>-->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.3.0</version>
                 <configuration>
-                    <descriptors>
-                        <descriptor>src/main/assembly/assembly-jar.xml</descriptor>
-                    </descriptors>
+                    <skipAssembly>true</skipAssembly>
                 </configuration>
-                <executions>
-                    <execution>
-                        <id>make-assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
 
             <plugin>