diff options
| author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2017-09-08 12:24:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-08 12:24:33 +0200 |
| commit | af5937b760251766bce1bebc55f3fb645c2d1e92 (patch) | |
| tree | d41e4aea4b755943ff4fe1ea174dd08d4e78df70 | |
| parent | 4b821bdd5b86945bd18dfbf17d418c48e813b5b3 (diff) | |
| parent | 8f7bcbcf0955b38b9f7d11514eb309a272615534 (diff) | |
Merge pull request #3369 from vespa-engine/gjoranv/lessons-learned
Gjoranv/lessons learned
| -rw-r--r-- | config-model-fat/pom.xml | 2 | ||||
| -rw-r--r-- | config/src/main/java/com/yahoo/vespa/config/buildergen/ConfigDefinition.java | 7 | ||||
| -rw-r--r-- | jdisc_core/pom.xml | 1 |
3 files changed, 2 insertions, 8 deletions
diff --git a/config-model-fat/pom.xml b/config-model-fat/pom.xml index 8183fcdaf15..4e7af809ce7 100644 --- a/config-model-fat/pom.xml +++ b/config-model-fat/pom.xml @@ -321,7 +321,7 @@ <!-- TODO: The fat bundle becomes more brittle for each package added below. Use interfaces in model-api instead. --> com.yahoo.vespa.config, com.yahoo.vespa.config.buildergen, - com.yahoo.config.codegen <!-- TODO remove when InnerCNode is no longer exposed by model-api --> + com.yahoo.config.codegen <!-- TODO remove when InnerCNode is no longer exposed by config-bundle via ConfigDefinition.getCNode() --> </Import-Package> </instructions> </configuration> diff --git a/config/src/main/java/com/yahoo/vespa/config/buildergen/ConfigDefinition.java b/config/src/main/java/com/yahoo/vespa/config/buildergen/ConfigDefinition.java index 72b8940ac93..e257c517e86 100644 --- a/config/src/main/java/com/yahoo/vespa/config/buildergen/ConfigDefinition.java +++ b/config/src/main/java/com/yahoo/vespa/config/buildergen/ConfigDefinition.java @@ -26,13 +26,6 @@ public class ConfigDefinition { this.cnode = new DefParser(name, new StringReader(StringUtilities.implode(defSchema, "\n"))).getTree(); } - // TODO: Remove once no fat bundles are using this. - public ConfigDefinition(InnerCNode targetDef) { - this.name = null; - this.defSchema = null; - this.cnode = targetDef; - } - public InnerCNode getCNode() { return cnode; } diff --git a/jdisc_core/pom.xml b/jdisc_core/pom.xml index 928dea20e46..fb8200eb610 100644 --- a/jdisc_core/pom.xml +++ b/jdisc_core/pom.xml @@ -16,6 +16,7 @@ <name>${project.artifactId}</name> <dependencies> <dependency> + <!-- Newer version than the one in rt.jar, including the ElementTraversal class needed by Xerces (Aug 2015, still valid Sep 2017) --> <groupId>xml-apis</groupId> <artifactId>xml-apis</artifactId> <version>1.4.01</version> |