diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 3220225ea..10e6d6ad1 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -4,8 +4,6 @@ name: Maven Package on: - release: - types: [ created ] push: tags: - '*' @@ -17,48 +15,87 @@ jobs: packages: write steps: + - uses: actions/checkout@v2 - - name: Import GPG key - id: import_gpg - uses: crazy-max/ghaction-import-gpg@v4 - with: - gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }} - passphrase: ${{ secrets.GPG_PASS_PHRASE }} - git-user-signingkey: true - git-commit-gpgsign: true - - name: Set up Maven + + - name: version + id: version + run: echo "::set-output name=version::$(git describe --tags --abbrev=1)" + # - name: 1. Import GPG key + # id: import_gpg + # uses: crazy-max/ghaction-import-gpg@v4 + # with: + # gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }} + # passphrase: ${{ secrets.GPG_PASS_PHRASE }} + # git-user-signingkey: true + # git-commit-gpgsign: true + + - name: 2. Set up Maven uses: stCarolas/setup-maven@v4 with: - maven-version: 3.5.4 - - name: Generate settings.xml for Maven Builds - uses: whelk-io/maven-settings-xml-action@v20 - with: - servers: > - [ - { - "id": "ossrh", - "username": "${{ secrets.OSSRH_USERNAME }}", - "password": "${{ secrets.OSSRH_PASSWORD }}" - }, - { - "id": "github", - "url": "https://maven.pkg.github.com/wgzhao/addax", - "releases": { - "enabled": "true" - }, - "snapshots": { - "enabled": "false" - }, - "username": "wgzhao", - "password": "${{ github.token }}" - } - ] - - name: Set up JDK + maven-version: 3.6.3 + + # - name: 3. Generate settings.xml for Maven Builds + # uses: whelk-io/maven-settings-xml-action@v20 + # with: + # servers: > + # [ + # { + # "id": "ossrh", + # "username": "${{ secrets.OSSRH_USERNAME }}", + # "password": "${{ secrets.OSSRH_PASSWORD }}" + # }, + # { + # "id": "github", + # "url": "https://maven.pkg.github.com/wgzhao/addax", + # "releases": { + # "enabled": "true" + # }, + # "snapshots": { + # "enabled": "false" + # }, + # "username": "wgzhao", + # "password": "${{ github.token }}" + # } + # ] + + - name: 4. Set up JDK uses: actions/setup-java@v2.3.1 with: java-version: '8' distribution: 'adopt' server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml settings-path: ${{ github.workspace }} # location for the settings.xml file - - run: mvn -B -V -T C1 -DskipTests deploy -Possrh + - name: 5. Build and packaging + run: | + mvn -B -V -T C1 -DskipTests clean package + mvn package assembly:single + bash shrink_package.sh + + - name: 6. Calucate SHA256SUM + run: | + cd target/addax + sha256sum addax-${{ steps.version.outputs.version }}.tar.gz > addax-${{ steps.version.outputs.version }}.tar.gz.sha256sum.asc + + - name: 7. Create release page + uses: actions/create-release@v1 + id: create_release + with: + draft: false + prerelease: false + release_name: ${{ steps.version.outputs.version }} + tag_name: ${{ github.ref }} + body_path: CHANGELOG.md + env: + GITHUB_TOKEN: ${{ secrets.TOKEN }} + + - name: 8. Upload to GitHub + uses: softprops/action-gh-release@v1 + if: startsWith(github.ref, 'refs/tags/') + with: + files: | + target/addax/addax-${{ steps.version.outputs.version }}.tar.gz + target/addax/addax-${{ steps.version.outputs.version }}.tar.gz.sha256sum.asc + env: + GITHUB_TOKEN: ${{ secrets.TOKEN }} \ No newline at end of file diff --git a/.github/workflows/mkdoc-latest.yml b/.github/workflows/mkdoc-latest.yml deleted file mode 100644 index c68382b79..000000000 --- a/.github/workflows/mkdoc-latest.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: mkdoc-latest -on: - push: - branches: - - master - -jobs: - deploy: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 - with: - python-version: 3.x - - run: pip install mkdocs-material mike - - name: Setup doc deploy - run: | - git config --global user.name Docs deploy - git config --global user.email docs@dummy.bot.com - - name: build docs - run: mike deploy develop latest - - name: Create redirect form old docs - run: | - git checkout gh-pages - test -f 404.html && echo "Redirect already set" && exit 0 - git checkout master -- 404.html - git add 404.html - git commit -m "chore: set docs redirect" --no-verify - git push origin gh-pages -f diff --git a/.github/workflows/mkdoc-release.yml b/.github/workflows/mkdoc-release.yml deleted file mode 100644 index 0bf64dec6..000000000 --- a/.github/workflows/mkdoc-release.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: mkdoc-release -on: - push: - tags: - - '*' -jobs: - deploy: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 - with: - python-version: 3.x - - run: pip install mkdocs-material mike - - name: Setup doc deploy - run: | - git config --global user.name Docs deploy - git config --global user.email docs@dummy.bot.com - - name: build docs - run: mike deploy $(git describe --abbrev=0 --tags) - - name: Create redirect form old docs - run: | - git checkout gh-pages - test -f 404.html && echo "Redirect already set" && exit 0 - git checkout master -- 404.html - git add 404.html - git commit -m "chore: set docs redirect" --no-verify - git push origin gh-pages -f diff --git a/common/pom.xml b/common/pom.xml index 71ea9abff..09c4c5747 100755 --- a/common/pom.xml +++ b/common/pom.xml @@ -3,7 +3,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT addax-common diff --git a/core/pom.xml b/core/pom.xml index dbb4ff65a..1a7c50248 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -3,7 +3,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT addax-core diff --git a/lib/addax-rdbms/pom.xml b/lib/addax-rdbms/pom.xml index 9b123416d..2b06f3323 100644 --- a/lib/addax-rdbms/pom.xml +++ b/lib/addax-rdbms/pom.xml @@ -3,7 +3,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../pom.xml diff --git a/lib/addax-storage/pom.xml b/lib/addax-storage/pom.xml index 7838b46ae..e0b1d7e4f 100644 --- a/lib/addax-storage/pom.xml +++ b/lib/addax-storage/pom.xml @@ -3,7 +3,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../pom.xml diff --git a/lib/addax-transformer/pom.xml b/lib/addax-transformer/pom.xml index 50995ab7f..0dde39047 100644 --- a/lib/addax-transformer/pom.xml +++ b/lib/addax-transformer/pom.xml @@ -3,7 +3,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../pom.xml diff --git a/plugin/reader/cassandrareader/pom.xml b/plugin/reader/cassandrareader/pom.xml index e65964960..507688396 100644 --- a/plugin/reader/cassandrareader/pom.xml +++ b/plugin/reader/cassandrareader/pom.xml @@ -4,7 +4,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml diff --git a/plugin/reader/clickhousereader/pom.xml b/plugin/reader/clickhousereader/pom.xml index c9573e96d..89bad972b 100644 --- a/plugin/reader/clickhousereader/pom.xml +++ b/plugin/reader/clickhousereader/pom.xml @@ -4,7 +4,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml clickhousereader diff --git a/plugin/reader/datareader/pom.xml b/plugin/reader/datareader/pom.xml index 034bffc20..4b3c901e8 100644 --- a/plugin/reader/datareader/pom.xml +++ b/plugin/reader/datareader/pom.xml @@ -5,7 +5,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml diff --git a/plugin/reader/dbfreader/pom.xml b/plugin/reader/dbfreader/pom.xml index e77fa9bca..d05929655 100644 --- a/plugin/reader/dbfreader/pom.xml +++ b/plugin/reader/dbfreader/pom.xml @@ -3,7 +3,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml dbfreader @@ -21,7 +21,7 @@ com.wgzhao.addax addax-storage - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT diff --git a/plugin/reader/elasticsearchreader/pom.xml b/plugin/reader/elasticsearchreader/pom.xml index 8305629fe..283527903 100644 --- a/plugin/reader/elasticsearchreader/pom.xml +++ b/plugin/reader/elasticsearchreader/pom.xml @@ -4,7 +4,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml elasticsearchreader diff --git a/plugin/reader/excelreader/pom.xml b/plugin/reader/excelreader/pom.xml index 2ba8d429f..50dca8965 100644 --- a/plugin/reader/excelreader/pom.xml +++ b/plugin/reader/excelreader/pom.xml @@ -4,7 +4,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml excelreader diff --git a/plugin/reader/ftpreader/pom.xml b/plugin/reader/ftpreader/pom.xml index c94c6eb47..7961146a0 100644 --- a/plugin/reader/ftpreader/pom.xml +++ b/plugin/reader/ftpreader/pom.xml @@ -3,7 +3,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml ftpreader diff --git a/plugin/reader/hbase11xreader/pom.xml b/plugin/reader/hbase11xreader/pom.xml index 5ba9a9583..0ec7b3ee7 100644 --- a/plugin/reader/hbase11xreader/pom.xml +++ b/plugin/reader/hbase11xreader/pom.xml @@ -3,7 +3,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml hbase11xreader diff --git a/plugin/reader/hbase11xsqlreader/pom.xml b/plugin/reader/hbase11xsqlreader/pom.xml index 82b16b430..1a61f526a 100644 --- a/plugin/reader/hbase11xsqlreader/pom.xml +++ b/plugin/reader/hbase11xsqlreader/pom.xml @@ -3,7 +3,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml hbase11xsqlreader diff --git a/plugin/reader/hbase20xreader/pom.xml b/plugin/reader/hbase20xreader/pom.xml index 1db061f90..6431c8eb8 100644 --- a/plugin/reader/hbase20xreader/pom.xml +++ b/plugin/reader/hbase20xreader/pom.xml @@ -3,7 +3,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml hbase20xreader diff --git a/plugin/reader/hbase20xsqlreader/pom.xml b/plugin/reader/hbase20xsqlreader/pom.xml index c9a2d6dd7..893fd1a19 100644 --- a/plugin/reader/hbase20xsqlreader/pom.xml +++ b/plugin/reader/hbase20xsqlreader/pom.xml @@ -6,7 +6,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml diff --git a/plugin/reader/hdfsreader/pom.xml b/plugin/reader/hdfsreader/pom.xml index ac419237d..04862b6c2 100644 --- a/plugin/reader/hdfsreader/pom.xml +++ b/plugin/reader/hdfsreader/pom.xml @@ -6,7 +6,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml @@ -34,7 +34,7 @@ - io.prestosql.hadoop + io.trino.hadoop hadoop-apache ${hadoop.version} @@ -50,7 +50,13 @@ - io.prestosql.hive + com.google.guava + guava + ${guava.version} + + + + io.trino.hive hive-apache ${hive.version} @@ -62,36 +68,21 @@ com.google.guava guava - - - - - org.apache.avro - avro - 1.10.2 - - slf4j-api - org.slf4j + org.apache.avro + parquet-avro + - org.apache.parquet - parquet-avro - 1.12.2 - - - com.google.guava - guava - - - slf4j-api - org.slf4j - - + org.xerial.snappy + snappy-java + 1.1.8.4 + + diff --git a/plugin/reader/hdfsreader/src/main/java/com/wgzhao/addax/plugin/reader/hdfsreader/DFSUtil.java b/plugin/reader/hdfsreader/src/main/java/com/wgzhao/addax/plugin/reader/hdfsreader/DFSUtil.java index 51fafb28c..921f57343 100644 --- a/plugin/reader/hdfsreader/src/main/java/com/wgzhao/addax/plugin/reader/hdfsreader/DFSUtil.java +++ b/plugin/reader/hdfsreader/src/main/java/com/wgzhao/addax/plugin/reader/hdfsreader/DFSUtil.java @@ -21,6 +21,8 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.google.common.primitives.Ints; +import com.google.common.primitives.Longs; import com.wgzhao.addax.common.base.Key; import com.wgzhao.addax.common.element.BoolColumn; import com.wgzhao.addax.common.element.BytesColumn; @@ -71,6 +73,7 @@ import org.apache.parquet.example.data.Group; import org.apache.parquet.hadoop.ParquetReader; import org.apache.parquet.hadoop.example.GroupReadSupport; +import org.apache.parquet.io.api.Binary; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -85,6 +88,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import java.util.concurrent.TimeUnit; import static com.wgzhao.addax.common.base.Key.COLUMN; import static com.wgzhao.addax.common.base.Key.NULL_FORMAT; @@ -94,6 +98,12 @@ */ public class DFSUtil { + + // the offset of julian, 2440588 is 1970/1/1 + private static final int JULIAN_EPOCH_OFFSET_DAYS = 2440588; + private static final long MILLIS_IN_DAY = TimeUnit.DAYS.toMillis(1); + private static final long NANOS_PER_MILLISECOND = TimeUnit.MILLISECONDS.toNanos(1); + public static final String HDFS_DEFAULT_KEY = "fs.defaultFS"; public static final String HADOOP_SECURITY_AUTHENTICATION_KEY = "hadoop.security.authentication"; private static final Logger LOG = LoggerFactory.getLogger(DFSUtil.class); @@ -463,6 +473,7 @@ public void parquetFileStartRead(String sourceParquestFilePath, Configuration re boolean isReadAllColumns = null == column || column.isEmpty(); // 判断是否读取所有列 + hadoopConf.set("parquet.avro.readInt96AsFixed", "true"); JobConf conf = new JobConf(hadoopConf); GenericData decimalSupport = new GenericData(); @@ -492,7 +503,8 @@ public void parquetFileStartRead(String sourceParquestFilePath, Configuration re stype = type.getProp("logicalType") != null ? type.getProp("logicalType") : type.getType().getName(); if (stype.startsWith("timestamp")) { columnEntry.setType("timestamp"); - } else{ + } + else { columnEntry.setType(stype); } column.add(columnEntry); @@ -569,7 +581,8 @@ private void transportOneRecord(List columnConfigs, GenericData.Rec case DECIMAL: if (null == columnValue) { columnGenerated = new DoubleColumn((Double) null); - } else { + } + else { columnGenerated = new DoubleColumn(new BigDecimal(columnValue).setScale(scale, BigDecimal.ROUND_HALF_UP)); } break; @@ -599,6 +612,12 @@ private void transportOneRecord(List columnConfigs, GenericData.Rec if (null == columnValue) { columnGenerated = new DateColumn(); } + else if (columnValue.startsWith("[")) { + // INT96 https://github.com/apache/parquet-mr/pull/901 + GenericData.Fixed fixed = (GenericData.Fixed) gRecord.get(columnIndex); + Date date = new Date(getTimestampMills(fixed.bytes())); + columnGenerated = new DateColumn(date); + } else { columnGenerated = new DateColumn(Long.parseLong(columnValue) * 1000); } @@ -766,7 +785,7 @@ private boolean isRCFile(String filepath, FSDataInputStream in) // the version that was included with the original magic, which is mapped // into ORIGINAL_VERSION final byte ORIGINAL_MAGIC_VERSION_WITH_METADATA = 6; - // All of the versions should be place in this list. + // All the versions should be place in this list. final int ORIGINAL_VERSION = 0; // version with SEQ // version with RCF // final int NEW_MAGIC_VERSION = 1 @@ -857,6 +876,37 @@ private boolean isParquetFile(Path file, FSDataInputStream in) return false; } + /** + * Returns GMT's timestamp from binary encoded parquet timestamp (12 bytes - julian date + time of day nanos). + * + * @param timestampBinary INT96 parquet timestamp + * @return timestamp in millis, GMT timezone + */ + public static long getTimestampMillis(Binary timestampBinary) + { + if (timestampBinary.length() != 12) { + return 0; + } + byte[] bytes = timestampBinary.getBytes(); + + return getTimestampMills(bytes); + } + + public static long getTimestampMills(byte[] bytes) + { + assert bytes.length == 12; + // little endian encoding - need to invert byte order + long timeOfDayNanos = Longs.fromBytes(bytes[7], bytes[6], bytes[5], bytes[4], bytes[3], bytes[2], bytes[1], bytes[0]); + int julianDay = Ints.fromBytes(bytes[11], bytes[10], bytes[9], bytes[8]); + + return julianDayToMillis(julianDay) + (timeOfDayNanos / NANOS_PER_MILLISECOND); + } + + private static long julianDayToMillis(int julianDay) + { + return (julianDay - JULIAN_EPOCH_OFFSET_DAYS) * MILLIS_IN_DAY; + } + private enum Type { INT, STRING, LONG, BOOLEAN, DOUBLE, DATE, BINARY, TIMESTAMP, DECIMAL, diff --git a/plugin/reader/hivereader/pom.xml b/plugin/reader/hivereader/pom.xml index 8635bd18b..ad0ca1b7c 100644 --- a/plugin/reader/hivereader/pom.xml +++ b/plugin/reader/hivereader/pom.xml @@ -4,7 +4,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml hivereader diff --git a/plugin/reader/httpreader/pom.xml b/plugin/reader/httpreader/pom.xml index 01a760aee..d3c78202f 100644 --- a/plugin/reader/httpreader/pom.xml +++ b/plugin/reader/httpreader/pom.xml @@ -3,7 +3,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml httpreader diff --git a/plugin/reader/influxdb2reader/pom.xml b/plugin/reader/influxdb2reader/pom.xml index ea47861d7..77b2ffb57 100644 --- a/plugin/reader/influxdb2reader/pom.xml +++ b/plugin/reader/influxdb2reader/pom.xml @@ -22,7 +22,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml influxdb2reader diff --git a/plugin/reader/influxdbreader/pom.xml b/plugin/reader/influxdbreader/pom.xml index 26576c019..268dfb190 100644 --- a/plugin/reader/influxdbreader/pom.xml +++ b/plugin/reader/influxdbreader/pom.xml @@ -22,7 +22,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml influxdbreader diff --git a/plugin/reader/jsonfilereader/pom.xml b/plugin/reader/jsonfilereader/pom.xml index a534070a9..f9c286751 100644 --- a/plugin/reader/jsonfilereader/pom.xml +++ b/plugin/reader/jsonfilereader/pom.xml @@ -3,7 +3,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml jsonfilereader diff --git a/plugin/reader/kudureader/pom.xml b/plugin/reader/kudureader/pom.xml index 8d294c57e..c9599eb46 100644 --- a/plugin/reader/kudureader/pom.xml +++ b/plugin/reader/kudureader/pom.xml @@ -4,7 +4,7 @@ addax-all com.wgzhao.addax - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml diff --git a/plugin/reader/mongodbreader/pom.xml b/plugin/reader/mongodbreader/pom.xml index b74ac5329..aca63f41b 100644 --- a/plugin/reader/mongodbreader/pom.xml +++ b/plugin/reader/mongodbreader/pom.xml @@ -5,7 +5,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml diff --git a/plugin/reader/mysqlreader/pom.xml b/plugin/reader/mysqlreader/pom.xml index 45b00d6ba..6a0999511 100644 --- a/plugin/reader/mysqlreader/pom.xml +++ b/plugin/reader/mysqlreader/pom.xml @@ -4,7 +4,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml mysqlreader diff --git a/plugin/reader/oraclereader/pom.xml b/plugin/reader/oraclereader/pom.xml index 476860c96..33e30dce2 100644 --- a/plugin/reader/oraclereader/pom.xml +++ b/plugin/reader/oraclereader/pom.xml @@ -4,7 +4,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml diff --git a/plugin/reader/postgresqlreader/pom.xml b/plugin/reader/postgresqlreader/pom.xml index 0d984c8f3..681346654 100644 --- a/plugin/reader/postgresqlreader/pom.xml +++ b/plugin/reader/postgresqlreader/pom.xml @@ -6,7 +6,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml diff --git a/plugin/reader/rdbmsreader/pom.xml b/plugin/reader/rdbmsreader/pom.xml index e1bbf5024..07c818a54 100644 --- a/plugin/reader/rdbmsreader/pom.xml +++ b/plugin/reader/rdbmsreader/pom.xml @@ -4,7 +4,7 @@ addax-all com.wgzhao.addax - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml diff --git a/plugin/reader/redisreader/pom.xml b/plugin/reader/redisreader/pom.xml index 099e64308..8a18c6b2e 100644 --- a/plugin/reader/redisreader/pom.xml +++ b/plugin/reader/redisreader/pom.xml @@ -5,7 +5,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml diff --git a/plugin/reader/sqlitereader/pom.xml b/plugin/reader/sqlitereader/pom.xml index bf5af1531..79e897421 100644 --- a/plugin/reader/sqlitereader/pom.xml +++ b/plugin/reader/sqlitereader/pom.xml @@ -4,7 +4,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml sqlitereader diff --git a/plugin/reader/sqlserverreader/pom.xml b/plugin/reader/sqlserverreader/pom.xml index b0e60b4fa..ecfa40395 100644 --- a/plugin/reader/sqlserverreader/pom.xml +++ b/plugin/reader/sqlserverreader/pom.xml @@ -3,7 +3,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml diff --git a/plugin/reader/streamreader/pom.xml b/plugin/reader/streamreader/pom.xml index 7b31208cb..b8302d75f 100644 --- a/plugin/reader/streamreader/pom.xml +++ b/plugin/reader/streamreader/pom.xml @@ -5,7 +5,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml diff --git a/plugin/reader/tdenginereader/pom.xml b/plugin/reader/tdenginereader/pom.xml index c8f3f6e70..3039eb6ad 100644 --- a/plugin/reader/tdenginereader/pom.xml +++ b/plugin/reader/tdenginereader/pom.xml @@ -4,7 +4,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml tdenginereader diff --git a/plugin/reader/txtfilereader/pom.xml b/plugin/reader/txtfilereader/pom.xml index 168b2b03e..09089ea0e 100644 --- a/plugin/reader/txtfilereader/pom.xml +++ b/plugin/reader/txtfilereader/pom.xml @@ -4,7 +4,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml diff --git a/plugin/writer/cassandrawriter/pom.xml b/plugin/writer/cassandrawriter/pom.xml index f0485c3dc..4305c3355 100644 --- a/plugin/writer/cassandrawriter/pom.xml +++ b/plugin/writer/cassandrawriter/pom.xml @@ -4,7 +4,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml diff --git a/plugin/writer/clickhousewriter/pom.xml b/plugin/writer/clickhousewriter/pom.xml index d7282082d..e7b870489 100644 --- a/plugin/writer/clickhousewriter/pom.xml +++ b/plugin/writer/clickhousewriter/pom.xml @@ -4,7 +4,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml diff --git a/plugin/writer/dbfwriter/pom.xml b/plugin/writer/dbfwriter/pom.xml index 0db2f05fd..76f613202 100644 --- a/plugin/writer/dbfwriter/pom.xml +++ b/plugin/writer/dbfwriter/pom.xml @@ -3,7 +3,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml diff --git a/plugin/writer/doriswriter/pom.xml b/plugin/writer/doriswriter/pom.xml index 24fcb13af..2e2fde9ab 100644 --- a/plugin/writer/doriswriter/pom.xml +++ b/plugin/writer/doriswriter/pom.xml @@ -4,7 +4,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml doriswriter diff --git a/plugin/writer/elasticsearchwriter/pom.xml b/plugin/writer/elasticsearchwriter/pom.xml index 6b2beae5a..e29a2acea 100644 --- a/plugin/writer/elasticsearchwriter/pom.xml +++ b/plugin/writer/elasticsearchwriter/pom.xml @@ -5,7 +5,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml diff --git a/plugin/writer/excelwriter/pom.xml b/plugin/writer/excelwriter/pom.xml index 0e7874088..0cc9ce146 100644 --- a/plugin/writer/excelwriter/pom.xml +++ b/plugin/writer/excelwriter/pom.xml @@ -4,7 +4,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml excelwriter diff --git a/plugin/writer/ftpwriter/pom.xml b/plugin/writer/ftpwriter/pom.xml index ebeb8d3b6..2c70c9530 100644 --- a/plugin/writer/ftpwriter/pom.xml +++ b/plugin/writer/ftpwriter/pom.xml @@ -3,7 +3,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml ftpwriter diff --git a/plugin/writer/greenplumwriter/pom.xml b/plugin/writer/greenplumwriter/pom.xml index 51e23deb8..6bdab1aea 100755 --- a/plugin/writer/greenplumwriter/pom.xml +++ b/plugin/writer/greenplumwriter/pom.xml @@ -3,7 +3,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml diff --git a/plugin/writer/hbase11xsqlwriter/pom.xml b/plugin/writer/hbase11xsqlwriter/pom.xml index f7e7dbd6c..c92ae9cca 100644 --- a/plugin/writer/hbase11xsqlwriter/pom.xml +++ b/plugin/writer/hbase11xsqlwriter/pom.xml @@ -4,7 +4,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml diff --git a/plugin/writer/hbase11xwriter/pom.xml b/plugin/writer/hbase11xwriter/pom.xml index 47ee9a686..78a5cba8d 100644 --- a/plugin/writer/hbase11xwriter/pom.xml +++ b/plugin/writer/hbase11xwriter/pom.xml @@ -4,7 +4,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml diff --git a/plugin/writer/hbase20xsqlwriter/pom.xml b/plugin/writer/hbase20xsqlwriter/pom.xml index d6aab02ec..2ecc763c9 100644 --- a/plugin/writer/hbase20xsqlwriter/pom.xml +++ b/plugin/writer/hbase20xsqlwriter/pom.xml @@ -4,7 +4,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml diff --git a/plugin/writer/hdfswriter/pom.xml b/plugin/writer/hdfswriter/pom.xml index 0e3c5bd56..646d633c1 100644 --- a/plugin/writer/hdfswriter/pom.xml +++ b/plugin/writer/hdfswriter/pom.xml @@ -6,7 +6,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml diff --git a/plugin/writer/influxdb2writer/pom.xml b/plugin/writer/influxdb2writer/pom.xml index 2277a71e7..51e7f8c0e 100644 --- a/plugin/writer/influxdb2writer/pom.xml +++ b/plugin/writer/influxdb2writer/pom.xml @@ -22,7 +22,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml influxdb2writer diff --git a/plugin/writer/influxdbwriter/pom.xml b/plugin/writer/influxdbwriter/pom.xml index 49626d53d..11f9ddc5b 100644 --- a/plugin/writer/influxdbwriter/pom.xml +++ b/plugin/writer/influxdbwriter/pom.xml @@ -4,7 +4,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml influxdbwriter diff --git a/plugin/writer/kuduwriter/pom.xml b/plugin/writer/kuduwriter/pom.xml index e3ffe36a2..9c6c167c4 100644 --- a/plugin/writer/kuduwriter/pom.xml +++ b/plugin/writer/kuduwriter/pom.xml @@ -4,7 +4,7 @@ addax-all com.wgzhao.addax - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml diff --git a/plugin/writer/mongodbwriter/pom.xml b/plugin/writer/mongodbwriter/pom.xml index 172454784..5d1edd7c0 100644 --- a/plugin/writer/mongodbwriter/pom.xml +++ b/plugin/writer/mongodbwriter/pom.xml @@ -6,7 +6,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml diff --git a/plugin/writer/mysqlwriter/pom.xml b/plugin/writer/mysqlwriter/pom.xml index 2634af09d..0d3e34c07 100644 --- a/plugin/writer/mysqlwriter/pom.xml +++ b/plugin/writer/mysqlwriter/pom.xml @@ -3,7 +3,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml mysqlwriter diff --git a/plugin/writer/oraclewriter/pom.xml b/plugin/writer/oraclewriter/pom.xml index e7c9df788..320e24c46 100644 --- a/plugin/writer/oraclewriter/pom.xml +++ b/plugin/writer/oraclewriter/pom.xml @@ -4,7 +4,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml diff --git a/plugin/writer/postgresqlwriter/pom.xml b/plugin/writer/postgresqlwriter/pom.xml index ee7df8a3f..e8c7a3802 100644 --- a/plugin/writer/postgresqlwriter/pom.xml +++ b/plugin/writer/postgresqlwriter/pom.xml @@ -5,7 +5,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml diff --git a/plugin/writer/rdbmswriter/pom.xml b/plugin/writer/rdbmswriter/pom.xml index b981a499e..c73af9ff4 100644 --- a/plugin/writer/rdbmswriter/pom.xml +++ b/plugin/writer/rdbmswriter/pom.xml @@ -6,7 +6,7 @@ addax-all com.wgzhao.addax - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml diff --git a/plugin/writer/rediswriter/pom.xml b/plugin/writer/rediswriter/pom.xml index 50a336aa7..12fca195d 100644 --- a/plugin/writer/rediswriter/pom.xml +++ b/plugin/writer/rediswriter/pom.xml @@ -4,7 +4,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml diff --git a/plugin/writer/sqlitewriter/pom.xml b/plugin/writer/sqlitewriter/pom.xml index 5e2abf08b..6079d6d1e 100644 --- a/plugin/writer/sqlitewriter/pom.xml +++ b/plugin/writer/sqlitewriter/pom.xml @@ -3,7 +3,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml sqlitewriter diff --git a/plugin/writer/sqlserverwriter/pom.xml b/plugin/writer/sqlserverwriter/pom.xml index 055cd5789..1bd259f52 100644 --- a/plugin/writer/sqlserverwriter/pom.xml +++ b/plugin/writer/sqlserverwriter/pom.xml @@ -4,7 +4,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml diff --git a/plugin/writer/streamwriter/pom.xml b/plugin/writer/streamwriter/pom.xml index 46f5a3b87..bb52d0362 100644 --- a/plugin/writer/streamwriter/pom.xml +++ b/plugin/writer/streamwriter/pom.xml @@ -5,7 +5,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml diff --git a/plugin/writer/tdenginewriter/pom.xml b/plugin/writer/tdenginewriter/pom.xml index 7177ed91e..367a65e41 100644 --- a/plugin/writer/tdenginewriter/pom.xml +++ b/plugin/writer/tdenginewriter/pom.xml @@ -3,7 +3,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml tdenginewriter diff --git a/plugin/writer/txtfilewriter/pom.xml b/plugin/writer/txtfilewriter/pom.xml index 3936cb7f2..f8a33290a 100644 --- a/plugin/writer/txtfilewriter/pom.xml +++ b/plugin/writer/txtfilewriter/pom.xml @@ -5,7 +5,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT ../../../pom.xml diff --git a/pom.xml b/pom.xml index 100468872..2a9b517b2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.wgzhao.addax addax-all - 4.0.6-SNAPSHOT + 4.0.7-SNAPSHOT addax-all Addax generic ETL tool @@ -51,9 +51,9 @@ 3.11.0 0.3.0 - 3.1.2-1 + 3.1.2-16 2.22 - 3.2.0-9 + 3.2.0-14 3.12.9 8.0.16 9.2.1.jre8