Repository: bahir Updated Branches: refs/heads/master c7f158d86 -> a70ff538a
[BAHIR-125] Update Bahir parent pom - Default build using JAVA 8 - Update dependencies to align with Spark 2.2.0 Project: http://git-wip-us.apache.org/repos/asf/bahir/repo Commit: http://git-wip-us.apache.org/repos/asf/bahir/commit/a70ff538 Tree: http://git-wip-us.apache.org/repos/asf/bahir/tree/a70ff538 Diff: http://git-wip-us.apache.org/repos/asf/bahir/diff/a70ff538 Branch: refs/heads/master Commit: a70ff538ac48ac1576984304d273e7a1f25fc2a6 Parents: 5b76e62 Author: Luciano Resende <[email protected]> Authored: Wed Jul 26 10:33:04 2017 -0700 Committer: Luciano Resende <[email protected]> Committed: Wed Jul 26 10:38:37 2017 -0700 ---------------------------------------------------------------------- pom.xml | 79 ++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 45 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bahir/blob/a70ff538/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 832787e..60fbe55 100644 --- a/pom.xml +++ b/pom.xml @@ -90,11 +90,11 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <!-- General project dependencies version --> - <java.version>1.7</java.version> + <java.version>1.8</java.version> + <maven.version>3.3.9</maven.version> <scala.version>2.11.8</scala.version> <scala.binary.version>2.11</scala.binary.version> - <maven.version>3.3.9</maven.version> <slf4j.version>1.7.16</slf4j.version> <log4j.version>1.2.17</log4j.version> @@ -474,7 +474,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>1.10</version> + <version>3.0.0</version> </plugin> <plugin> <groupId>net.alchim31.maven</groupId> @@ -526,8 +526,6 @@ <jvmArgs> <jvmArg>-Xms1024m</jvmArg> <jvmArg>-Xmx1024m</jvmArg> - <jvmArg>-XX:PermSize=${PermGen}</jvmArg> - <jvmArg>-XX:MaxPermSize=${MaxPermGen}</jvmArg> <jvmArg>-XX:ReservedCodeCacheSize=${CodeCacheSize}</jvmArg> </jvmArgs> <javacArgs> @@ -542,7 +540,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.5.1</version> + <version>3.6.1</version> <configuration> <source>${java.version}</source> <target>${java.version}</target> @@ -569,7 +567,7 @@ <include>**/*Suite.java</include> </includes> <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory> - <argLine>-Xmx3g -Xss4096k -XX:MaxPermSize=${MaxPermGen} -XX:ReservedCodeCacheSize=512m</argLine> + <argLine>-Xmx3g -Xss4096k -XX:ReservedCodeCacheSize=${CodeCacheSize}</argLine> <environmentVariables> <!-- Setting SPARK_DIST_CLASSPATH is a simple way to make sure any child processes @@ -618,7 +616,7 @@ <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory> <junitxml>.</junitxml> <filereports>SparkTestSuite.txt</filereports> - <argLine>-ea -Xmx3g -XX:MaxPermSize=${MaxPermGen} -XX:ReservedCodeCacheSize=${CodeCacheSize}</argLine> + <argLine>-ea -Xmx3g -XX:ReservedCodeCacheSize=${CodeCacheSize}</argLine> <stderr /> <environmentVariables> <!-- @@ -659,7 +657,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.6</version> + <version>3.0.2</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -669,7 +667,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> - <version>2.4</version> + <version>3.0.1</version> <configuration> <attach>true</attach> </configuration> @@ -704,20 +702,52 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.3</version> + <version>2.10.4</version> <configuration> - <skip>true</skip> + <additionalparam>-Xdoclint:all -Xdoclint:-missing</additionalparam> + <tags> + <tag> + <name>example</name> + <placement>a</placement> + <head>Example:</head> + </tag> + <tag> + <name>note</name> + <placement>a</placement> + <head>Note:</head> + </tag> + <tag> + <name>group</name> + <placement>X</placement> + </tag> + <tag> + <name>tparam</name> + <placement>X</placement> + </tag> + <tag> + <name>constructor</name> + <placement>X</placement> + </tag> + <tag> + <name>todo</name> + <placement>X</placement> + </tag> + <tag> + <name>groupname</name> + <placement>X</placement> + </tag> + </tags> </configuration> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> - <version>1.4.0</version> + <version>1.5.0</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>2.6</version> + <version>3.0.0</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -732,6 +762,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> + <version>3.0.0</version> <executions> <execution> <id>default-cli</id> @@ -759,7 +790,6 @@ <pluginExecutionFilter> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <versionRange>[2.8,)</versionRange> <goals> <goal>build-classpath</goal> </goals> @@ -1011,25 +1041,6 @@ </profile> <profile> - <id>doclint-java8-disable</id> - <activation> - <jdk>[1.8,)</jdk> - </activation> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <additionalparam>-Xdoclint:all -Xdoclint:-missing</additionalparam> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <profile> <id>scala-2.10</id> <activation> <property><name>scala-2.10</name></property>
