diff options
| author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2017-09-07 14:34:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-07 14:34:53 +0200 |
| commit | cacf9446075f14297060a56a1cec41700e321825 (patch) | |
| tree | f5da2e370b671e864022a8ba714c5c0aecbf2a5a | |
| parent | 96c7b6bb6930a2340680d055a0c8b2e11bc69d81 (diff) | |
| parent | 37dc419b5071ef665ec260b5865c50c2d7ce07b5 (diff) | |
Merge pull request #3362 from vespa-engine/gjoranv/remove-fat-model-import
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 8183fcdaf15..2cd6efe6bb9 100644 --- a/config-model-fat/pom.xml +++ b/config-model-fat/pom.xml @@ -321,7 +321,6 @@ <!-- 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 928dea20e46..ec8ae6bb227 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)--> <groupId>xml-apis</groupId> <artifactId>xml-apis</artifactId> <version>1.4.01</version> |