You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@livy.apache.org by js...@apache.org on 2017/08/07 01:05:24 UTC
incubator-livy git commit: [LIVY-389][BUILD] Change POM and packaging
to meet Apache Criteria
Repository: incubator-livy
Updated Branches:
refs/heads/master be3fe0345 -> 1fcf93db6
[LIVY-389][BUILD] Change POM and packaging to meet Apache Criteria
Change LIvy POM and assembly xml to meet Apache Criteria:
1. Add Apache parent POM to Livy POM.
2. Add LICENSE/NOTICE/DISCLAIMER to artifact's META-INF and package folder.
CC ajbozarth lresende please help to review.
Author: jerryshao <ss...@hortonworks.com>
Closes #32 from jerryshao/LIVY-389.
Project: http://git-wip-us.apache.org/repos/asf/incubator-livy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-livy/commit/1fcf93db
Tree: http://git-wip-us.apache.org/repos/asf/incubator-livy/tree/1fcf93db
Diff: http://git-wip-us.apache.org/repos/asf/incubator-livy/diff/1fcf93db
Branch: refs/heads/master
Commit: 1fcf93db66445ddeae1d1f92f3f2bd278df1c5d4
Parents: be3fe03
Author: jerryshao <ss...@hortonworks.com>
Authored: Mon Aug 7 09:05:17 2017 +0800
Committer: jerryshao <ss...@hortonworks.com>
Committed: Mon Aug 7 09:05:17 2017 +0800
----------------------------------------------------------------------
assembly/assembly.xml | 9 +++++++++
pom.xml | 42 ++++++++++++++++++++++++++++++++++++++----
2 files changed, 47 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/1fcf93db/assembly/assembly.xml
----------------------------------------------------------------------
diff --git a/assembly/assembly.xml b/assembly/assembly.xml
index 4a0e797..06842ba 100644
--- a/assembly/assembly.xml
+++ b/assembly/assembly.xml
@@ -31,6 +31,15 @@
</includes>
</fileSet>
<fileSet>
+ <directory>${project.parent.basedir}</directory>
+ <outputDirectory>${assembly.name}</outputDirectory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ <include>DISCLAIMER</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>${project.parent.basedir}/conf</directory>
<outputDirectory>${assembly.name}/conf</outputDirectory>
<includes>
http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/1fcf93db/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 15dacb4..98e3b94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,16 +24,21 @@
<artifactId>livy-main</artifactId>
<version>0.4.0-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
-
- <name>livy-main</name>
- <description>livy-main</description>
-
+ <name>Livy Project Parent POM</name>
+ <description>Livy Project</description>
<url>http://livy.incubating.apache.org/</url>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>18</version>
+ </parent>
+
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
</license>
</licenses>
@@ -144,6 +149,9 @@
<MaxPermGen>512m</MaxPermGen>
<CodeCacheSize>512m</CodeCacheSize>
+ <maven.compiler.source>${java.version}</maven.compiler.source>
+ <maven.compiler.target>${java.version}</maven.compiler.target>
+
</properties>
<repositories>
@@ -764,6 +772,12 @@
<version>0.12</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.5</version>
+ </plugin>
+
</plugins>
</pluginManagement>
@@ -1001,6 +1015,26 @@
</executions>
</plugin>
+ <!-- Override this plugin with parent POM to add DISCLAIMER file to artifacts. -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>process-resource-bundles</id>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+ <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+ <resourceBundle>org.apache.apache.resources:apache-incubator-disclaimer-resource-bundle:1.2-SNAPSHOT</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>