Update fluo-parent to version 3 (#10)
* Update parent POM to fluo-parent version 3
* Apply formatter changes (usually would go in a separate commit, but
the changeset was small enough that it didn't matter here)
diff --git a/core/src/main/java/org/apache/fluo/yarn/core/FluoYarnLauncher.java b/core/src/main/java/org/apache/fluo/yarn/core/FluoYarnLauncher.java
index 838bd13..e1b8887 100644
--- a/core/src/main/java/org/apache/fluo/yarn/core/FluoYarnLauncher.java
+++ b/core/src/main/java/org/apache/fluo/yarn/core/FluoYarnLauncher.java
@@ -62,8 +62,8 @@
.setInstances(env.getWorkerInstances()).build();
return TwillSpecification.Builder.with().setName("fluo-app-" + env.getApplicationName())
- .withRunnable().add(ORACLE_ID, new BundledJarRunnable(), oracleResources)
- .withLocalFiles().add(env.getBundledJarName(), new File(env.getBundledJarPath()), false)
+ .withRunnable().add(ORACLE_ID, new BundledJarRunnable(), oracleResources).withLocalFiles()
+ .add(env.getBundledJarName(), new File(env.getBundledJarPath()), false)
.add(CONN_PROPS, new File(env.getConnPropsPath()), false)
.add(LOG4J_PROPS, new File(env.getLogPropsPath()), false).apply()
.add(WORKER_ID, new BundledJarRunnable(), workerResources).withLocalFiles()
@@ -119,12 +119,11 @@
new YarnTwillRunnerService(env.getYarnConfiguration(), env.getZookeepers());
twillRunner.start();
- TwillPreparer preparer =
- twillRunner.prepare(new FluoYarnApp(env))
- .addJVMOptions("-Dlog4j.configuration=file:$PWD/" + LOG4J_PROPS)
- .addJVMOptions(("-Dfluo.conn.props=" + CONN_PROPS))
- .withArguments(ORACLE_ID, oracleArgs.toArray())
- .withArguments(WORKER_ID, workerArgs.toArray());
+ TwillPreparer preparer = twillRunner.prepare(new FluoYarnApp(env))
+ .addJVMOptions("-Dlog4j.configuration=file:$PWD/" + LOG4J_PROPS)
+ .addJVMOptions(("-Dfluo.conn.props=" + CONN_PROPS))
+ .withArguments(ORACLE_ID, oracleArgs.toArray())
+ .withArguments(WORKER_ID, workerArgs.toArray());
TwillController controller = preparer.start();
diff --git a/pom.xml b/pom.xml
index 8d1df30..00cda0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.fluo</groupId>
<artifactId>fluo-parent</artifactId>
- <version>1-incubating</version>
+ <version>3</version>
</parent>
<artifactId>fluo-yarn-project</artifactId>
<version>1.0.0-SNAPSHOT</version>