You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by go...@apache.org on 2021/07/02 11:09:16 UTC

[incubator-inlong] branch INLONG-613 updated: [INLONG-644] Remove /dist from .gitignore and add subdirectory dist in inlong-sort (#492)

This is an automated email from the ASF dual-hosted git repository.

gosonzhang pushed a commit to branch INLONG-613
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git


The following commit(s) were added to refs/heads/INLONG-613 by this push:
     new 18b107e  [INLONG-644] Remove /dist from .gitignore and add subdirectory dist in inlong-sort (#492)
18b107e is described below

commit 18b107e50b7df3e0c0774754fdcf207936ec4d84
Author: chantccc <52...@users.noreply.github.com>
AuthorDate: Fri Jul 2 19:09:08 2021 +0800

    [INLONG-644] Remove /dist from .gitignore and add subdirectory dist in inlong-sort (#492)
    
    Co-authored-by: tianqiwan <ti...@tencent.com>
---
 .gitignore               |  2 +-
 inlong-sort/dist/pom.xml | 49 ++++++++++++++++++++++++++++++++++++++++++++++++
 inlong-sort/pom.xml      |  6 ++++++
 3 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index f7cd11f..3eab744 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,7 +31,7 @@ nb-configuration.xml
 # Maven
 log/
 target/
-dist/
+target/dist/
 
 # Python
 venv/
diff --git a/inlong-sort/dist/pom.xml b/inlong-sort/dist/pom.xml
new file mode 100644
index 0000000..a3f139e
--- /dev/null
+++ b/inlong-sort/dist/pom.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements. See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License. You may obtain a copy of the License at
+  ~ <p>
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~ <p>
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         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">
+    <parent>
+        <groupId>org.apache.inlong</groupId>
+        <artifactId>inlong-sort</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>inlong-sort-dist</artifactId>
+    <name>Apache InLong - Sort Dist</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.inlong</groupId>
+            <artifactId>inlong-sort-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.inlong</groupId>
+            <artifactId>inlong-sort-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.inlong</groupId>
+            <artifactId>inlong-sort-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file
diff --git a/inlong-sort/pom.xml b/inlong-sort/pom.xml
index 3378fe3..002ab30 100644
--- a/inlong-sort/pom.xml
+++ b/inlong-sort/pom.xml
@@ -242,6 +242,12 @@
                 <groupId>org.apache.hive</groupId>
                 <artifactId>hive-exec</artifactId>
                 <version>${hive.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.pentaho</groupId>
+                        <artifactId>pentaho-aggdesigner-algorithm</artifactId>
+                    </exclusion>
+                </exclusions>
                 <scope>test</scope>
             </dependency>