AMBARI-21380. Force to use JDK 8 for Ambari Server maven build (oleewere)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/aba2db1f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/aba2db1f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/aba2db1f Branch: refs/heads/branch-feature-logsearch-ui Commit: aba2db1f5351296af8fae627a22858b907a1c90f Parents: 137ad20 Author: oleewere <oleew...@gmail.com> Authored: Mon Jul 3 14:01:21 2017 +0200 Committer: oleewere <oleew...@gmail.com> Committed: Tue Jul 4 13:55:01 2017 +0200 ---------------------------------------------------------------------- ambari-server/pom.xml | 5 ++++- .../controller/internal/ClientConfigResourceProviderTest.java | 2 +- .../ambari/server/view/persistence/DataStoreImplTest.java | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/aba2db1f/ambari-server/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml index 4b75d9b..878665e 100644 --- a/ambari-server/pom.xml +++ b/ambari-server/pom.xml @@ -51,6 +51,7 @@ <empty.dir>src/main/package</empty.dir> <!-- any directory in project with not very big amount of files (not to waste-load them) --> <el.log>ALL</el.log> <!-- log level for EclipseLink eclipselink-staticweave-maven-plugin --> <xlint>none</xlint> <!-- passed to Java compiler -Xlint: flag --> + <jdk.version>1.8</jdk.version> </properties> <build> <plugins> @@ -111,6 +112,8 @@ <artifactId>maven-compiler-plugin</artifactId> <version>3.2</version> <configuration> + <source>${jdk.version}</source> + <target>${jdk.version}</target> <useIncrementalCompilation>false</useIncrementalCompilation> <compilerArgs> <arg>-Xlint:${xlint}</arg> @@ -716,7 +719,7 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <skip>${skipSurefireTests}</skip> - <argLine>-Xmx1024m -XX:MaxPermSize=512m -Xms512m</argLine> + <argLine>-Xmx1024m -Xms512m</argLine> <!-- Each profile in the top-level pom.xml defines which test group categories to run. --> <groups>${testcase.groups}</groups> http://git-wip-us.apache.org/repos/asf/ambari/blob/aba2db1f/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java index 1f906ad..3ccb375 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java @@ -594,10 +594,10 @@ public class ClientConfigResourceProviderTest { expect(configHelper.getPropertyValuesWithPropertyType(stackId, PropertyInfo.PropertyType.USER, cluster, desiredConfigMap)).andReturn(userSet); PowerMock.expectNew(File.class, new Class<?>[]{String.class}, anyObject(String.class)).andReturn(mockFile).anyTimes(); PowerMock.mockStatic(File.class); + expect(mockFile.exists()).andReturn(true); expect(File.createTempFile(anyString(), anyString(), anyObject(File.class))).andReturn(PowerMock.createNiceMock(File.class)); PowerMock.createNiceMockAndExpectNew(PrintWriter.class, anyObject()); PowerMock.mockStatic(Runtime.class); - expect(mockFile.exists()).andReturn(true); String commandLine = "ambari-python-wrap " + commonServicesPath + "/PIG/package/null generate_configs null " + commonServicesPath + "/PIG/package /var/lib/ambari-server/tmp/structured-out.json " + "INFO /var/lib/ambari-server/tmp"; http://git-wip-us.apache.org/repos/asf/ambari/blob/aba2db1f/ambari-server/src/test/java/org/apache/ambari/server/view/persistence/DataStoreImplTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/view/persistence/DataStoreImplTest.java b/ambari-server/src/test/java/org/apache/ambari/server/view/persistence/DataStoreImplTest.java index fd3f4e4..9bdaf5d 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/view/persistence/DataStoreImplTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/view/persistence/DataStoreImplTest.java @@ -164,9 +164,9 @@ public class DataStoreImplTest { dataStore.store(new TestEntity("foo", new TestSubEntity("bar"))); Assert.assertEquals("bar", entityCapture.getValue().get("DS_name")); - Assert.assertEquals(99, entityCapture.getValue().get("DS_id")); + Assert.assertEquals(99, (int) entityCapture.getValue().get("DS_id")); - Assert.assertEquals(100, entityCapture2.getValue().get("DS_id")); + Assert.assertEquals(100, (int) entityCapture2.getValue().get("DS_id")); Assert.assertEquals("foo", entityCapture2.getValue().get("DS_name")); // verify mocks