diff options
| author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2017-09-07 16:21:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-07 16:21:57 +0200 |
| commit | 2347c374696c935f0a09a0654e3e376b9436d6dd (patch) | |
| tree | 5be834e1e0fedecf4a02172a09a4849d8ffd656f | |
| parent | efaf26505a17133cc51c833be701cd58f9fd1aff (diff) | |
| parent | 289d85436675b49cf226ffa0edc0004f7286e536 (diff) | |
Merge pull request #3365 from vespa-engine/revert-3362-gjoranv/remove-fat-model-import
Revert "Gjoranv/remove fat model import"
| -rw-r--r-- | config-model-fat/pom.xml | 1 | ||||
| -rw-r--r-- | jdisc_core/pom.xml | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/config-model-fat/pom.xml b/config-model-fat/pom.xml index 2cd6efe6bb9..8183fcdaf15 100644 --- a/config-model-fat/pom.xml +++ b/config-model-fat/pom.xml @@ -321,6 +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 --> </Import-Package> </instructions> </configuration> diff --git a/jdisc_core/pom.xml b/jdisc_core/pom.xml index ec8ae6bb227..928dea20e46 100644 --- a/jdisc_core/pom.xml +++ b/jdisc_core/pom.xml @@ -16,7 +16,6 @@ <name>${project.artifactId}</name> <dependencies> <dependency> - <!-- Newer version than the one in rt.jar, including the ElementTraversal class needed by Xerces (Aug. 2015)--> <groupId>xml-apis</groupId> <artifactId>xml-apis</artifactId> <version>1.4.01</version> |