You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by lu...@apache.org on 2015/07/13 13:27:18 UTC
[3/3] incubator-kylin git commit: KYLIN-885 generate rc2,
update pom settings
KYLIN-885 generate rc2, update pom settings
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/ce1dde3e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/ce1dde3e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/ce1dde3e
Branch: refs/heads/v0.7.2-release
Commit: ce1dde3e509750f26e6ca029bf407a7d1f149e75
Parents: 1aebb1b
Author: Luke Han <lu...@apache.org>
Authored: Mon Jul 13 19:27:02 2015 +0800
Committer: Luke Han <lu...@apache.org>
Committed: Mon Jul 13 19:27:02 2015 +0800
----------------------------------------------------------------------
job/pom.xml | 69 ----------------
pom.xml | 87 +--------------------
src/main/config/assemblies/source-assembly.xml | 2 +-
3 files changed, 4 insertions(+), 154 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/ce1dde3e/job/pom.xml
----------------------------------------------------------------------
diff --git a/job/pom.xml b/job/pom.xml
index 44a0f5f..14f3d55 100644
--- a/job/pom.xml
+++ b/job/pom.xml
@@ -259,73 +259,4 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <!-- This profile adds/overrides few features of the 'apache-release'
- profile in the parent pom. -->
- <id>apache-release</id>
- <build>
- <plugins>
- <!-- Apache-RAT checks for files without headers.
- If run on a messy developer's sandbox, it will fail.
- This serves as a reminder to only build a release in a clean
- sandbox! -->
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <numUnapprovedLicenses>0</numUnapprovedLicenses>
- <excludes>
- <!-- test data -->
- <exclude>src/test/resources/data/test_cal_dt/part-r-00000</exclude>
- <exclude>src/test/**/*.json</exclude>
- </excludes>
- </configuration>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-core</artifactId>
- <version>1.6</version>
- <exclusions>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <groupId>net.ju-n.maven.plugins</groupId>
- <artifactId>checksum-maven-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <goals>
- <goal>artifacts</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <algorithms>
- <algorithm>MD5</algorithm>
- <algorithm>SHA-1</algorithm>
- </algorithms>
- <failOnError>false</failOnError>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/ce1dde3e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f754042..d4b2382 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
<javaVersion>1.7</javaVersion>
<maven-model.version>3.1.1</maven-model.version>
<maven-release.version>2.5.1</maven-release.version>
- <maven-assembly.version>2.4</maven-assembly.version>
+ <maven-assembly.version>2.5.5</maven-assembly.version>
<maven-license.plugin.version>2.6</maven-license.plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -676,87 +676,6 @@
<skip>true</skip>
</configuration>
</plugin>
- <!-- Apache-RAT checks for files without headers.
- If run on a messy developer's sandbox, it will fail.
- This serves as a reminder to only build a release in a clean
- sandbox! -->
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <numUnapprovedLicenses>0</numUnapprovedLicenses>
- <excludes>
- <exclude>.idea/**</exclude>
- <exclude>.git/**</exclude>
- <exclude>.settings/**</exclude>
- <!-- text files without comments -->
- <exclude>**/*.csv</exclude>
- <exclude>**/*.json</exclude>
- <exclude>**/*.md</exclude>
- <!-- binary files -->
- <exclude>**/*.dict</exclude>
- <exclude>**/*.dic</exclude>
- <exclude>**/*.snapshot</exclude>
- <exclude>**/*.pdf</exclude>
- <exclude>**/*.log</exclude>
-
- <exclude>**/.checkstyle</exclude>
-
- <!-- generated files -->
- <exclude>**/target/**</exclude>
- <exclude>lib/**</exclude>
- <!-- Kylin's website content -->
- <exclude>**/.sass-cache/**</exclude>
-
- <exclude>docs/website/**</exclude>
-
- <!-- tomcat package -->
- <exclude>tomcat/**</exclude>
- <!-- front end libary and generated files -->
- <exclude>webapp/node_modules/**</exclude>
- <exclude>webapp/dist/**</exclude>
- <exclude>webapp/app/components/**</exclude>
- <!-- json configuration file-->
- <exclude>webapp/.bowerrc</exclude>
- <exclude>webapp/.jshintrc</exclude>
- <!-- generated dict files -->
- <exclude>dictionary/metastore_db/**</exclude>
-
- <!-- MIT license -->
- <exclude>webapp/app/css/AdminLTE-fonts.css</exclude>
- <exclude>webapp/app/css/AdminLTE.css</exclude>
-
- <!-- jdbc log -->
- <exclude>jdbc/kylin_jdbc.log*</exclude>
-
- <!-- HBase MiniCluster Testing Data, for testing only -->
- <exclude>examples/test_case_data/minicluster/hbase-export.tar.gz</exclude>
- <exclude>examples/test_case_data/**/*.xml</exclude>
-
- </excludes>
- </configuration>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-core</artifactId>
- <version>1.6</version>
- <exclusions>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </plugin>
</plugins>
</build>
</profile>
@@ -836,11 +755,11 @@
<goal>single</goal>
</goals>
<configuration>
+ <tarLongFileMode>posix</tarLongFileMode>
<runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
<appendAssemblyId>true</appendAssemblyId>
<descriptor>src/main/config/assemblies/source-assembly.xml</descriptor>
<finalName>apache-kylin-${project.version}-src</finalName>
- <tarLongFileMode>gnu</tarLongFileMode>
</configuration>
</execution>
</executions>
@@ -907,7 +826,7 @@
<exclude>**/.checkstyle</exclude>
<!--Job's Test Data-->
- <exclude>job/src/test/resources/data/**</exclude>
+ <exclude>**/src/test/resources/data/**</exclude>
<!-- generated files -->
<exclude>**/target/**</exclude>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/ce1dde3e/src/main/config/assemblies/source-assembly.xml
----------------------------------------------------------------------
diff --git a/src/main/config/assemblies/source-assembly.xml b/src/main/config/assemblies/source-assembly.xml
index 0bb1281..c26123e 100644
--- a/src/main/config/assemblies/source-assembly.xml
+++ b/src/main/config/assemblies/source-assembly.xml
@@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<assembly>
- <id>src</id>
+ <id>source-release</id>
<formats>
<format>tar.gz</format>
</formats>