You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2018/09/12 11:08:43 UTC

[kylin] branch 2.5.0-release updated (756fb59 -> 3d20c8b)

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

shaofengshi pushed a change to branch 2.5.0-release
in repository https://gitbox.apache.org/repos/asf/kylin.git.


 discard 756fb59  [maven-release-plugin] prepare for next development iteration
    omit 11f7d37  [maven-release-plugin] prepare release kylin-2.5.0
    omit 07af02f  KYLIN-3513 disable javadoc check
    omit 8d576e1  KYLIN-3513 add plugin version to pom.xml
     add 63b435d  KYLIN-3525 Reserve intermediate flat table data if kylin.source.hive.keep-flat-table set to true
     new 3d20c8b  KYLIN-3513 add plugin version to pom.xml KYLIN-3513 disable javadoc check KYLIN-3513 use SHA-256 algorithm

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (756fb59)
            \
             N -- N -- N   refs/heads/2.5.0-release (3d20c8b)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 assembly/pom.xml                                          |  2 +-
 atopcalcite/pom.xml                                       |  2 +-
 core-common/pom.xml                                       |  2 +-
 core-cube/pom.xml                                         |  2 +-
 core-dictionary/pom.xml                                   |  2 +-
 core-job/pom.xml                                          |  2 +-
 core-metadata/pom.xml                                     |  2 +-
 core-metrics/pom.xml                                      |  2 +-
 core-storage/pom.xml                                      |  2 +-
 engine-mr/pom.xml                                         |  2 +-
 engine-spark/pom.xml                                      |  2 +-
 jdbc/pom.xml                                              |  2 +-
 kylin-it/pom.xml                                          |  2 +-
 metrics-reporter-hive/pom.xml                             |  2 +-
 metrics-reporter-kafka/pom.xml                            |  2 +-
 pom.xml                                                   |  5 ++---
 query/pom.xml                                             |  2 +-
 server-base/pom.xml                                       |  2 +-
 server/pom.xml                                            |  2 +-
 source-hive/pom.xml                                       |  2 +-
 .../apache/kylin/source/hive/GarbageCollectionStep.java   | 15 ++++++++-------
 source-kafka/pom.xml                                      |  2 +-
 storage-hbase/pom.xml                                     |  2 +-
 tomcat-ext/pom.xml                                        |  2 +-
 tool-assembly/pom.xml                                     |  2 +-
 tool/pom.xml                                              |  2 +-
 26 files changed, 34 insertions(+), 34 deletions(-)


[kylin] 01/01: KYLIN-3513 add plugin version to pom.xml KYLIN-3513 disable javadoc check KYLIN-3513 use SHA-256 algorithm

Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

shaofengshi pushed a commit to branch 2.5.0-release
in repository https://gitbox.apache.org/repos/asf/kylin.git

commit 3d20c8b05db88899ef00b8f780cb0d9ea4f4c516
Author: shaofengshi <sh...@apache.org>
AuthorDate: Wed Sep 12 16:39:15 2018 +0800

    KYLIN-3513 add plugin version to pom.xml
    KYLIN-3513 disable javadoc check
    KYLIN-3513 use SHA-256 algorithm
---
 core-common/pom.xml | 29 -----------------------------
 pom.xml             | 15 +++++++++++++--
 source-hive/pom.xml |  4 ----
 3 files changed, 13 insertions(+), 35 deletions(-)

diff --git a/core-common/pom.xml b/core-common/pom.xml
index 2f1c8e2..94a3e76 100644
--- a/core-common/pom.xml
+++ b/core-common/pom.xml
@@ -102,33 +102,4 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>mysql</groupId>
-                                    <artifactId>mysql-connector-java</artifactId>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>${project.basedir}/../../build/ext</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                            <overWriteReleases>false</overWriteReleases>
-                            <overWriteSnapshots>true</overWriteSnapshots>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 </project>
diff --git a/pom.xml b/pom.xml
index 9014830..499e009 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1177,6 +1177,11 @@
                     <artifactId>maven-dependency-plugin</artifactId>
                     <version>2.10</version>
                 </plugin>
+                <plugin>
+                    <groupId>net.alchim31.maven</groupId>
+                    <artifactId>scala-maven-plugin</artifactId>
+                    <version>3.4.2</version>
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>
@@ -1203,6 +1208,13 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                        <excludePackageNames>org.apache.kylin.*</excludePackageNames>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
@@ -1683,8 +1695,7 @@
                         </executions>
                         <configuration>
                             <algorithms>
-                                <algorithm>MD5</algorithm>
-                                <algorithm>SHA-1</algorithm>
+                                <algorithm>SHA-256</algorithm>
                             </algorithms>
                             <failOnError>false</failOnError>
                         </configuration>
diff --git a/source-hive/pom.xml b/source-hive/pom.xml
index 4c7e937..a766e07 100644
--- a/source-hive/pom.xml
+++ b/source-hive/pom.xml
@@ -105,10 +105,6 @@
             <groupId>org.apache.kylin</groupId>
             <artifactId>kylin-engine-spark</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.kylin</groupId>
-            <artifactId>kylin-engine-spark</artifactId>
-        </dependency>
     </dependencies>
 
 </project>