add reversion support

datavane · Jun 28, 2023 · b1d4ce8 · b1d4ce8
1 parent c1262ff
commit b1d4ce8
Show file tree

Hide file tree

Showing 28 changed files with 39 additions and 213 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,7 @@
 **/src/main/webapp/WEB-INF/classes
 **/.settings
 **/.classpath
+**/.flattened-pom.xml
 **/.project
 **/*.tar.gz
 **/tree.txt

diff --git a/datax-config/pom.xml b/datax-config/pom.xml
@@ -6,7 +6,7 @@
  <parent>
  <groupId>com.qlangtech.tis</groupId>
  <artifactId>tis</artifactId>
- <version>3.8.0</version>
+ <version>${revision}</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
 

diff --git a/deploy.bat b/deploy.bat
diff --git a/deploy.sh b/deploy.sh
@@ -0,0 +1,4 @@
+# maven build default command
+mvn clean deploy -Dmaven.test.skip=true -Dautoconfig.skip -pl tis-plugin,maven-tpi-plugin,tis-sql-parser,tis-web-start,tis-logback-flume-parent -am -Ptis-repo
+
+
diff --git a/maven-tpi-plugin/pom.xml b/maven-tpi-plugin/pom.xml
@@ -22,7 +22,7 @@
  <parent>
  <groupId>com.qlangtech.tis</groupId>
  <artifactId>tis</artifactId>
- <version>3.8.0</version>
+ <version>${revision}</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
 

diff --git a/pom.xml b/pom.xml
@@ -25,17 +25,18 @@
  <parent>
  <groupId>com.qlangtech.tis</groupId>
  <artifactId>tis-parent</artifactId>
- <version>1.1.0</version>
+ <version>2.0.3</version>
  </parent>
 
  <groupId>com.qlangtech.tis</groupId>
  <artifactId>tis</artifactId>
  <!--https://maven.apache.org/maven-ci-friendly.html-->
- <version>3.8.0</version>
+ <version>${revision}</version>
  <packaging>pom</packaging>
  <name>tis</name>
  <url>http:https://maven.apache.org</url>
  <properties>
+ <revision>3.8.0</revision>
  <testcontainers.version>1.15.3</testcontainers.version>
  <flink.version>tis-1.13.1</flink.version>
  <alibaba.datax.version>${project.version}</alibaba.datax.version>
@@ -88,7 +89,7 @@
  <!-- <module>tis-scala-compiler-dependencies</module>-->
 
  <module>maven-tpi-plugin</module>
-<!-- <module>tis-datax-executor</module>-->
+ <!-- <module>tis-datax-executor</module>-->
  <!-- <module>tis-zeppelin</module>-->
 
 
@@ -573,105 +574,6 @@
  </dependency>
 
 
