From 5341e60a1f0fb0c47ad45b92f7e9622c3a9612da Mon Sep 17 00:00:00 2001 From: gjoranv Date: Thu, 25 May 2023 14:53:25 +0200 Subject: Add bundle type to all CORE bundles. --- component/pom.xml | 3 +++ config-bundle/pom.xml | 3 +++ config-lib/pom.xml | 3 +++ config/pom.xml | 3 +++ configdefinitions/pom.xml | 3 +++ container-core/pom.xml | 3 +++ container-disc/pom.xml | 1 + container-documentapi/pom.xml | 3 +++ container-onnxruntime/pom.xml | 3 +++ container-search-and-docproc/pom.xml | 3 +++ defaults/pom.xml | 19 +++++++++++-------- fsa/pom.xml | 3 +++ hosted-zone-api/pom.xml | 3 +++ jrt/pom.xml | 3 +++ linguistics/pom.xml | 3 +++ model-evaluation/pom.xml | 3 +++ opennlp-linguistics/pom.xml | 3 +++ searchlib/pom.xml | 3 +++ vdslib/pom.xml | 3 +++ vespajlib/pom.xml | 3 +++ vespalog/pom.xml | 3 +++ 21 files changed, 69 insertions(+), 8 deletions(-) diff --git a/component/pom.xml b/component/pom.xml index e8cee594066..3c3a84b13d4 100755 --- a/component/pom.xml +++ b/component/pom.xml @@ -67,6 +67,9 @@ com.yahoo.vespa bundle-plugin true + + CORE + org.codehaus.mojo diff --git a/config-bundle/pom.xml b/config-bundle/pom.xml index a1770537a3e..817820c95d5 100644 --- a/config-bundle/pom.xml +++ b/config-bundle/pom.xml @@ -70,6 +70,9 @@ com.yahoo.vespa bundle-plugin true + + CORE + diff --git a/config-lib/pom.xml b/config-lib/pom.xml index 66603deeb38..dce2092a0e1 100644 --- a/config-lib/pom.xml +++ b/config-lib/pom.xml @@ -69,6 +69,9 @@ com.yahoo.vespa bundle-plugin true + + CORE + com.yahoo.vespa diff --git a/config/pom.xml b/config/pom.xml index 83a25b8631d..29323e26b0b 100755 --- a/config/pom.xml +++ b/config/pom.xml @@ -176,6 +176,9 @@ com.yahoo.vespa bundle-plugin true + + CORE + org.apache.maven.plugins diff --git a/configdefinitions/pom.xml b/configdefinitions/pom.xml index 51221c4899f..d70a595e495 100644 --- a/configdefinitions/pom.xml +++ b/configdefinitions/pom.xml @@ -32,6 +32,9 @@ com.yahoo.vespa bundle-plugin true + + CORE + org.apache.maven.plugins diff --git a/container-core/pom.xml b/container-core/pom.xml index 5fed4f02912..eec8b60077b 100644 --- a/container-core/pom.xml +++ b/container-core/pom.xml @@ -445,6 +445,9 @@ com.yahoo.vespa bundle-plugin true + + CORE + org.apache.maven.plugins diff --git a/container-disc/pom.xml b/container-disc/pom.xml index 173979fbe81..16ce99220f1 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -186,6 +186,7 @@ bundle-plugin true + CORE com.yahoo.container.jdisc.ConfiguredApplication true diff --git a/container-documentapi/pom.xml b/container-documentapi/pom.xml index 9a2572a9918..b2b795a35f2 100644 --- a/container-documentapi/pom.xml +++ b/container-documentapi/pom.xml @@ -45,6 +45,9 @@ com.yahoo.vespa bundle-plugin true + + CORE + diff --git a/container-onnxruntime/pom.xml b/container-onnxruntime/pom.xml index 59d23e1b8c1..b4a4ace380d 100644 --- a/container-onnxruntime/pom.xml +++ b/container-onnxruntime/pom.xml @@ -45,6 +45,9 @@ com.yahoo.vespa bundle-plugin true + + CORE + org.apache.maven.plugins diff --git a/container-search-and-docproc/pom.xml b/container-search-and-docproc/pom.xml index 470c1b1fa6f..71d547ecacd 100644 --- a/container-search-and-docproc/pom.xml +++ b/container-search-and-docproc/pom.xml @@ -229,6 +229,9 @@ com.yahoo.vespa bundle-plugin true + + CORE + org.apache.maven.plugins diff --git a/defaults/pom.xml b/defaults/pom.xml index 4a5299e1782..925232d42ec 100644 --- a/defaults/pom.xml +++ b/defaults/pom.xml @@ -50,17 +50,20 @@ - com.yahoo.vespa - bundle-plugin - true - + com.yahoo.vespa + bundle-plugin + true + + CORE + + - org.apache.maven.plugins - maven-deploy-plugin + org.apache.maven.plugins + maven-deploy-plugin - org.apache.maven.plugins - maven-compiler-plugin + org.apache.maven.plugins + maven-compiler-plugin org.apache.maven.plugins diff --git a/fsa/pom.xml b/fsa/pom.xml index 5d18bdb666c..a3ce38fbeb8 100644 --- a/fsa/pom.xml +++ b/fsa/pom.xml @@ -40,6 +40,9 @@ com.yahoo.vespa bundle-plugin true + + CORE + org.apache.maven.plugins diff --git a/hosted-zone-api/pom.xml b/hosted-zone-api/pom.xml index 4227d457c4d..bd5b759e972 100644 --- a/hosted-zone-api/pom.xml +++ b/hosted-zone-api/pom.xml @@ -51,6 +51,9 @@ com.yahoo.vespa bundle-plugin true + + CORE + com.yahoo.vespa diff --git a/jrt/pom.xml b/jrt/pom.xml index 926756da4a0..68903ae161d 100644 --- a/jrt/pom.xml +++ b/jrt/pom.xml @@ -50,6 +50,9 @@ com.yahoo.vespa bundle-plugin true + + CORE + org.apache.maven.plugins diff --git a/linguistics/pom.xml b/linguistics/pom.xml index bfbf1beeaea..1ba6e34951e 100644 --- a/linguistics/pom.xml +++ b/linguistics/pom.xml @@ -65,6 +65,9 @@ com.yahoo.vespa bundle-plugin true + + CORE + org.apache.maven.plugins diff --git a/model-evaluation/pom.xml b/model-evaluation/pom.xml index 7c2ee046556..1e0ac4debbd 100644 --- a/model-evaluation/pom.xml +++ b/model-evaluation/pom.xml @@ -90,6 +90,9 @@ com.yahoo.vespa bundle-plugin true + + CORE + com.yahoo.vespa diff --git a/opennlp-linguistics/pom.xml b/opennlp-linguistics/pom.xml index a7907ba212f..90f41c595df 100644 --- a/opennlp-linguistics/pom.xml +++ b/opennlp-linguistics/pom.xml @@ -63,6 +63,9 @@ com.yahoo.vespa bundle-plugin true + + CORE + org.apache.maven.plugins diff --git a/searchlib/pom.xml b/searchlib/pom.xml index 5555c83adde..d45ced84cea 100644 --- a/searchlib/pom.xml +++ b/searchlib/pom.xml @@ -79,6 +79,9 @@ com.yahoo.vespa bundle-plugin true + + CORE + org.apache.maven.plugins diff --git a/vdslib/pom.xml b/vdslib/pom.xml index e966d8ce6b6..cc0d1788fdd 100644 --- a/vdslib/pom.xml +++ b/vdslib/pom.xml @@ -47,6 +47,9 @@ com.yahoo.vespa bundle-plugin true + + CORE + diff --git a/vespajlib/pom.xml b/vespajlib/pom.xml index 9b10f82c986..04f044622b2 100644 --- a/vespajlib/pom.xml +++ b/vespajlib/pom.xml @@ -104,6 +104,9 @@ com.yahoo.vespa bundle-plugin true + + CORE + diff --git a/vespalog/pom.xml b/vespalog/pom.xml index f8260471fa2..cb20f4c8358 100644 --- a/vespalog/pom.xml +++ b/vespalog/pom.xml @@ -49,6 +49,9 @@ com.yahoo.vespa bundle-plugin true + + CORE + org.apache.maven.plugins -- cgit v1.2.3