diff options
| author | Jon Bratseth <bratseth@gmail.com> | 2021-09-27 07:08:36 +0000 |
|---|---|---|
| committer | Jon Bratseth <bratseth@gmail.com> | 2021-09-27 07:08:36 +0000 |
| commit | fe64026f259df982a7c5a5bdf093603dfb3e486d (patch) | |
| tree | af2eb9124be1bcec9c359a8029ef1425eea3afdb /container-disc/pom.xml | |
| parent | 4f0e63ee85a845b4b959bd70a9661b63cb590344 (diff) | |
| parent | 9377da84086392e118d69b467006e73fe9ae3f70 (diff) | |
Merge branch 'master' into bratseth/linguistics-components
Conflicts:
linguistics-components/src/main/resources/configdefinitions/sentence-piece.def
linguistics/src/main/resources/configdefinitions/language.sentencepiece.sentence-piece.def
linguistics/src/main/resources/configdefinitions/sentence-piece.def
Diffstat (limited to 'container-disc/pom.xml')
| -rw-r--r-- | container-disc/pom.xml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/container-disc/pom.xml b/container-disc/pom.xml index f72348707c2..7d6a1ebb9d5 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -167,7 +167,6 @@ <buildLegacyVespaPlatformBundle>true</buildLegacyVespaPlatformBundle> <discPreInstallBundle> <!-- Vespa bundles --> - configgen.jar, config-bundle-jar-with-dependencies.jar, configdefinitions-jar-with-dependencies.jar, container-search-and-docproc-jar-with-dependencies.jar, @@ -179,7 +178,6 @@ vespaclient-container-plugin-jar-with-dependencies.jar, vespa-athenz-jar-with-dependencies.jar, security-utils-jar-with-dependencies.jar, - defaults-jar-with-dependencies.jar, zkfacade-jar-with-dependencies.jar, zookeeper-server-jar-with-dependencies.jar, <!-- Apache http client repackaged as bundle --> |