|
@@ -90,7 +90,7 @@
|
|
|
<httpcore.version>4.4.4</httpcore.version>
|
|
|
<jackson.version>2.9.5</jackson.version>
|
|
|
<javax.servlet-api.version>3.1.0</javax.servlet-api.version>
|
|
|
- <jetty.version>9.2.16.v20160414</jetty.version>
|
|
|
+ <jetty.version>9.3.8.v20160314</jetty.version>
|
|
|
<json4s.version>3.2.10</json4s.version>
|
|
|
<junit.version>4.11</junit.version>
|
|
|
<libthrift.version>0.9.3</libthrift.version>
|
|
@@ -108,9 +108,7 @@
|
|
|
<scala.version>${scala-2.11.version}</scala.version>
|
|
|
<scalatest.version>2.2.4</scalatest.version>
|
|
|
<scalatra.version>2.3.0</scalatra.version>
|
|
|
- <java.version>1.7</java.version>
|
|
|
- <minJavaVersion>1.7</minJavaVersion>
|
|
|
- <maxJavaVersion>1.8</maxJavaVersion>
|
|
|
+ <java.version>1.8</java.version>
|
|
|
<test.redirectToFile>true</test.redirectToFile>
|
|
|
<execution.root>${user.dir}</execution.root>
|
|
|
<spark.home>${execution.root}/dev/spark</spark.home>
|
|
@@ -578,26 +576,6 @@
|
|
|
<build>
|
|
|
<pluginManagement>
|
|
|
<plugins>
|
|
|
- <plugin>
|
|
|
- <groupId>org.apache.maven.plugins</groupId>
|
|
|
- <artifactId>maven-enforcer-plugin</artifactId>
|
|
|
- <version>1.4.1</version>
|
|
|
- <executions>
|
|
|
- <execution>
|
|
|
- <id>enforce-versions</id>
|
|
|
- <goals>
|
|
|
- <goal>enforce</goal>
|
|
|
- </goals>
|
|
|
- <configuration>
|
|
|
- <rules>
|
|
|
- <requireJavaVersion>
|
|
|
- <version>1.7</version>
|
|
|
- </requireJavaVersion>
|
|
|
- </rules>
|
|
|
- </configuration>
|
|
|
- </execution>
|
|
|
- </executions>
|
|
|
- </plugin>
|
|
|
<plugin>
|
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
|
<artifactId>maven-compiler-plugin</artifactId>
|
|
@@ -675,7 +653,6 @@
|
|
|
<jvmArgs>
|
|
|
<jvmArg>-Xms1024m</jvmArg>
|
|
|
<jvmArg>-Xmx1024m</jvmArg>
|
|
|
- <jvmArg>-XX:MaxPermSize=${MaxPermGen}</jvmArg>
|
|
|
<jvmArg>-XX:ReservedCodeCacheSize=${CodeCacheSize}</jvmArg>
|
|
|
</jvmArgs>
|
|
|
</configuration>
|
|
@@ -714,7 +691,7 @@
|
|
|
</systemProperties>
|
|
|
<redirectTestOutputToFile>${test.redirectToFile}</redirectTestOutputToFile>
|
|
|
<useFile>${test.redirectToFile}</useFile>
|
|
|
- <argLine>${argLine} -Xmx2g -XX:MaxPermSize=512m</argLine>
|
|
|
+ <argLine>${argLine} -Xmx2g</argLine>
|
|
|
<failIfNoTests>false</failIfNoTests>
|
|
|
</configuration>
|
|
|
</plugin>
|
|
@@ -743,7 +720,7 @@
|
|
|
<reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
|
|
|
<junitxml>.</junitxml>
|
|
|
<filereports>WDF TestSuite.txt</filereports>
|
|
|
- <argLine>${argLine} -Xmx2g -XX:MaxPermSize=512m</argLine>
|
|
|
+ <argLine>${argLine} -Xmx2g</argLine>
|
|
|
</configuration>
|
|
|
<executions>
|
|
|
<execution>
|
|
@@ -818,25 +795,18 @@
|
|
|
<inherited>false</inherited>
|
|
|
<configuration>
|
|
|
<rules>
|
|
|
+ <requireJavaVersion>
|
|
|
+ <version>${java.version}</version>
|
|
|
+ </requireJavaVersion>
|
|
|
<requireMavenVersion>
|
|
|
<version>[3.0.0,)</version>
|
|
|
</requireMavenVersion>
|
|
|
- <requireJavaVersion>
|
|
|
- <version>[${minJavaVersion}.0,${maxJavaVersion}.1000}]</version>
|
|
|
- </requireJavaVersion>
|
|
|
<requireOS>
|
|
|
<family>unix</family>
|
|
|
</requireOS>
|
|
|
</rules>
|
|
|
</configuration>
|
|
|
<executions>
|
|
|
- <execution>
|
|
|
- <id>clean</id>
|
|
|
- <goals>
|
|
|
- <goal>enforce</goal>
|
|
|
- </goals>
|
|
|
- <phase>pre-clean</phase>
|
|
|
- </execution>
|
|
|
<execution>
|
|
|
<id>default</id>
|
|
|
<goals>
|
|
@@ -844,13 +814,6 @@
|
|
|
</goals>
|
|
|
<phase>validate</phase>
|
|
|
</execution>
|
|
|
- <execution>
|
|
|
- <id>site</id>
|
|
|
- <goals>
|
|
|
- <goal>enforce</goal>
|
|
|
- </goals>
|
|
|
- <phase>pre-site</phase>
|
|
|
- </execution>
|
|
|
</executions>
|
|
|
</plugin>
|
|
|
|
|
@@ -996,7 +959,7 @@
|
|
|
<plugin>
|
|
|
<groupId>org.jacoco</groupId>
|
|
|
<artifactId>jacoco-maven-plugin</artifactId>
|
|
|
- <version>0.7.7.201606060606</version>
|
|
|
+ <version>0.8.2</version>
|
|
|
<executions>
|
|
|
<execution>
|
|
|
<goals>
|
|
@@ -1065,33 +1028,6 @@
|
|
|
<modules>
|
|
|
<module>thriftserver/server</module>
|
|
|
</modules>
|
|
|
- <properties>
|
|
|
- <jetty.version>9.3.8.v20160314</jetty.version>
|
|
|
- </properties>
|
|
|
-
|
|
|
- <build>
|
|
|
- <plugins>
|
|
|
- <plugin>
|
|
|
- <groupId>org.apache.maven.plugins</groupId>
|
|
|
- <artifactId>maven-enforcer-plugin</artifactId>
|
|
|
- <executions>
|
|
|
- <execution>
|
|
|
- <id>enforce-java</id>
|
|
|
- <goals>
|
|
|
- <goal>enforce</goal>
|
|
|
- </goals>
|
|
|
- <configuration>
|
|
|
- <rules>
|
|
|
- <requireJavaVersion>
|
|
|
- <version>1.8</version>
|
|
|
- </requireJavaVersion>
|
|
|
- </rules>
|
|
|
- </configuration>
|
|
|
- </execution>
|
|
|
- </executions>
|
|
|
- </plugin>
|
|
|
- </plugins>
|
|
|
- </build>
|
|
|
</profile>
|
|
|
|
|
|
<!-- Spark version profiles -->
|
|
@@ -1184,7 +1120,6 @@
|
|
|
<spark.scala-2.11.version>2.2.0</spark.scala-2.11.version>
|
|
|
<spark.scala-2.10.version>2.2.0</spark.scala-2.10.version>
|
|
|
<spark.version>${spark.scala-2.11.version}</spark.version>
|
|
|
- <java.version>1.8</java.version>
|
|
|
<py4j.version>0.10.4</py4j.version>
|
|
|
<json4s.version>3.2.11</json4s.version>
|
|
|
</properties>
|
|
@@ -1218,7 +1153,6 @@
|
|
|
<spark.version>${spark.scala-2.11.version}</spark.version>
|
|
|
<netty.spark-2.11.version>4.1.17.Final</netty.spark-2.11.version>
|
|
|
<netty.spark-2.10.version>4.0.37.Final</netty.spark-2.10.version>
|
|
|
- <java.version>1.8</java.version>
|
|
|
<py4j.version>0.10.7</py4j.version>
|
|
|
<json4s.version>3.2.11</json4s.version>
|
|
|
</properties>
|