diff options
author | Arnstein Ressem <aressem@gmail.com> | 2017-06-09 13:28:22 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-09 13:28:22 +0200 |
commit | cb8f250c5d3771510d95bc31269e8b8d6d47ba00 (patch) | |
tree | 1b51c5fc517c11d300e979623c03d768f31b89f7 | |
parent | 734504386d4f156457f7079e68d5f4cc0b9cbc50 (diff) | |
parent | cff28f44e27ed0b5508c19957d119983a7e3bc25 (diff) |
Merge pull request #2689 from yahoo/bratseth/correct-java-build
Bratseth/correct java build
3 files changed, 3 insertions, 3 deletions
diff --git a/README.md b/README.md index 8c2e915a93b..5658929e693 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,8 @@ or use the prebuilt docker image ### Build Java modules Java modules can be built on any environment having Java and Maven: - sh bootstrap.sh java + sh bootstrap.sh + mvn install ### Build C++ modules `<builddir>` should be replaced with the name of the directory in which you'd like to build Vespa. `<sourcedir>` should be replaced with the directory in which you've cloned/unpacked the source tree. diff --git a/container-search/src/main/java/com/yahoo/search/query/Model.java b/container-search/src/main/java/com/yahoo/search/query/Model.java index 5b2694b6dfd..5de24484e1a 100644 --- a/container-search/src/main/java/com/yahoo/search/query/Model.java +++ b/container-search/src/main/java/com/yahoo/search/query/Model.java @@ -47,7 +47,7 @@ public class Model implements Cloneable { public static final String RESTRICT = "restrict"; static { - argumentType =new QueryProfileType(MODEL); + argumentType = new QueryProfileType(MODEL); argumentType.setStrict(true); argumentType.setBuiltin(true); //argumentType.addField(new FieldDescription(PROGRAM, "string", "yql")); // TODO: Custom type diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirer.java index 6d16aad7962..9c3b24b8aa8 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirer.java @@ -24,7 +24,6 @@ import java.util.logging.Level; * reconfigured after inactivation. * * @author bratseth - * @version $Id$ */ public class RetiredExpirer extends Expirer { |