You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by sn...@apache.org on 2019/02/14 02:20:42 UTC
[incubator-pinot] branch master updated: Update maven config files
for preparing release (#3833)
This is an automated email from the ASF dual-hosted git repository.
snlee pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
The following commit(s) were added to refs/heads/master by this push:
new e4a05b2 Update maven config files for preparing release (#3833)
e4a05b2 is described below
commit e4a05b2720c7714bf4815cd885ca8ee041c47ef5
Author: Seunghyun Lee <sn...@linkedin.com>
AuthorDate: Wed Feb 13 18:20:37 2019 -0800
Update maven config files for preparing release (#3833)
1. Added apache parent pom
2. Make 'apache-release' profile to build source tarbells,
sha512 hash, and sign
3. Override configs for Apache rat to make the check pass
4. Turning off doclint for javadoc
5. Fix "LoaderUtilsTest" to use randomly generated tmp directory
instead of using "tmp" dir within a project
6. Fix bin-dist to include base directory for its tarbell
7. Add Apache RAT exclude configs
---
.../core/segment/index/loader/LoaderUtilsTest.java | 2 +-
pinot-distribution/pinot-assembly.xml | 2 +-
pinot-distribution/pom.xml | 31 +------
pom.xml | 100 ++++++++++++++++++++-
4 files changed, 104 insertions(+), 31 deletions(-)
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/segment/index/loader/LoaderUtilsTest.java b/pinot-core/src/test/java/org/apache/pinot/core/segment/index/loader/LoaderUtilsTest.java
index 0cb342b..d3c4033 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/segment/index/loader/LoaderUtilsTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/segment/index/loader/LoaderUtilsTest.java
@@ -29,7 +29,7 @@ import org.testng.annotations.Test;
public class LoaderUtilsTest {
- private static final File TEST_DIR = new File("tmp", LoaderUtils.class.getName());
+ private static final File TEST_DIR = new File(FileUtils.getTempDirectory(), LoaderUtils.class.getName());
@BeforeClass
public void setUp()
diff --git a/pinot-distribution/pinot-assembly.xml b/pinot-distribution/pinot-assembly.xml
index 3a1cfdf..dc8b8db 100644
--- a/pinot-distribution/pinot-assembly.xml
+++ b/pinot-distribution/pinot-assembly.xml
@@ -27,7 +27,7 @@
<format>tar.gz</format>
<format>dir</format>
</formats>
- <includeBaseDirectory>false</includeBaseDirectory>
+ <includeBaseDirectory>true</includeBaseDirectory>
<dependencySets>
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
diff --git a/pinot-distribution/pom.xml b/pinot-distribution/pom.xml
index 760e85b..d751eb8 100644
--- a/pinot-distribution/pom.xml
+++ b/pinot-distribution/pom.xml
@@ -118,7 +118,7 @@
</build>
<profiles>
<profile>
- <id>src-dist</id>
+ <id>apache-release</id>
<build>
<plugins>
<plugin>
@@ -151,18 +151,16 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <finalName>apache-pinot-incubating-${project.version}-bin</finalName>
- <appendAssemblyId>false</appendAssemblyId>
- </configuration>
<executions>
<execution>
- <id>make-bundles</id>
+ <id>binary-release-assembly-pinot</id>
<goals>
<goal>single</goal>
</goals>
<phase>package</phase>
<configuration>
+ <finalName>apache-pinot-incubating-${project.version}-bin</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>pinot-assembly.xml</descriptor>
</descriptors>
@@ -177,26 +175,5 @@
</plugins>
</build>
</profile>
- <profile>
- <id>sign</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.6</version>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
diff --git a/pom.xml b/pom.xml
index 085ac69..56dcbf3e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,6 +22,13 @@
<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">
<modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>21</version>
+ </parent>
+
<groupId>org.apache.pinot</groupId>
<artifactId>pinot</artifactId>
<version>0.1.0-SNAPSHOT</version>
@@ -86,7 +93,7 @@
</mailingLists>
<scm>
- <developerConnection>scm:git:git://apache/incubator-pinot.git</developerConnection>
+ <developerConnection>scm:git:git@github.com:apache/incubator-pinot.git</developerConnection>
</scm>
<!-- Apache project inception year for generating correct NOTICE file for jar bundle. -->
@@ -159,6 +166,23 @@
</plugins>
</build>
</profile>
+ <!-- Disable source release assembly for 'apache-release' profile. -->
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>source-release-assembly</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<repositories>
@@ -812,7 +836,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.5.5</version>
+ <version>3.1.1</version>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
@@ -827,6 +851,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.1</version>
+ <configuration>
+ <!-- Remove this after fixing all javadoc warnings -->
+ <additionalparam>-Xdoclint:none</additionalparam>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -915,6 +943,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
+ <version>2.5.3</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-provider-gitexe</artifactId>
+ <version>1.9.4</version>
+ </dependency>
+ </dependencies>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
</configuration>
@@ -1088,6 +1124,66 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.13</version>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <excludes>
+ <!-- Documentation -->
+ <exclude>**/*.md</exclude>
+ <exclude>docs/**</exclude>
+
+ <!-- Exclude license copies -->
+ <exclude>licenses/**</exclude>
+ <exclude>licenses-binary/**</exclude>
+
+ <!-- js, css files that are exact copies of the third-party works. In this case, the original header has to
+ be kept. Please refer to 'Treatment of Third-party works' in https://www.apache.org/legal/src-headers.html
+ -->
+ <exclude>**/codemirror/**</exclude>
+ <exclude>**/codemirror*</exclude>
+ <exclude>**/foundation*</exclude>
+ <exclude>**/angular*</exclude>
+ <exclude>**/underscore*</exclude>
+ <exclude>**/jquery*</exclude>
+ <exclude>**/normalize*</exclude>
+ <exclude>**/handlebars*</exclude>
+ <exclude>**/beautify*</exclude>
+
+ <!-- Binary files -->
+ <exclude>**/*.json</exclude>
+ <exclude>**/*.pql</exclude>
+ <exclude>**/*.log</exclude>
+ <exclude>**/*.csv</exclude>
+ <exclude>**/*.avro</exclude>
+ <exclude>**/*.conf</exclude>
+ <exclude>**/*.yml</exclude>
+ <exclude>**/*.yaml</exclude>
+ <exclude>**/*.properties</exclude>
+
+ <!-- Top level -->
+ <exclude>.codecov*</exclude>
+
+ <!-- Test Resources -->
+ <exclude>**/test/resources/**</exclude>
+
+ <!-- Pinot-Druid Benchmark (not part of the distribution) -->
+ <exclude>contrib/**</exclude>
+
+ <!-- Third eye (not part of the distribution) -->
+ <exclude>thirdeye/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<version>1.3</version>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org