- <!-- <dependency>-->
- <!-- <groupId>org.apache.solr</groupId>-->
- <!-- <artifactId>solr-solrj</artifactId>-->
- <!-- <version>${solr.version}</version>-->
- <!-- </dependency>-->
-
- <!--
- refer: https://github.com/apache/lucene-solr/blob/releases/lucene-solr/8.6.1/
-
- <dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-core</artifactId>
- <version>${solr.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-auth</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-annotations</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs-client</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.htrace</groupId>
- <artifactId>htrace-core4</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- -->
-
- <!-- <dependency>-->
- <!-- <groupId>com.qlangtech.tis</groupId>-->
- <!-- <artifactId>tis-solr-core</artifactId>-->
- <!-- <version>${solr.version}-fix</version>-->
- <!-- <exclusions>-->
- <!-- <exclusion>-->
- <!-- <groupId>org.apache.lucene</groupId>-->
- <!-- <artifactId>lucene-analyzers-phonetic</artifactId>-->
- <!-- </exclusion>-->
- <!-- <exclusion>-->
- <!-- <groupId>org.apache.hadoop</groupId>-->
- <!-- <artifactId>hadoop-auth</artifactId>-->
- <!-- </exclusion>-->
- <!-- <exclusion>-->
- <!-- <groupId>org.apache.hadoop</groupId>-->
- <!-- <artifactId>hadoop-annotations</artifactId>-->
- <!-- </exclusion>-->
- <!-- <exclusion>-->
- <!-- <groupId>org.apache.hadoop</groupId>-->
- <!-- <artifactId>hadoop-hdfs-client</artifactId>-->
- <!-- </exclusion>-->
- <!-- <exclusion>-->
- <!-- <groupId>org.apache.htrace</groupId>-->
- <!-- <artifactId>htrace-core4</artifactId>-->
- <!-- </exclusion>-->
- <!-- <exclusion>-->
- <!-- <groupId>org.apache.hadoop</groupId>-->
- <!-- <artifactId>hadoop-common</artifactId>-->
- <!-- </exclusion>-->
- <!-- <exclusion>-->
- <!-- <groupId>org.apache.hadoop</groupId>-->
- <!-- <artifactId>hadoop-hdfs</artifactId>-->
- <!-- </exclusion>-->
- <!-- <exclusion>-->
- <!-- <groupId>org.apache.logging.log4j</groupId>-->
- <!-- <artifactId>log4j-slf4j-impl</artifactId>-->
- <!-- </exclusion>-->
- <!-- <exclusion>-->
- <!-- <groupId>org.apache.logging.log4j</groupId>-->
- <!-- <artifactId>log4j-1.2-api</artifactId>-->
- <!-- </exclusion>-->
- <!-- <exclusion>-->
- <!-- <groupId>org.apache.logging.log4j</groupId>-->
- <!-- <artifactId>log4j-core</artifactId>-->
- <!-- </exclusion>-->
- <!-- <exclusion>-->
- <!-- <groupId>org.apache.logging.log4j</groupId>-->
- <!-- <artifactId>log4j-web</artifactId>-->
- <!-- </exclusion>-->
- <!-- </exclusions>-->
- <!-- </dependency>-->
-
-
  <dependency>
  <groupId>junit</groupId>
  <artifactId>junit</artifactId>
@@ -771,7 +673,13 @@
 
 
  <build>
+
+
  <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>flatten-maven-plugin</artifactId>
+ </plugin>
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-surefire-plugin</artifactId>
@@ -888,92 +796,6 @@
  <module>tis-logback-flume-parent</module>
  </modules>
  </profile>
-
- <profile>
- <id>github-repo</id>
- <repositories>
- <repository>
- <id>github_ibator</id>
- <url>https://maven.pkg.github.com/qlangtech/ibator_koubei</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
- </profile>
-
- <profile>
- <id>aliyun-repo</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <repositories>
- <repository>
- <id>tis-repo-releases</id>
- <url>http:https://mvn-repo.oss-cn-hangzhou.aliyuncs.com/release/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>tis-repo-snapshots</id>
- <url>http:https://mvn-repo.oss-cn-hangzhou.aliyuncs.com/snapshot/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>jenkins-release</id>
- <url>https://repo.jenkins-ci.org/releases/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <id>jenkins-plugin-release</id>
- <url>https://repo.jenkins-ci.org/releases/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- <pluginRepository>
- <id>rdc-releases</id>
- <url>http:https://mvn-repo.oss-cn-hangzhou.aliyuncs.com/release/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- <pluginRepository>
- <id>rdc-snapshots</id>
- <url>http:https://mvn-repo.oss-cn-hangzhou.aliyuncs.com/snapshot/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
-
- </pluginRepositories>
- </profile>
  </profiles>
 
 

diff --git a/tis-assemble/pom.xml b/tis-assemble/pom.xml
@@ -24,7 +24,7 @@
  <parent>
  <groupId>com.qlangtech.tis</groupId>
  <artifactId>tis</artifactId>
- <version>3.8.0</version>
+ <version>${revision}</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
 

diff --git a/tis-base-test/pom.xml b/tis-base-test/pom.xml
@@ -23,7 +23,7 @@
  <parent>
  <artifactId>tis</artifactId>
  <groupId>com.qlangtech.tis</groupId>
- <version>3.8.0</version>
+ <version>${revision}</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/tis-builder-api/pom.xml b/tis-builder-api/pom.xml
@@ -23,7 +23,7 @@
  <parent>
  <groupId>com.qlangtech.tis</groupId>
  <artifactId>tis</artifactId>
- <version>3.8.0</version>
+ <version>${revision}</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
 

diff --git a/tis-common-dao/pom.xml b/tis-common-dao/pom.xml
@@ -23,7 +23,7 @@
  <parent>
  <artifactId>tis</artifactId>
  <groupId>com.qlangtech.tis</groupId>
- <version>3.8.0</version>
+ <version>${revision}</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/tis-common/pom.xml b/tis-common/pom.xml
@@ -22,7 +22,7 @@
  <parent>
  <groupId>com.qlangtech.tis</groupId>
  <artifactId>tis</artifactId>
- <version>3.8.0</version>
+ <version>${revision}</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
  <groupId>com.qlangtech.tis</groupId>

diff --git a/tis-console/pom.xml b/tis-console/pom.xml
@@ -23,7 +23,7 @@
  <parent>
  <groupId>com.qlangtech.tis</groupId>
  <artifactId>tis</artifactId>
- <version>3.8.0</version>
+ <version>${revision}</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
 

diff --git a/tis-dag/pom.xml b/tis-dag/pom.xml
@@ -23,7 +23,7 @@
  <parent>
  <artifactId>tis</artifactId>
  <groupId>com.qlangtech.tis</groupId>
- <version>3.8.0</version>
+ <version>${revision}</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/tis-hadoop-rpc/pom.xml b/tis-hadoop-rpc/pom.xml
@@ -23,7 +23,7 @@
  <parent>
  <groupId>com.qlangtech.tis</groupId>
  <artifactId>tis</artifactId>
- <version>3.8.0</version>
+ <version>${revision}</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
 

diff --git a/tis-logback-flume-parent/logback-flume-appender-test/pom.xml b/tis-logback-flume-parent/logback-flume-appender-test/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>tis-logback-flume-parent</artifactId>
  <groupId>com.qlangtech.tis</groupId>
- <version>3.8.0</version>
+ <version>${revision}</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/tis-logback-flume-parent/logback-flume-appender/pom.xml b/tis-logback-flume-parent/logback-flume-appender/pom.xml
@@ -4,7 +4,7 @@
  <parent>
  <groupId>com.qlangtech.tis</groupId>
  <artifactId>tis-logback-flume-parent</artifactId>
- <version>3.8.0</version>
+ <version>${revision}</version>
  </parent>
 
  <modelVersion>4.0.0</modelVersion>

diff --git a/tis-logback-flume-parent/logback-flume-server-test/pom.xml b/tis-logback-flume-parent/logback-flume-server-test/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>tis-logback-flume-parent</artifactId>
  <groupId>com.qlangtech.tis</groupId>
- <version>3.8.0</version>
+ <version>${revision}</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
  <modelVersion>4.0.0</modelVersion>

diff --git a/tis-logback-flume-parent/logback-flume-server/pom.xml b/tis-logback-flume-parent/logback-flume-server/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>com.qlangtech.tis</groupId>
  <artifactId>tis-logback-flume-parent</artifactId>
- <version>3.8.0</version>
+ <version>${revision}</version>
  </parent>
 
  <modelVersion>4.0.0</modelVersion>

diff --git a/tis-logback-flume-parent/pom.xml b/tis-logback-flume-parent/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>com.qlangtech.tis</groupId>
  <artifactId>tis</artifactId>
- <version>3.8.0</version>
+ <version>${revision}</version>
  <relativePath>../pom.xml</relativePath>
  </parent>