Skip to content

Commit

Permalink
Merge branch 'feat_1.12_directory' into 'feat_1.12_pluginMerge'
Browse files Browse the repository at this point in the history 
[feat-2742][all]Optimize the packaging directory

See merge request dt-insight-engine/flinkx!549
  • Loading branch information
@a49a
a49a committed Aug 18, 2021
2 parents d9c641a + 65db692 commit 0fc0611
Show file tree
Hide file tree
Showing 38 changed files with 193 additions and 195 deletions.
8 changes: 4 additions & 4 deletions flinkx-connectors/flinkx-connector-binlog/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,12 +176,12 @@
</goals>
<configuration>
<tasks>
<copy todir="${basedir}/../../${dist.dir}/binlog"
<copy todir="${basedir}/../../${dist.dir}/connector/binlog"
file="${basedir}/target/${project.artifactId}-${project.version}.jar"/>
<move file="${basedir}/../../${dist.dir}/binlog/${project.artifactId}-${project.version}.jar"
tofile="${basedir}/../../${dist.dir}/binlog/${project.artifactId}-${git.branch}.jar"/>
<move file="${basedir}/../../${dist.dir}/connector/binlog/${project.artifactId}-${project.version}.jar"
tofile="${basedir}/../../${dist.dir}/connector/binlog/${project.artifactId}-${git.branch}.jar"/>
<delete>
<fileset dir="${basedir}/../../${dist.dir}/binlog/"
<fileset dir="${basedir}/../../${dist.dir}/connector/binlog/"
includes="${project.artifactId}-*.jar"
excludes="${project.artifactId}-${git.branch}.jar"/>
</delete>
Expand Down
6 changes: 3 additions & 3 deletions flinkx-connectors/flinkx-connector-cassandra/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,15 @@
</goals>
<configuration>
<tasks>
<copy todir="${basedir}/../../${dist.dir}/cassandra">
<copy todir="${basedir}/../../${dist.dir}/connector/cassandra">
<fileset dir="target/">
<include name="${artifactId}-${project.version}.jar"/>
</fileset>
</copy>
<!--suppress UnresolvedMavenProperty -->
<move
file="${basedir}/../../${dist.dir}/cassandra/${artifactId}-${project.version}.jar"
tofile="${basedir}/../../${dist.dir}/cassandra/${artifactId}-${git.branch}.jar"/>
file="${basedir}/../../${dist.dir}/connector/cassandra/${artifactId}-${project.version}.jar"
tofile="${basedir}/../../${dist.dir}/connector/cassandra/${artifactId}-${git.branch}.jar"/>
</tasks>
</configuration>
</execution>
Expand Down
8 changes: 4 additions & 4 deletions flinkx-connectors/flinkx-connector-clickhouse/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@
</goals>
<configuration>
<tasks>
<copy todir="${basedir}/../../${dist.dir}/clickhouse/"
<copy todir="${basedir}/../../${dist.dir}/connector/clickhouse/"
file="${basedir}/target/${artifactId}-${project.version}.jar"/>
<move file="${basedir}/../../${dist.dir}/clickhouse/${artifactId}-${project.version}.jar"
tofile="${basedir}/../../${dist.dir}/clickhouse/${artifactId}-${git.branch}.jar"/>
<move file="${basedir}/../../${dist.dir}/connector/clickhouse/${artifactId}-${project.version}.jar"
tofile="${basedir}/../../${dist.dir}/connector/clickhouse/${artifactId}-${git.branch}.jar"/>
<delete>
<fileset dir="${basedir}/../../${dist.dir}/clickhouse/"
<fileset dir="${basedir}/../../${dist.dir}/connector/clickhouse/"
includes="${artifactId}-*.jar"
excludes="${artifactId}-${git.branch}.jar"/>
</delete>
Expand Down
8 changes: 4 additions & 4 deletions flinkx-connectors/flinkx-connector-db2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,12 @@
</goals>
<configuration>
<tasks>
<copy todir="${basedir}/../../${dist.dir}/db2/"
<copy todir="${basedir}/../../${dist.dir}/connector/db2/"
file="${basedir}/target/${project.artifactId}-${project.version}.jar"/>
<move file="${basedir}/../../${dist.dir}/db2/${project.artifactId}-${project.version}.jar"
tofile="${basedir}/../../${dist.dir}/db2/${project.artifactId}-${git.branch}.jar"/>
<move file="${basedir}/../../${dist.dir}/connector/db2/${project.artifactId}-${project.version}.jar"
tofile="${basedir}/../../${dist.dir}/connector/db2/${project.artifactId}-${git.branch}.jar"/>
<delete>
<fileset dir="${basedir}/../../${dist.dir}/db2/"
<fileset dir="${basedir}/../../${dist.dir}/connector/db2/"
includes="${project.artifactId}-*.jar"
excludes="${project.artifactId}-${git.branch}.jar"/>
</delete>
Expand Down
8 changes: 4 additions & 4 deletions flinkx-connectors/flinkx-connector-dm/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@
</goals>
<configuration>
<tasks>
<copy todir="${basedir}/../../${dist.dir}/dm/"
<copy todir="${basedir}/../../${dist.dir}/connector/dm/"
file="${basedir}/target/${project.artifactId}-${project.version}.jar"/>
<!--suppress UnresolvedMavenProperty -->
<move file="${basedir}/../../${dist.dir}/dm/${project.artifactId}-${project.version}.jar"
tofile="${basedir}/../../${dist.dir}/dm/${project.artifactId}-${git.branch}.jar"/>
<move file="${basedir}/../../${dist.dir}/connector/dm/${project.artifactId}-${project.version}.jar"
tofile="${basedir}/../../${dist.dir}/connector/dm/${project.artifactId}-${git.branch}.jar"/>
<delete>
<!--suppress UnresolvedMavenProperty -->
<fileset dir="${basedir}/../../${dist.dir}/dm/"
<fileset dir="${basedir}/../../${dist.dir}/connector/dm/"
includes="${project.artifactId}-*.jar"
excludes="${project.artifactId}-${git.branch}.jar"/>
</delete>
Expand Down
8 changes: 4 additions & 4 deletions flinkx-connectors/flinkx-connector-elasticsearch5/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,12 @@
</goals>
<configuration>
<tasks>
<copy todir="${basedir}/../../${dist.dir}/elasticsearch5/"
<copy todir="${basedir}/../../${dist.dir}/connector/elasticsearch5/"
file="${basedir}/target/${project.artifactId}-${project.version}.jar"/>
<move file="${basedir}/../../${dist.dir}/elasticsearch5/${project.artifactId}-${project.version}.jar"
tofile="${basedir}/../../${dist.dir}/elasticsearch5/${project.artifactId}-${git.branch}.jar"/>
<move file="${basedir}/../../${dist.dir}/connector/elasticsearch5/${project.artifactId}-${project.version}.jar"
tofile="${basedir}/../../${dist.dir}/connector/elasticsearch5/${project.artifactId}-${git.branch}.jar"/>
<delete>
<fileset dir="${basedir}/../../${dist.dir}/elasticsearch5/"
<fileset dir="${basedir}/../../${dist.dir}/connector/elasticsearch5/"
includes="${project.artifactId}-*.jar"
excludes="${project.artifactId}-${git.branch}.jar"/>
</delete>
Expand Down
8 changes: 4 additions & 4 deletions flinkx-connectors/flinkx-connector-elasticsearch6/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,12 @@
</goals>
<configuration>
<tasks>
<copy todir="${basedir}/../../${dist.dir}/es/"
<copy todir="${basedir}/../../${dist.dir}/connector/es/"
file="${basedir}/target/${project.artifactId}-${project.version}.jar"/>
<move file="${basedir}/../../${dist.dir}/es/${project.artifactId}-${project.version}.jar"
tofile="${basedir}/../../${dist.dir}/es/${project.artifactId}-${git.branch}.jar"/>
<move file="${basedir}/../../${dist.dir}/connector/es/${project.artifactId}-${project.version}.jar"
tofile="${basedir}/../../${dist.dir}/connector/es/${project.artifactId}-${git.branch}.jar"/>
<delete>
<fileset dir="${basedir}/../../${dist.dir}/es/"
<fileset dir="${basedir}/../../${dist.dir}/connector/es/"
includes="${project.artifactId}-*.jar"
excludes="${project.artifactId}-${git.branch}.jar"/>
</delete>
Expand Down
8 changes: 4 additions & 4 deletions flinkx-connectors/flinkx-connector-elasticsearch7/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,12 @@
</goals>
<configuration>
<tasks>
<copy todir="${basedir}/../../${dist.dir}/elasticsearch7/"
<copy todir="${basedir}/../../${dist.dir}/connector/elasticsearch7/"
file="${basedir}/target/${project.artifactId}-${project.version}.jar"/>
<move file="${basedir}/../../${dist.dir}/elasticsearch7/${project.artifactId}-${project.version}.jar"
tofile="${basedir}/../../${dist.dir}/elasticsearch7/${project.artifactId}-${git.branch}.jar"/>
<move file="${basedir}/../../${dist.dir}/connector/elasticsearch7/${project.artifactId}-${project.version}.jar"
tofile="${basedir}/../../${dist.dir}/connector/elasticsearch7/${project.artifactId}-${git.branch}.jar"/>
<delete>
<fileset dir="${basedir}/../../${dist.dir}/elasticsearch7/"
<fileset dir="${basedir}/../../${dist.dir}/connector/elasticsearch7/"
includes="${project.artifactId}-*.jar"
excludes="${project.artifactId}-${git.branch}.jar"/>
</delete>
Expand Down
8 changes: 4 additions & 4 deletions flinkx-connectors/flinkx-connector-emqx/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,12 @@
</goals>
<configuration>
<tasks>
<copy todir="${basedir}/../../${dist.dir}/emqx/"
<copy todir="${basedir}/../../${dist.dir}/connector/emqx/"
file="${basedir}/target/${project.artifactId}-${project.version}.jar"/>
<move file="${basedir}/../../${dist.dir}/emqx/${project.artifactId}-${project.version}.jar"
tofile="${basedir}/../../${dist.dir}/emqx/${project.artifactId}-${git.branch}.jar"/>
<move file="${basedir}/../../${dist.dir}/connector/emqx/${project.artifactId}-${project.version}.jar"
tofile="${basedir}/../../${dist.dir}/connector/emqx/${project.artifactId}-${git.branch}.jar"/>
<delete>
<fileset dir="${basedir}/../../${dist.dir}/emqx/"
<fileset dir="${basedir}/../../${dist.dir}/connector/emqx/"
includes="${project.artifactId}-*.jar"
excludes="${project.artifactId}-${git.branch}.jar"/>
</delete>
Expand Down
8 changes: 4 additions & 4 deletions flinkx-connectors/flinkx-connector-file/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ under the License.
</goals>
<configuration>
<tasks>
<copy todir="${basedir}/../../${dist.dir}/file/"
<copy todir="${basedir}/../../${dist.dir}/connector/file/"
file="${basedir}/target/${artifactId}-${project.version}.jar"/>
<move file="${basedir}/../../${dist.dir}/file/${artifactId}-${project.version}.jar"
tofile="${basedir}/../../${dist.dir}/file/${artifactId}-${git.branch}.jar"/>
<move file="${basedir}/../../${dist.dir}/connector/file/${artifactId}-${project.version}.jar"
tofile="${basedir}/../../${dist.dir}/connector/file/${artifactId}-${git.branch}.jar"/>
<delete>
<fileset dir="${basedir}/../../${dist.dir}/file/"
<fileset dir="${basedir}/../../${dist.dir}/connector/file/"
includes="${artifactId}-*.jar"
excludes="${artifactId}-${git.branch}.jar"/>
</delete>
Expand Down
8 changes: 4 additions & 4 deletions flinkx-connectors/flinkx-connector-ftp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,12 @@ under the License.
</goals>
<configuration>
<tasks>
<copy todir="${basedir}/../../${dist.dir}/ftp/"
<copy todir="${basedir}/../../${dist.dir}/connector/ftp/"
file="${basedir}/target/${artifactId}-${project.version}.jar"/>
<move file="${basedir}/../../${dist.dir}/ftp/${artifactId}-${project.version}.jar"
tofile="${basedir}/../../${dist.dir}/ftp/${artifactId}-${git.branch}.jar"/>
<move file="${basedir}/../../${dist.dir}/connector/ftp/${artifactId}-${project.version}.jar"
tofile="${basedir}/../../${dist.dir}/connector/ftp/${artifactId}-${git.branch}.jar"/>
<delete>
<fileset dir="${basedir}/../../${dist.dir}/ftp/"
<fileset dir="${basedir}/../../${dist.dir}/connector/ftp/"
includes="${artifactId}-*.jar"
excludes="${artifactId}-${git.branch}.jar"/>
</delete>
Expand Down
8 changes: 4 additions & 4 deletions flinkx-connectors/flinkx-connector-gbase/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@
</goals>
<configuration>
<tasks>
<copy todir="${basedir}/../../${dist.dir}/gbase/"
<copy todir="${basedir}/../../${dist.dir}/connector/gbase/"
file="${basedir}/target/${project.artifactId}-${project.version}.jar"/>
<!--suppress UnresolvedMavenProperty -->
<move file="${basedir}/../../${dist.dir}/gbase/${project.artifactId}-${project.version}.jar"
tofile="${basedir}/../../${dist.dir}/gbase/${project.artifactId}-${git.branch}.jar"/>
<move file="${basedir}/../../${dist.dir}/connector/gbase/${project.artifactId}-${project.version}.jar"
tofile="${basedir}/../../${dist.dir}/connector/gbase/${project.artifactId}-${git.branch}.jar"/>
<delete>
<!--suppress UnresolvedMavenProperty -->
<fileset dir="${basedir}/../../${dist.dir}/gbase/"
<fileset dir="${basedir}/../../${dist.dir}/connector/gbase/"
includes="${project.artifactId}-*.jar"
excludes="${project.artifactId}-${git.branch}.jar"/>
</delete>
Expand Down
8 changes: 4 additions & 4 deletions flinkx-connectors/flinkx-connector-greenplum/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,14 @@
</goals>
<configuration>
<tasks>
<copy todir="${basedir}/../../${dist.dir}/greenplum/"
<copy todir="${basedir}/../../${dist.dir}/connector/greenplum/"
file="${basedir}/target/${project.artifactId}-${project.version}.jar"/>
<!--suppress UnresolvedMavenProperty -->
<move file="${basedir}/../../${dist.dir}/greenplum/${project.artifactId}-${project.version}.jar"
tofile="${basedir}/../../${dist.dir}/greenplum/${project.artifactId}-${git.branch}.jar"/>
<move file="${basedir}/../../${dist.dir}/connector/greenplum/${project.artifactId}-${project.version}.jar"
tofile="${basedir}/../../${dist.dir}/connector/greenplum/${project.artifactId}-${git.branch}.jar"/>
<delete>
<!--suppress UnresolvedMavenProperty -->
<fileset dir="${basedir}/../../${dist.dir}/greenplum/"
<fileset dir="${basedir}/../../${dist.dir}/connector/greenplum/"
includes="${project.artifactId}-*.jar"
excludes="${project.artifactId}-${git.branch}.jar"/>
</delete>
Expand Down
16 changes: 8 additions & 8 deletions flinkx-connectors/flinkx-connector-hbase-1.4/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -306,23 +306,23 @@
<tasks>
<move file="${basedir}/target/hbase-1.4/original-${project.artifactId}-${project.version}.jar"
tofile="${basedir}/target/hbase-1.4/${project.artifactId}-${project.version}.jar"/>
<copy todir="${basedir}/../../${dist.dir}/hbase-1.4/"
<copy todir="${basedir}/../../${dist.dir}/connector/hbase-1.4/"
file="${basedir}/target/hbase-1.4/${project.artifactId}-${project.version}.jar"/>
<move file="${basedir}/../../${dist.dir}/hbase-1.4/${project.artifactId}-${project.version}.jar"
tofile="${basedir}/../../${dist.dir}/hbase-1.4/${project.artifactId}-${git.branch}.jar"/>
<move file="${basedir}/../../${dist.dir}/connector/hbase-1.4/${project.artifactId}-${project.version}.jar"
tofile="${basedir}/../../${dist.dir}/connector/hbase-1.4/${project.artifactId}-${git.branch}.jar"/>
<delete>
<fileset dir="${basedir}/../../${dist.dir}/hbase-1.4/"
<fileset dir="${basedir}/../../${dist.dir}/connector/hbase-1.4/"
includes="${project.artifactId}-*.jar"
excludes="${project.artifactId}-${git.branch}.jar"/>
</delete>
<move file="${basedir}/target/hbase-2.2/original-${project.artifactId}-${project.version}.jar"
tofile="${basedir}/target/hbase-2.2/${project.artifactId}-${project.version}.jar"/>
<copy todir="${basedir}/../../${dist.dir}/hbase-2.2/"
<copy todir="${basedir}/../../${dist.dir}/connector/hbase-2.2/"
file="${basedir}/target/hbase-2.2/${project.artifactId}-${project.version}.jar"/>
<move file="${basedir}/../../${dist.dir}/hbase-2.2/${project.artifactId}-${project.version}.jar"
tofile="${basedir}/../../${dist.dir}/hbase-2.2/${project.artifactId}-${git.branch}.jar"/>
<move file="${basedir}/../../${dist.dir}/connector/hbase-2.2/${project.artifactId}-${project.version}.jar"
tofile="${basedir}/../../${dist.dir}/connector/hbase-2.2/${project.artifactId}-${git.branch}.jar"/>
<delete>
<fileset dir="${basedir}/../../${dist.dir}/hbase-2.2/"
<fileset dir="${basedir}/../../${dist.dir}/connector/hbase-2.2/"
includes="${project.artifactId}-*.jar"
excludes="${project.artifactId}-${git.branch}.jar"/>
</delete>
Expand Down
8 changes: 4 additions & 4 deletions flinkx-connectors/flinkx-connector-hdfs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,14 +198,14 @@
</goals>
<configuration>
<tasks>
<copy todir="${basedir}/../../${dist.dir}/hdfs"
<copy todir="${basedir}/../../${dist.dir}/connector/hdfs"
file="${basedir}/target/${project.artifactId}-${project.version}.jar"/>
<!--suppress UnresolvedMavenProperty -->
<move file="${basedir}/../../${dist.dir}/hdfs/${project.artifactId}-${project.version}.jar"
tofile="${basedir}/../../${dist.dir}/hdfs/${project.artifactId}-${git.branch}.jar"/>
<move file="${basedir}/../../${dist.dir}/connector/hdfs/${project.artifactId}-${project.version}.jar"
tofile="${basedir}/../../${dist.dir}/connector/hdfs/${project.artifactId}-${git.branch}.jar"/>
<delete>
<!--suppress UnresolvedMavenProperty -->
<fileset dir="${basedir}/../../${dist.dir}/hdfs/"
<fileset dir="${basedir}/../../${dist.dir}/connector/hdfs/"
includes="${project.artifactId}-*.jar"
excludes="${project.artifactId}-${git.branch}.jar"/>
</delete>
Expand Down
8 changes: 4 additions & 4 deletions flinkx-connectors/flinkx-connector-hive/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -260,15 +260,15 @@
</goals>
<configuration>
<tasks>
<copy todir="${basedir}/../../${dist.dir}/hive"
<copy todir="${basedir}/../../${dist.dir}/connector/hive"
file="${basedir}/target/${project.artifactId}-${project.version}.jar"/>
<!--suppress UnresolvedMavenProperty -->
<move
file="${basedir}/../../${dist.dir}/hive/${project.artifactId}-${project.version}.jar"
tofile="${basedir}/../../${dist.dir}/hive/${project.artifactId}-${git.branch}.jar"/>
file="${basedir}/../../${dist.dir}/connector/hive/${project.artifactId}-${project.version}.jar"
tofile="${basedir}/../../${dist.dir}/connector/hive/${project.artifactId}-${git.branch}.jar"/>
<delete>
<!--suppress UnresolvedMavenProperty -->
<fileset dir="${basedir}/../../${dist.dir}/hive/"
<fileset dir="${basedir}/../../${dist.dir}/connector/hive/"
includes="${project.artifactId}-*.jar"
excludes="${project.artifactId}-${git.branch}.jar"/>
</delete>
Expand Down
16 changes: 8 additions & 8 deletions flinkx-connectors/flinkx-connector-kafka/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,22 +92,22 @@
</goals>
<configuration>
<tasks>
<copy todir="${basedir}/../../${dist.dir}/kafka"
<copy todir="${basedir}/../../${dist.dir}/connector/kafka"
file="${basedir}/target/${project.artifactId}-${project.version}.jar"/>
<move file="${basedir}/../../${dist.dir}/kafka/${project.artifactId}-${project.version}.jar"
tofile="${basedir}/../../${dist.dir}/kafka/${project.artifactId}-${git.branch}.jar"/>
<move file="${basedir}/../../${dist.dir}/connector/kafka/${project.artifactId}-${project.version}.jar"
tofile="${basedir}/../../${dist.dir}/connector/kafka/${project.artifactId}-${git.branch}.jar"/>
<delete>
<fileset dir="${basedir}/../../${dist.dir}/kafka/"
<fileset dir="${basedir}/../../${dist.dir}/connector/kafka/"
includes="${project.artifactId}-*.jar"
excludes="${project.artifactId}-${git.branch}.jar"/>
</delete>

<copy todir="${basedir}/../../${dist.dir}/upsert-kafka"
<copy todir="${basedir}/../../${dist.dir}/connector/upsert-kafka"
file="${basedir}/target/${project.artifactId}-${project.version}.jar"/>
<move file="${basedir}/../../${dist.dir}/upsert-kafka/${project.artifactId}-${project.version}.jar"
tofile="${basedir}/../../${dist.dir}/upsert-kafka/${project.artifactId}-${git.branch}.jar"/>
<move file="${basedir}/../../${dist.dir}/connector/upsert-kafka/${project.artifactId}-${project.version}.jar"
tofile="${basedir}/../../${dist.dir}/connector/upsert-kafka/${project.artifactId}-${git.branch}.jar"/>
<delete>
<fileset dir="${basedir}/../../${dist.dir}/upsert-kafka/"
<fileset dir="${basedir}/../../${dist.dir}/connector/upsert-kafka/"
includes="${project.artifactId}-*.jar"
excludes="${project.artifactId}-${git.branch}.jar"/>
</delete>
Expand Down
Loading

0 comments on commit 0fc0611

Please sign in to comment.