Pom file clean up and change to allow the effective pom to be installed. This will help downstreams project depend on blur artifacts by hadoop version and get correct transitive deps.
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/f677e096 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/f677e096 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/f677e096 Branch: refs/heads/master Commit: f677e0966f5da8bf9373001f3ae0eb76acc782c5 Parents: 8ffd2a5 Author: Aaron McCurry <[email protected]> Authored: Mon Jan 26 22:40:57 2015 -0500 Committer: Aaron McCurry <[email protected]> Committed: Mon Jan 26 22:40:57 2015 -0500 ---------------------------------------------------------------------- blur-command/pom.xml | 59 +++++++++++++++++++--------- blur-console/pom.xml | 63 ++++++++++++++++++++---------- blur-core/pom.xml | 55 ++++++++++++++++++-------- blur-hive/pom.xml | 75 +++++++++++++++++++++++++++-------- blur-mapred-hadoop1/pom.xml | 55 ++++++++++++++++++-------- blur-mapred-hadoop2/pom.xml | 55 ++++++++++++++++++-------- blur-query/pom.xml | 55 ++++++++++++++++++-------- blur-shell/pom.xml | 52 +++++++++++++++++-------- blur-status/pom.xml | 59 +++++++++++++++++----------- blur-store/pom.xml | 55 ++++++++++++++++++-------- blur-thrift/pom.xml | 58 +++++++++++++++++---------- blur-util/pom.xml | 84 +++++++++++++++++++++------------------- contrib/blur-spark/pom.xml | 68 ++++++++++++++++++++------------ pom.xml | 8 ++++ 14 files changed, 537 insertions(+), 264 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/f677e096/blur-command/pom.xml ---------------------------------------------------------------------- diff --git a/blur-command/pom.xml b/blur-command/pom.xml index 51013e6..5b51f9c 100644 --- a/blur-command/pom.xml +++ b/blur-command/pom.xml @@ -118,41 +118,62 @@ under the License. </repositories> <build> - <pluginManagement> + <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>-XX:+UseConcMarkSweepGC -Xmx1g -Xms1g</argLine> - <forkCount>2</forkCount> - <forkMode>always</forkMode> - <reuseForks>false</reuseForks> - <systemPropertyVariables> - <blur.tmp.dir>${project.build.directory}/target/tmp</blur.tmp.dir> - </systemPropertyVariables> - </configuration> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> + <artifactId>maven-help-plugin</artifactId> + <version>2.1.1</version> + <executions> + <execution> + <phase>generate-resources</phase> + <goals> + <goal>effective-pom</goal> + </goals> + <configuration> + <output>${project.build.directory}/effective-pom.xml</output> + </configuration> + </execution> + </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> + <artifactId>maven-install-plugin</artifactId> + <version>2.3.1</version> <executions> <execution> + <phase>install</phase> <goals> - <goal>test-jar</goal> + <goal>install-file</goal> </goals> + <configuration> + <file>${project.build.directory}/${artifactId}-${project.version}.jar</file> + <pomFile>${project.build.directory}/effective-pom.xml</pomFile> + <!-- sources></sources --> + <!-- javadoc></javadoc --> + <groupId>${project.groupId}</groupId> + <artifactId>${project.artifactId}</artifactId> + <version>${project.version}</version> + <packaging>jar</packaging> + <!--classifier></classifier --> + <generatePom>true</generatePom> + <createChecksum>true</createChecksum> + </configuration> </execution> </executions> </plugin> </plugins> - </pluginManagement> + </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/f677e096/blur-console/pom.xml ---------------------------------------------------------------------- diff --git a/blur-console/pom.xml b/blur-console/pom.xml index b1f078b..626f152 100644 --- a/blur-console/pom.xml +++ b/blur-console/pom.xml @@ -126,27 +126,6 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>-XX:+UseConcMarkSweepGC -Xmx1g -Xms1g</argLine> - <forkCount>2</forkCount> - <forkMode>always</forkMode> - <reuseForks>false</reuseForks> - <systemPropertyVariables> - <blur.tmp.dir>${project.build.directory}/target/tmp</blur.tmp.dir> - </systemPropertyVariables> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <executions> <execution> @@ -178,6 +157,48 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-help-plugin</artifactId> + <version>2.1.1</version> + <executions> + <execution> + <phase>generate-resources</phase> + <goals> + <goal>effective-pom</goal> + </goals> + <configuration> + <output>${project.build.directory}/effective-pom.xml</output> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-install-plugin</artifactId> + <version>2.3.1</version> + <executions> + <execution> + <phase>install</phase> + <goals> + <goal>install-file</goal> + </goals> + <configuration> + <file>${project.build.directory}/${artifactId}-${project.version}.jar</file> + <pomFile>${project.build.directory}/effective-pom.xml</pomFile> + <!-- sources></sources --> + <!-- javadoc></javadoc --> + <groupId>${project.groupId}</groupId> + <artifactId>${project.artifactId}</artifactId> + <version>${project.version}</version> + <packaging>jar</packaging> + <!--classifier></classifier --> + <generatePom>true</generatePom> + <createChecksum>true</createChecksum> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/f677e096/blur-core/pom.xml ---------------------------------------------------------------------- diff --git a/blur-core/pom.xml b/blur-core/pom.xml index 7080907..645b56e 100644 --- a/blur-core/pom.xml +++ b/blur-core/pom.xml @@ -111,33 +111,54 @@ under the License. <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>-XX:+UseConcMarkSweepGC -Xmx1g -Xms1g</argLine> - <forkCount>2</forkCount> - <forkMode>always</forkMode> - <reuseForks>false</reuseForks> - <systemPropertyVariables> - <blur.tmp.dir>${project.build.directory}/target/tmp</blur.tmp.dir> - </systemPropertyVariables> - </configuration> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> + <artifactId>maven-help-plugin</artifactId> + <version>2.1.1</version> + <executions> + <execution> + <phase>generate-resources</phase> + <goals> + <goal>effective-pom</goal> + </goals> + <configuration> + <output>${project.build.directory}/effective-pom.xml</output> + </configuration> + </execution> + </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> + <artifactId>maven-install-plugin</artifactId> + <version>2.3.1</version> <executions> <execution> + <phase>install</phase> <goals> - <goal>test-jar</goal> + <goal>install-file</goal> </goals> + <configuration> + <file>${project.build.directory}/${artifactId}-${project.version}.jar</file> + <pomFile>${project.build.directory}/effective-pom.xml</pomFile> + <!-- sources></sources --> + <!-- javadoc></javadoc --> + <groupId>${project.groupId}</groupId> + <artifactId>${project.artifactId}</artifactId> + <version>${project.version}</version> + <packaging>jar</packaging> + <!--classifier></classifier --> + <generatePom>true</generatePom> + <createChecksum>true</createChecksum> + </configuration> </execution> </executions> </plugin> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/f677e096/blur-hive/pom.xml ---------------------------------------------------------------------- diff --git a/blur-hive/pom.xml b/blur-hive/pom.xml index 4074f9c..a8c540e 100644 --- a/blur-hive/pom.xml +++ b/blur-hive/pom.xml @@ -20,7 +20,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.blur</groupId> <artifactId>blur-hive</artifactId> - <version>${projectVersion}</version> + <version>${projectHiveVersion}</version> <packaging>jar</packaging> <name>Blur Hive</name> <description>The Blur hive module contains a storage handler and serde for Hive so that it can integrate with Hive.</description> @@ -42,21 +42,21 @@ <dependency> <groupId>org.apache.blur</groupId> <artifactId>blur-core</artifactId> - <version>${project.version}</version> + <version>${projectVersion}</version> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.blur</groupId> <artifactId>blur-util</artifactId> - <version>${project.version}</version> + <version>${projectVersion}</version> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.blur</groupId> <artifactId>blur-thrift</artifactId> - <version>${project.version}</version> + <version>${projectVersion}</version> <exclusions> <exclusion> <groupId>org.apache.httpcomponents</groupId> @@ -73,7 +73,7 @@ <dependency> <groupId>org.apache.blur</groupId> <artifactId>blur-util</artifactId> - <version>${project.version}</version> + <version>${projectVersion}</version> </dependency> <dependency> <groupId>log4j</groupId> @@ -105,14 +105,6 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> <version>2.2</version> <executions> @@ -127,6 +119,48 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-help-plugin</artifactId> + <version>2.1.1</version> + <executions> + <execution> + <phase>generate-resources</phase> + <goals> + <goal>effective-pom</goal> + </goals> + <configuration> + <output>${project.build.directory}/effective-pom.xml</output> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-install-plugin</artifactId> + <version>2.3.1</version> + <executions> + <execution> + <phase>install</phase> + <goals> + <goal>install-file</goal> + </goals> + <configuration> + <file>${project.build.directory}/${artifactId}-${project.version}.jar</file> + <pomFile>${project.build.directory}/effective-pom.xml</pomFile> + <!-- sources></sources --> + <!-- javadoc></javadoc --> + <groupId>${project.groupId}</groupId> + <artifactId>${project.artifactId}</artifactId> + <version>${project.version}</version> + <packaging>jar</packaging> + <!--classifier></classifier --> + <generatePom>true</generatePom> + <createChecksum>true</createChecksum> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> <profiles> @@ -137,6 +171,9 @@ <name>hadoop1</name> </property> </activation> + <properties> + <projectHiveVersion>hadoop1-${hadoop.version}-${hive.version}-${project.parent.version}</projectHiveVersion> + </properties> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> @@ -147,7 +184,7 @@ <dependency> <groupId>org.apache.blur</groupId> <artifactId>blur-mapred-hadoop1</artifactId> - <version>${project.version}</version> + <version>${projectVersion}</version> <exclusions> <exclusion> <groupId>org.apache.blur</groupId> @@ -206,6 +243,9 @@ <name>hadoop2-mr1</name> </property> </activation> + <properties> + <projectHiveVersion>hadoop2-mr1-${hadoop.version}-${hive.version}-${project.parent.version}</projectHiveVersion> + </properties> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> @@ -222,7 +262,7 @@ <dependency> <groupId>org.apache.blur</groupId> <artifactId>blur-mapred-hadoop1</artifactId> - <version>${project.version}</version> + <version>${projectVersion}</version> <exclusions> <exclusion> <groupId>org.apache.blur</groupId> @@ -275,6 +315,9 @@ <name>hadoop2</name> </property> </activation> + <properties> + <projectHiveVersion>hadoop2-${hadoop.version}-${hive.version}-${project.parent.version}</projectHiveVersion> + </properties> <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> @@ -301,7 +344,7 @@ <dependency> <groupId>org.apache.blur</groupId> <artifactId>blur-mapred-hadoop2</artifactId> - <version>${project.version}</version> + <version>${projectVersion}</version> <exclusions> <exclusion> <groupId>org.apache.blur</groupId> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/f677e096/blur-mapred-hadoop1/pom.xml ---------------------------------------------------------------------- diff --git a/blur-mapred-hadoop1/pom.xml b/blur-mapred-hadoop1/pom.xml index 335fa82..2569f45 100644 --- a/blur-mapred-hadoop1/pom.xml +++ b/blur-mapred-hadoop1/pom.xml @@ -106,33 +106,54 @@ under the License. <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>-XX:+UseConcMarkSweepGC -Xmx1g -Xms1g</argLine> - <forkCount>2</forkCount> - <forkMode>always</forkMode> - <reuseForks>false</reuseForks> - <systemPropertyVariables> - <blur.tmp.dir>${project.build.directory}/target/tmp</blur.tmp.dir> - </systemPropertyVariables> - </configuration> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> + <artifactId>maven-help-plugin</artifactId> + <version>2.1.1</version> + <executions> + <execution> + <phase>generate-resources</phase> + <goals> + <goal>effective-pom</goal> + </goals> + <configuration> + <output>${project.build.directory}/effective-pom.xml</output> + </configuration> + </execution> + </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> + <artifactId>maven-install-plugin</artifactId> + <version>2.3.1</version> <executions> <execution> + <phase>install</phase> <goals> - <goal>test-jar</goal> + <goal>install-file</goal> </goals> + <configuration> + <file>${project.build.directory}/${artifactId}-${project.version}.jar</file> + <pomFile>${project.build.directory}/effective-pom.xml</pomFile> + <!-- sources></sources --> + <!-- javadoc></javadoc --> + <groupId>${project.groupId}</groupId> + <artifactId>${project.artifactId}</artifactId> + <version>${project.version}</version> + <packaging>jar</packaging> + <!--classifier></classifier --> + <generatePom>true</generatePom> + <createChecksum>true</createChecksum> + </configuration> </execution> </executions> </plugin> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/f677e096/blur-mapred-hadoop2/pom.xml ---------------------------------------------------------------------- diff --git a/blur-mapred-hadoop2/pom.xml b/blur-mapred-hadoop2/pom.xml index 1efe504..845c5ef 100644 --- a/blur-mapred-hadoop2/pom.xml +++ b/blur-mapred-hadoop2/pom.xml @@ -87,33 +87,54 @@ under the License. <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>-XX:+UseConcMarkSweepGC -Xmx1g -Xms1g</argLine> - <forkCount>2</forkCount> - <forkMode>always</forkMode> - <reuseForks>false</reuseForks> - <systemPropertyVariables> - <blur.tmp.dir>${project.build.directory}/target/tmp</blur.tmp.dir> - </systemPropertyVariables> - </configuration> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> + <artifactId>maven-help-plugin</artifactId> + <version>2.1.1</version> + <executions> + <execution> + <phase>generate-resources</phase> + <goals> + <goal>effective-pom</goal> + </goals> + <configuration> + <output>${project.build.directory}/effective-pom.xml</output> + </configuration> + </execution> + </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> + <artifactId>maven-install-plugin</artifactId> + <version>2.3.1</version> <executions> <execution> + <phase>install</phase> <goals> - <goal>test-jar</goal> + <goal>install-file</goal> </goals> + <configuration> + <file>${project.build.directory}/${artifactId}-${project.version}.jar</file> + <pomFile>${project.build.directory}/effective-pom.xml</pomFile> + <!-- sources></sources --> + <!-- javadoc></javadoc --> + <groupId>${project.groupId}</groupId> + <artifactId>${project.artifactId}</artifactId> + <version>${project.version}</version> + <packaging>jar</packaging> + <!--classifier></classifier --> + <generatePom>true</generatePom> + <createChecksum>true</createChecksum> + </configuration> </execution> </executions> </plugin> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/f677e096/blur-query/pom.xml ---------------------------------------------------------------------- diff --git a/blur-query/pom.xml b/blur-query/pom.xml index 03eb6f3..4b98d76 100644 --- a/blur-query/pom.xml +++ b/blur-query/pom.xml @@ -91,33 +91,54 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>-XX:+UseConcMarkSweepGC -Xmx1g -Xms1g</argLine> - <forkCount>2</forkCount> - <forkMode>always</forkMode> - <reuseForks>false</reuseForks> - <systemPropertyVariables> - <blur.tmp.dir>${project.build.directory}/target/tmp</blur.tmp.dir> - </systemPropertyVariables> - </configuration> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> + <artifactId>maven-help-plugin</artifactId> + <version>2.1.1</version> + <executions> + <execution> + <phase>generate-resources</phase> + <goals> + <goal>effective-pom</goal> + </goals> + <configuration> + <output>${project.build.directory}/effective-pom.xml</output> + </configuration> + </execution> + </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> + <artifactId>maven-install-plugin</artifactId> + <version>2.3.1</version> <executions> <execution> + <phase>install</phase> <goals> - <goal>test-jar</goal> + <goal>install-file</goal> </goals> + <configuration> + <file>${project.build.directory}/${artifactId}-${project.version}.jar</file> + <pomFile>${project.build.directory}/effective-pom.xml</pomFile> + <!-- sources></sources --> + <!-- javadoc></javadoc --> + <groupId>${project.groupId}</groupId> + <artifactId>${project.artifactId}</artifactId> + <version>${project.version}</version> + <packaging>jar</packaging> + <!--classifier></classifier --> + <generatePom>true</generatePom> + <createChecksum>true</createChecksum> + </configuration> </execution> </executions> </plugin> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/f677e096/blur-shell/pom.xml ---------------------------------------------------------------------- diff --git a/blur-shell/pom.xml b/blur-shell/pom.xml index c856767..ff6919e 100644 --- a/blur-shell/pom.xml +++ b/blur-shell/pom.xml @@ -52,28 +52,48 @@ <build> <finalName>blur-shell-${project.version}</finalName> - <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>-XX:+UseConcMarkSweepGC -Xmx1g -Xms1g</argLine> - <forkCount>2</forkCount> - <forkMode>always</forkMode> - <reuseForks>false</reuseForks> - <systemPropertyVariables> - <blur.tmp.dir>${project.build.directory}/target/tmp</blur.tmp.dir> - </systemPropertyVariables> - </configuration> + <artifactId>maven-help-plugin</artifactId> + <version>2.1.1</version> + <executions> + <execution> + <phase>generate-resources</phase> + <goals> + <goal>effective-pom</goal> + </goals> + <configuration> + <output>${project.build.directory}/effective-pom.xml</output> + </configuration> + </execution> + </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> + <artifactId>maven-install-plugin</artifactId> + <version>2.3.1</version> + <executions> + <execution> + <phase>install</phase> + <goals> + <goal>install-file</goal> + </goals> + <configuration> + <file>${project.build.directory}/${artifactId}-${project.version}.jar</file> + <pomFile>${project.build.directory}/effective-pom.xml</pomFile> + <!-- sources></sources --> + <!-- javadoc></javadoc --> + <groupId>${project.groupId}</groupId> + <artifactId>${project.artifactId}</artifactId> + <version>${project.version}</version> + <packaging>jar</packaging> + <!--classifier></classifier --> + <generatePom>true</generatePom> + <createChecksum>true</createChecksum> + </configuration> + </execution> + </executions> </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/f677e096/blur-status/pom.xml ---------------------------------------------------------------------- diff --git a/blur-status/pom.xml b/blur-status/pom.xml index 80f7d2d..962f258 100644 --- a/blur-status/pom.xml +++ b/blur-status/pom.xml @@ -70,36 +70,49 @@ </repositories> <build> - <pluginManagement> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>-XX:+UseConcMarkSweepGC -Xmx1g -Xms1g</argLine> - <forkCount>2</forkCount> - <forkMode>always</forkMode> - <reuseForks>false</reuseForks> - <systemPropertyVariables> - <blur.tmp.dir>${project.build.directory}/target/tmp</blur.tmp.dir> - </systemPropertyVariables> - </configuration> - </plugin> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <archiveClasses>true</archiveClasses> - </configuration> + <artifactId>maven-help-plugin</artifactId> + <version>2.1.1</version> + <executions> + <execution> + <phase>generate-resources</phase> + <goals> + <goal>effective-pom</goal> + </goals> + <configuration> + <output>${project.build.directory}/effective-pom.xml</output> + </configuration> + </execution> + </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> + <artifactId>maven-install-plugin</artifactId> + <version>2.3.1</version> + <executions> + <execution> + <phase>install</phase> + <goals> + <goal>install-file</goal> + </goals> + <configuration> + <file>${project.build.directory}/${artifactId}-${project.version}.jar</file> + <pomFile>${project.build.directory}/effective-pom.xml</pomFile> + <!-- sources></sources --> + <!-- javadoc></javadoc --> + <groupId>${project.groupId}</groupId> + <artifactId>${project.artifactId}</artifactId> + <version>${project.version}</version> + <packaging>jar</packaging> + <!--classifier></classifier --> + <generatePom>true</generatePom> + <createChecksum>true</createChecksum> + </configuration> + </execution> + </executions> </plugin> </plugins> - </pluginManagement> </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/f677e096/blur-store/pom.xml ---------------------------------------------------------------------- diff --git a/blur-store/pom.xml b/blur-store/pom.xml index b4ccfb4..a68b348 100644 --- a/blur-store/pom.xml +++ b/blur-store/pom.xml @@ -95,33 +95,54 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>-XX:+UseConcMarkSweepGC -Xmx1g -Xms1g</argLine> - <forkCount>2</forkCount> - <forkMode>always</forkMode> - <reuseForks>false</reuseForks> - <systemPropertyVariables> - <blur.tmp.dir>${project.build.directory}/target/tmp</blur.tmp.dir> - </systemPropertyVariables> - </configuration> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> + <artifactId>maven-help-plugin</artifactId> + <version>2.1.1</version> + <executions> + <execution> + <phase>generate-resources</phase> + <goals> + <goal>effective-pom</goal> + </goals> + <configuration> + <output>${project.build.directory}/effective-pom.xml</output> + </configuration> + </execution> + </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> + <artifactId>maven-install-plugin</artifactId> + <version>2.3.1</version> <executions> <execution> + <phase>install</phase> <goals> - <goal>test-jar</goal> + <goal>install-file</goal> </goals> + <configuration> + <file>${project.build.directory}/${artifactId}-${project.version}.jar</file> + <pomFile>${project.build.directory}/effective-pom.xml</pomFile> + <!-- sources></sources --> + <!-- javadoc></javadoc --> + <groupId>${project.groupId}</groupId> + <artifactId>${project.artifactId}</artifactId> + <version>${project.version}</version> + <packaging>jar</packaging> + <!--classifier></classifier --> + <generatePom>true</generatePom> + <createChecksum>true</createChecksum> + </configuration> </execution> </executions> </plugin> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/f677e096/blur-thrift/pom.xml ---------------------------------------------------------------------- diff --git a/blur-thrift/pom.xml b/blur-thrift/pom.xml index 922cbf4..e57d0e9 100644 --- a/blur-thrift/pom.xml +++ b/blur-thrift/pom.xml @@ -74,42 +74,60 @@ under the License. <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>-XX:+UseConcMarkSweepGC -Xmx1g -Xms1g</argLine> - <forkCount>2</forkCount> - <forkMode>always</forkMode> - <reuseForks>false</reuseForks> - <systemPropertyVariables> - <blur.tmp.dir>${project.build.directory}/target/tmp</blur.tmp.dir> - </systemPropertyVariables> - </configuration> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> + <artifactId>maven-help-plugin</artifactId> + <version>2.1.1</version> + <executions> + <execution> + <phase>generate-resources</phase> + <goals> + <goal>effective-pom</goal> + </goals> + <configuration> + <output>${project.build.directory}/effective-pom.xml</output> + </configuration> + </execution> + </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> + <artifactId>maven-install-plugin</artifactId> + <version>2.3.1</version> <executions> <execution> + <phase>install</phase> <goals> - <goal>test-jar</goal> + <goal>install-file</goal> </goals> + <configuration> + <file>${project.build.directory}/${artifactId}-${project.version}.jar</file> + <pomFile>${project.build.directory}/effective-pom.xml</pomFile> + <!-- sources></sources --> + <!-- javadoc></javadoc --> + <groupId>${project.groupId}</groupId> + <artifactId>${project.artifactId}</artifactId> + <version>${project.version}</version> + <packaging>jar</packaging> + <!--classifier></classifier --> + <generatePom>true</generatePom> + <createChecksum>true</createChecksum> + </configuration> </execution> </executions> </plugin> </plugins> </build> - - - <profiles> <profile> <id>hadoop1</id> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/f677e096/blur-util/pom.xml ---------------------------------------------------------------------- diff --git a/blur-util/pom.xml b/blur-util/pom.xml index 1dce0ae..ceef6f1 100644 --- a/blur-util/pom.xml +++ b/blur-util/pom.xml @@ -110,27 +110,6 @@ under the License. <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>-XX:+UseConcMarkSweepGC -Xmx1g -Xms1g</argLine> - <forkCount>2</forkCount> - <forkMode>always</forkMode> - <reuseForks>false</reuseForks> - <systemPropertyVariables> - <blur.tmp.dir>${project.build.directory}/target/tmp</blur.tmp.dir> - </systemPropertyVariables> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <executions> <execution> @@ -140,25 +119,52 @@ under the License. </execution> </executions> </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> - </configuration> - - <executions> - <execution> - <id>make-assembly</id> - <phase>package</phase> - <goals> - <goal>attached</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </pluginManagement> + <plugins> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-help-plugin</artifactId> + <version>2.1.1</version> + <executions> + <execution> + <phase>generate-resources</phase> + <goals> + <goal>effective-pom</goal> + </goals> + <configuration> + <output>${project.build.directory}/effective-pom.xml</output> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-install-plugin</artifactId> + <version>2.3.1</version> + <executions> + <execution> + <phase>install</phase> + <goals> + <goal>install-file</goal> + </goals> + <configuration> + <file>${project.build.directory}/${artifactId}-${project.version}.jar</file> + <pomFile>${project.build.directory}/effective-pom.xml</pomFile> + <!-- sources></sources --> + <!-- javadoc></javadoc --> + <groupId>${project.groupId}</groupId> + <artifactId>${project.artifactId}</artifactId> + <version>${project.version}</version> + <packaging>jar</packaging> + <!--classifier></classifier --> + <generatePom>true</generatePom> + <createChecksum>true</createChecksum> + </configuration> + </execution> + </executions> + </plugin> + </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/f677e096/contrib/blur-spark/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/blur-spark/pom.xml b/contrib/blur-spark/pom.xml index 880a209..4ad570d 100644 --- a/contrib/blur-spark/pom.xml +++ b/contrib/blur-spark/pom.xml @@ -41,31 +41,6 @@ </repositories> <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>-XX:+UseConcMarkSweepGC -Xmx1g -Xms1g</argLine> - <forkCount>2</forkCount> - <forkMode>always</forkMode> - <reuseForks>false</reuseForks> - <systemPropertyVariables> - <blur.tmp.dir>${project.build.directory}/target/tmp</blur.tmp.dir> - </systemPropertyVariables> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - </plugins> - </pluginManagement> <resources> <resource> <directory>src/main/resources/services</directory> @@ -94,6 +69,49 @@ </execution> </executions> </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-help-plugin</artifactId> + <version>2.1.1</version> + <executions> + <execution> + <phase>generate-resources</phase> + <goals> + <goal>effective-pom</goal> + </goals> + <configuration> + <output>${project.build.directory}/effective-pom.xml</output> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-install-plugin</artifactId> + <version>2.3.1</version> + <executions> + <execution> + <phase>install</phase> + <goals> + <goal>install-file</goal> + </goals> + <configuration> + <file>${project.build.directory}/${artifactId}-${project.version}.jar</file> + <pomFile>${project.build.directory}/effective-pom.xml</pomFile> + <!-- sources></sources --> + <!-- javadoc></javadoc --> + <groupId>${project.groupId}</groupId> + <artifactId>${project.artifactId}</artifactId> + <version>${project.version}</version> + <packaging>jar</packaging> + <!--classifier></classifier --> + <generatePom>true</generatePom> + <createChecksum>true</createChecksum> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/f677e096/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 491b6aa..b5911a7 100644 --- a/pom.xml +++ b/pom.xml @@ -395,6 +395,14 @@ under the License. <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> <argLine>-XX:+UseConcMarkSweepGC -Xmx1g -Xms1g -XX:MaxPermSize=256m</argLine>
