Repository: incubator-brooklyn Updated Branches: refs/heads/master 1ae252737 -> b08572fa7
Use javac to compile non-test code Still use groovy-eclipse for test-support & groovy-utils due to existing .groovy code. Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/c34812c6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/c34812c6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/c34812c6 Branch: refs/heads/master Commit: c34812c66a46ebac2fe95a808b257fdf92ec70e3 Parents: 7234b83 Author: Svetoslav Neykov <[email protected]> Authored: Sat Jan 24 23:22:39 2015 +0200 Committer: Svetoslav Neykov <[email protected]> Committed: Sat Jan 24 23:22:39 2015 +0200 ---------------------------------------------------------------------- .../brooklyn/management/ha/BasicMasterChooser.java | 4 +++- pom.xml | 9 ++++++++- .../effector/BrooklynNodeUpgradeEffectorBody.java | 2 +- .../brooklyn/entity/brooklynnode/BrooklynNodeTest.java | 2 +- .../brooklyn/entity/nosql/riak/RiakNodeSshDriver.java | 4 ++-- usage/test-support/pom.xml | 11 +++++++++++ utils/groovy/pom.xml | 13 ++++++++++++- 7 files changed, 38 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c34812c6/core/src/main/java/brooklyn/management/ha/BasicMasterChooser.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/ha/BasicMasterChooser.java b/core/src/main/java/brooklyn/management/ha/BasicMasterChooser.java index 80f40d0..47ebf43 100644 --- a/core/src/main/java/brooklyn/management/ha/BasicMasterChooser.java +++ b/core/src/main/java/brooklyn/management/ha/BasicMasterChooser.java @@ -179,8 +179,10 @@ public abstract class BasicMasterChooser implements MasterChooser { } @VisibleForTesting + //Java 6 compiler workaround, using parameterized types fails + @SuppressWarnings({ "unchecked", "rawtypes" }) protected List<ScoredRecord<?>> sort(List<ScoredRecord<?>> input) { - ArrayList<ScoredRecord<?>> copy = new ArrayList<ScoredRecord<?>>(input); + ArrayList copy = new ArrayList<ScoredRecord<?>>(input); Collections.sort(copy); return copy; } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c34812c6/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 2cad93a..793d70f 100644 --- a/pom.xml +++ b/pom.xml @@ -1111,10 +1111,17 @@ <artifactId>maven-compiler-plugin</artifactId> <inherited>true</inherited> <configuration> - <compilerId>groovy-eclipse-compiler</compilerId> <fork>true</fork> <verbose>false</verbose> </configuration> + <executions> + <execution> + <id>default-testCompile</id> + <configuration> + <compilerId>groovy-eclipse-compiler</compilerId> + </configuration> + </execution> + </executions> <dependencies> <dependency> <groupId>org.codehaus.groovy</groupId> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c34812c6/software/base/src/main/java/brooklyn/entity/brooklynnode/effector/BrooklynNodeUpgradeEffectorBody.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/brooklynnode/effector/BrooklynNodeUpgradeEffectorBody.java b/software/base/src/main/java/brooklyn/entity/brooklynnode/effector/BrooklynNodeUpgradeEffectorBody.java index 265b3f7..1a2d5e1 100644 --- a/software/base/src/main/java/brooklyn/entity/brooklynnode/effector/BrooklynNodeUpgradeEffectorBody.java +++ b/software/base/src/main/java/brooklyn/entity/brooklynnode/effector/BrooklynNodeUpgradeEffectorBody.java @@ -159,7 +159,7 @@ public class BrooklynNodeUpgradeEffectorBody extends EffectorBody<Void> { }).build()); DynamicTasks.waitForLast(); - entity().setConfig(SoftwareProcess.INSTALL_UNIQUE_LABEL, null); + entity().setConfig(SoftwareProcess.INSTALL_UNIQUE_LABEL, (String)null); entity().getConfigMap().addToLocalBag(parameters.getAllConfig()); ((BrooklynNodeDriver)((DriverDependentEntity<?>)entity()).getDriver()).clearInstallDir(); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c34812c6/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java b/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java index d1a9390..cc52b9d 100644 --- a/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java +++ b/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java @@ -74,7 +74,7 @@ public class BrooklynNodeTest { // TODO Using BrooklynNodeImpl directly, because want to instantiate a BroolynNodeSshDriver. // Really want to make that easier to test, without going through "wrong" code path for creating entity. BrooklynNodeImpl entity = new BrooklynNodeImpl(); - entity.configure(BrooklynNode.SUGGESTED_VERSION, version); + entity.setConfig(BrooklynNode.SUGGESTED_VERSION, version); entity.setParent(app); Entities.manage(entity); ConfigToAttributes.apply(entity); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c34812c6/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java b/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java index 090a85a..8e3e28c 100644 --- a/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java +++ b/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java @@ -126,11 +126,11 @@ public class RiakNodeSshDriver extends AbstractSoftwareProcessSshDriver implemen // TODO osDetails.getName() is returning "linux", instead of debian/ubuntu on AWS with jenkins image, // running as integration test targetting localhost. // TODO Debian support (default debian image fails with 'sudo: command not found') - downloadUrl = entity.getAttribute(RiakNode.DOWNLOAD_URL_DEBIAN); + downloadUrl = (String)entity.getAttribute(RiakNode.DOWNLOAD_URL_DEBIAN); osReleaseCmd = osDetails.getVersion().substring(0, osDetails.getVersion().indexOf(".")); } else { // assume Ubuntu - downloadUrl = entity.getAttribute(RiakNode.DOWNLOAD_URL_UBUNTU); + downloadUrl = (String)entity.getAttribute(RiakNode.DOWNLOAD_URL_UBUNTU); osReleaseCmd = "`lsb_release -sc` && " + "export OS_RELEASE=`([[ \"lucid natty precise\" =~ (^| )\\$OS_RELEASE($| ) ]] && echo $OS_RELEASE || echo precise)`"; } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c34812c6/usage/test-support/pom.xml ---------------------------------------------------------------------- diff --git a/usage/test-support/pom.xml b/usage/test-support/pom.xml index 9f15b7d..47dbc60 100644 --- a/usage/test-support/pom.xml +++ b/usage/test-support/pom.xml @@ -65,4 +65,15 @@ <artifactId>groovy-all</artifactId> </dependency> </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <inherited>true</inherited> + <configuration> + <compilerId>groovy-eclipse-compiler</compilerId> + </configuration> + </plugin> + </plugins> + </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c34812c6/utils/groovy/pom.xml ---------------------------------------------------------------------- diff --git a/utils/groovy/pom.xml b/utils/groovy/pom.xml index 2542077..ef71f24 100644 --- a/utils/groovy/pom.xml +++ b/utils/groovy/pom.xml @@ -67,5 +67,16 @@ <artifactId>groovy-all</artifactId> </dependency> </dependencies> - + + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <inherited>true</inherited> + <configuration> + <compilerId>groovy-eclipse-compiler</compilerId> + </configuration> + </plugin> + </plugins> + </build> </project>
