From 74bd6eb8dde4ccbfc92d74cc2a3b0210eb28b291 Mon Sep 17 00:00:00 2001 From: gjoranv Date: Thu, 19 May 2022 12:54:28 +0200 Subject: Remove unnecessary annotations. --- .../application/container/SynchronousRequestResponseHandler.java | 4 +--- .../main/java/com/yahoo/application/container/handler/Headers.java | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'application') diff --git a/application/src/main/java/com/yahoo/application/container/SynchronousRequestResponseHandler.java b/application/src/main/java/com/yahoo/application/container/SynchronousRequestResponseHandler.java index 87d1eff05ab..d21b7af73a0 100644 --- a/application/src/main/java/com/yahoo/application/container/SynchronousRequestResponseHandler.java +++ b/application/src/main/java/com/yahoo/application/container/SynchronousRequestResponseHandler.java @@ -11,7 +11,6 @@ import com.yahoo.jdisc.handler.ResponseHandler; import com.yahoo.jdisc.service.CurrentContainer; import com.yahoo.jdisc.test.TestDriver; -import javax.annotation.concurrent.ThreadSafe; import java.net.URI; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -22,7 +21,6 @@ import java.util.concurrent.CountDownLatch; /** * @author Einar M R Rosenvinge */ -@ThreadSafe @Beta final class SynchronousRequestResponseHandler { @@ -121,7 +119,7 @@ final class SynchronousRequestResponseHandler { } } - @ThreadSafe + private static class BlockingResponseHandler implements ResponseHandler, ContentChannel { private volatile com.yahoo.jdisc.Response discResponse = null; private CountDownLatch closedLatch = new CountDownLatch(1); diff --git a/application/src/main/java/com/yahoo/application/container/handler/Headers.java b/application/src/main/java/com/yahoo/application/container/handler/Headers.java index 3e0c148bcc7..03b31e38659 100644 --- a/application/src/main/java/com/yahoo/application/container/handler/Headers.java +++ b/application/src/main/java/com/yahoo/application/container/handler/Headers.java @@ -4,7 +4,6 @@ package com.yahoo.application.container.handler; import com.yahoo.api.annotations.Beta; import com.yahoo.jdisc.HeaderFields; -import javax.annotation.concurrent.NotThreadSafe; import java.util.Collection; import java.util.List; import java.util.Map; @@ -18,7 +17,6 @@ import java.util.Set; * @author Einar M R Rosenvinge * @author Simon Thoresen Hult */ -@NotThreadSafe @Beta public class Headers implements Map> { private final HeaderFields h = new HeaderFields(); -- cgit v1.2.3 From 179a932b7dd4b2b2370a1881523be0b3f44f74a5 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Fri, 3 Jun 2022 16:34:33 +0200 Subject: Remove on Vespa 8 --- .../com.yahoo.vespatest.ExtraHitSearcher.jar | Bin 9149 -> 9524 bytes .../com/yahoo/application/ApplicationTest.java | 30 ----------- .../java/com/yahoo/config/codegen/DefParser.java | 7 --- .../config/codegen/DefParserNamespaceTest.java | 13 +++-- .../com/yahoo/config/codegen/DefParserTest.java | 59 ++------------------- .../yahoo/config/codegen/JavaClassBuilderTest.java | 4 +- .../config/codegen/NormalizedDefinitionTest.java | 14 +++-- .../container.core.vip-status.def | 3 ++ 8 files changed, 22 insertions(+), 108 deletions(-) (limited to 'application') diff --git a/application/src/test/app-packages/searcher-app/components/com.yahoo.vespatest.ExtraHitSearcher.jar b/application/src/test/app-packages/searcher-app/components/com.yahoo.vespatest.ExtraHitSearcher.jar index 90845ab51f9..77f06e869ca 100644 Binary files a/application/src/test/app-packages/searcher-app/components/com.yahoo.vespatest.ExtraHitSearcher.jar and b/application/src/test/app-packages/searcher-app/components/com.yahoo.vespatest.ExtraHitSearcher.jar differ diff --git a/application/src/test/java/com/yahoo/application/ApplicationTest.java b/application/src/test/java/com/yahoo/application/ApplicationTest.java index 86873033b8a..3d3476cd99b 100644 --- a/application/src/test/java/com/yahoo/application/ApplicationTest.java +++ b/application/src/test/java/com/yahoo/application/ApplicationTest.java @@ -262,36 +262,6 @@ public class ApplicationTest { } } - @Test - public void client() throws Exception { - try (ApplicationFacade app = new ApplicationFacade(Application.fromBuilder(new Application.Builder() - .documentType("test", new String(this.getClass().getResourceAsStream("/test.sd").readAllBytes(), StandardCharsets.UTF_8)) - .container("default", new Application.Builder.Container() - .client("mbus://*/*", MockClient.class) - .documentProcessor(MockDispatchDocproc.class) - )) - )) { - - Map typeMap = app.application().getJDisc("jdisc").documentProcessing().getDocumentTypes(); - assertNotNull(typeMap); - - DocumentType docType = typeMap.get("test"); - Document doc = new Document(docType, "id:foo:test::bar"); - doc.setFieldValue("title", "hello"); - - assertEquals(DocumentProcessor.Progress.DONE, app.process(new DocumentPut(doc))); - - MockClient client = (MockClient) app.getClientById(MockClient.class.getName()); - assertNotNull(client); - assertEquals(1, client.getCounter()); - - MockDispatchDocproc docproc = (MockDispatchDocproc) app.getComponentById(MockDispatchDocproc.class.getName() + "@default"); - assertNotNull(docproc); - assertEquals(1, docproc.getResponses().size()); - assertEquals(200, docproc.getResponses().get(0).getStatus()); - } - } - @Test public void file_distribution() { try (Application application = Application.fromApplicationPackage(new File("src/test/app-packages/filedistribution/"), Networking.disable)) { diff --git a/configgen/src/main/java/com/yahoo/config/codegen/DefParser.java b/configgen/src/main/java/com/yahoo/config/codegen/DefParser.java index 34b07b7d098..63cd1deb1f7 100644 --- a/configgen/src/main/java/com/yahoo/config/codegen/DefParser.java +++ b/configgen/src/main/java/com/yahoo/config/codegen/DefParser.java @@ -18,8 +18,6 @@ public class DefParser { public static final String DEFAULT_PACKAGE_PREFIX = "com.yahoo."; static final Pattern commentPattern = Pattern.compile("^\\s*#+\\s*(.*?)\\s*$"); - // TODO: Version is not used anymore, remove in Vespa 8 - public static final Pattern versionPattern = Pattern.compile("^(version\\s*=\\s*)([0-9][0-9-]*)$"); // Namespace/package must start with a letter, since Java (Java language Spec, section 3.8) and C++ identifiers cannot start with a digit public static final Pattern namespacePattern = getNamespacePattern("namespace"); public static final Pattern packagePattern = getNamespacePattern("package"); @@ -125,11 +123,6 @@ public class DefParser { parseCommentLine(commentMatch); return; } - Matcher versionMatch = versionPattern.matcher(line); - if (versionMatch.matches()) { - // Do nothing, versions are not used - return; - } Matcher namespaceMatcher = namespacePattern.matcher(line); if (namespaceMatcher.matches()) { parseNamespaceLine(namespaceMatcher.group(2)); diff --git a/configgen/src/test/java/com/yahoo/config/codegen/DefParserNamespaceTest.java b/configgen/src/test/java/com/yahoo/config/codegen/DefParserNamespaceTest.java index 7921a3aecbe..2eb86546e51 100644 --- a/configgen/src/test/java/com/yahoo/config/codegen/DefParserNamespaceTest.java +++ b/configgen/src/test/java/com/yahoo/config/codegen/DefParserNamespaceTest.java @@ -19,7 +19,7 @@ public class DefParserNamespaceTest { @Test public void namespace_is_set_on_root_node() { - DefParser parser = createParser("version=1\nnamespace=myproject.config\n"); + DefParser parser = createParser("namespace=myproject.config\n"); CNode root = parser.getTree(); assertEquals("myproject.config", root.getNamespace()); } @@ -34,18 +34,17 @@ public class DefParserNamespaceTest { @Test(expected = CodegenRuntimeException.class) public void uppercase_chars_are_not_allowed() { - createParser("version=1\nnamespace=Foo\n").getTree(); + createParser("namespace=Foo\n").getTree(); } @Test(expected = CodegenRuntimeException.class) public void explicit_com_yahoo_prefix_is_not_allowed() { - createParser("version=1\n" + - "namespace=com.yahoo.myproject.config\n").getTree(); + createParser("namespace=com.yahoo.myproject.config\n").getTree(); } @Test public void spaces_are_allowed_around_equals_sign() { - DefParser parser = createParser("version=1\nnamespace = myproject.config\n"); + DefParser parser = createParser("namespace = myproject.config\n"); CNode root = parser.getTree(); assertEquals("myproject.config", root.getNamespace()); } @@ -62,10 +61,10 @@ public class DefParserNamespaceTest { @Test public void namespace_alters_def_md5() { - DefParser parser = createParser("version=1\n"); + DefParser parser = createParser(""); CNode root = parser.getTree(); - parser = createParser("version=1\nnamespace=myproject.config\n"); + parser = createParser("namespace=myproject.config\n"); CNode namespaceRoot = parser.getTree(); assertNotEquals(root.defMd5, namespaceRoot.defMd5); diff --git a/configgen/src/test/java/com/yahoo/config/codegen/DefParserTest.java b/configgen/src/test/java/com/yahoo/config/codegen/DefParserTest.java index e4d9f6cb3bd..5ba2c01449b 100644 --- a/configgen/src/test/java/com/yahoo/config/codegen/DefParserTest.java +++ b/configgen/src/test/java/com/yahoo/config/codegen/DefParserTest.java @@ -78,7 +78,7 @@ public class DefParserTest { @Test public void testMd5Sum2() { - String def = "version=1\na string\n"; + String def = "a string\n"; CNode root = new DefParser("testMd5Sum2", new StringReader(def)).getTree(); assertEquals("a5e5fdbb2b27e56ba7d5e60e335c598b", root.defMd5); } @@ -89,58 +89,10 @@ public class DefParserTest { assertLineFails(line, "Could not create sting a"); } - // Note: Version is not used anymore, so will always be empty - @Test - public void testValidVersions() { - try { - testExpectedVersion("version=8", ""); - testExpectedVersion("version=8-1", ""); - testExpectedVersion("version =8", ""); - testExpectedVersion("version = 8", ""); - testExpectedVersion("version = 8 ", ""); - testExpectedVersion("version =\t8", ""); - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - } - - private void testExpectedVersion(String versionLine, String expectedVersion) { - InnerCNode root = createParser(versionLine).getTree(); - assertEquals(expectedVersion, root.defVersion); - } - - @Test - public void version_is_not_mandatory() { - try { - createParser("a string\n").parse(); - } catch (Exception e) { - fail("Should not get an exception here"); - } - } - static DefParser createParser(String def) { return new DefParser("test", new StringReader(def)); } - @Test - public void testInvalidVersion() { - Class exceptionClass = DefParser.DefParserException.class; - testInvalidVersion("version=a\n", exceptionClass, - "Error when parsing line 1: version=a\nversion=a"); - testInvalidVersion("version = a\n", exceptionClass, - "Error when parsing line 1: version = a\n a"); - } - - private void testInvalidVersion(String versionLine, Class exceptionClass, String exceptionMessage) { - try { - createParser(versionLine).parse(); - fail("Didn't find expected exception of type " + exceptionClass); - } catch (Exception e) { - assertExceptionAndMessage(e, exceptionClass, exceptionMessage); - } - } - @Test public void verify_fail_on_default_for_file() { assertLineFails("f file default=\"file1.txt\"", @@ -150,7 +102,7 @@ public class DefParserTest { @Test(expected = CodegenRuntimeException.class) @Ignore("Not implemented yet") public void testInvalidEnum() { - DefParser parser = createParser("version=1\nanEnum enum {A, B, A}\n"); + DefParser parser = createParser("anEnum enum {A, B, A}\n"); //parser.validateDef(def); } @@ -191,7 +143,7 @@ public class DefParserTest { @Ignore //TODO: finish this! The numeric leaf nodes must contain their range. @Test public void testRanges() { - StringBuilder sb = new StringBuilder("version=1\n"); + StringBuilder sb = new StringBuilder(); sb.append("i int range=[0,10]"); sb.append("l long range=[-1e20,0]"); sb.append("d double range=[0,1]"); @@ -213,7 +165,7 @@ public class DefParserTest { fail("Didn't find expected exception of type " + exceptionClass); } catch (Exception e) { assertExceptionAndMessage(e, exceptionClass, - "Error when parsing line 4: " + duplicateLine + "b is already defined"); + "Error when parsing line 3: " + duplicateLine + "b is already defined"); } } @@ -292,7 +244,6 @@ public class DefParserTest { static StringBuilder createDefTemplate() { StringBuilder sb = new StringBuilder(); - sb.append("version=8\n"); // Add a comment line to check that we get correct line number with comments sb.append("# comment\n"); @@ -312,7 +263,7 @@ public class DefParserTest { fail("Didn't find expected exception of type " + exceptionClass); } catch (Exception e) { assertExceptionAndMessage(e, exceptionClass, - "Error when parsing line 3: " + line + "\n" + message); + "Error when parsing line 2: " + line + "\n" + message); } } diff --git a/configgen/src/test/java/com/yahoo/config/codegen/JavaClassBuilderTest.java b/configgen/src/test/java/com/yahoo/config/codegen/JavaClassBuilderTest.java index d69617ec5da..e6e86b2c2a3 100644 --- a/configgen/src/test/java/com/yahoo/config/codegen/JavaClassBuilderTest.java +++ b/configgen/src/test/java/com/yahoo/config/codegen/JavaClassBuilderTest.java @@ -29,7 +29,7 @@ public class JavaClassBuilderTest { @Ignore @Test public void visual_inspection_of_generated_class() { - final String testDefinition = "version=1\n" + // + final String testDefinition = "namespace=test\n" + // "p path\n" + // "pathArr[] path\n" + // @@ -74,7 +74,7 @@ public class JavaClassBuilderTest { @Test public void testCreateUniqueSymbol() { - final String testDefinition = "version=1\n" + // + final String testDefinition = "namespace=test\n" + // "m int\n" + // "n int\n"; diff --git a/configgen/src/test/java/com/yahoo/config/codegen/NormalizedDefinitionTest.java b/configgen/src/test/java/com/yahoo/config/codegen/NormalizedDefinitionTest.java index 411ac0fe58a..d57210dd9ed 100644 --- a/configgen/src/test/java/com/yahoo/config/codegen/NormalizedDefinitionTest.java +++ b/configgen/src/test/java/com/yahoo/config/codegen/NormalizedDefinitionTest.java @@ -23,7 +23,6 @@ public class NormalizedDefinitionTest { @Test public void testNormalizingFromReader() { String def = - "version=1\n" + "aString string \n" + "anInt int #comment \n" + "aStringCommentCharacterAfter string default=\"ab\" #foo\n" + @@ -42,13 +41,12 @@ public class NormalizedDefinitionTest { } assertNotNull(out); - assertEquals(6, out.size()); - assertEquals("version=1\n", out.get(0)); - assertEquals("aString string\n", out.get(1)); - assertEquals("anInt int\n", out.get(2)); - assertEquals("aStringCommentCharacterAfter string default=\"ab\"\n", out.get(3)); - assertEquals("aStringWithCommentCharacter string default=\"a#b\"\n", out.get(4)); - assertEquals("aStringWithEscapedQuote string default=\"a\"b\"\n", out.get(5)); + assertEquals(5, out.size()); + assertEquals("aString string\n", out.get(0)); + assertEquals("anInt int\n", out.get(1)); + assertEquals("aStringCommentCharacterAfter string default=\"ab\"\n", out.get(2)); + assertEquals("aStringWithCommentCharacter string default=\"a#b\"\n", out.get(3)); + assertEquals("aStringWithEscapedQuote string default=\"a\"b\"\n", out.get(4)); reader.close(); } diff --git a/container-core/src/main/resources/configdefinitions/container.core.vip-status.def b/container-core/src/main/resources/configdefinitions/container.core.vip-status.def index 91d5103861e..4a50018c3c3 100644 --- a/container-core/src/main/resources/configdefinitions/container.core.vip-status.def +++ b/container-core/src/main/resources/configdefinitions/container.core.vip-status.def @@ -7,3 +7,6 @@ accessdisk bool default=false ## The file to serve as the status file. ## If the path is relative vespa home is prepended statusfile string default="share/qrsdocs/status.html" + +## Not used TODO: Remove on Vespa 8? - always set to true? +initiallyInRotation bool default=true -- cgit v1.2.3 From 6f96b439fb93764e718d7dd6df91e12e8ea27b0c Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Fri, 3 Jun 2022 13:04:34 +0200 Subject: Remove support for jdisc tag in services.xml --- .../yahoo/application/container/ContainerTest.java | 3 +- .../model/provision/HostsXmlProvisioner.java | 2 +- .../model/builder/xml/dom/NodesSpecification.java | 8 +- .../model/container/component/HttpFilter.java | 2 +- .../model/container/xml/ContainerModelBuilder.java | 15 +- .../src/main/resources/schema/containercluster.rnc | 2 +- .../model/provision/ModelProvisioningTest.java | 233 ++++++++++----------- .../com/yahoo/vespa/model/HostResourceTest.java | 6 +- .../container/xml/ContainerModelBuilderTest.java | 16 -- .../vespa/model/test/ModelAmendingTestCase.java | 6 +- 10 files changed, 125 insertions(+), 168 deletions(-) (limited to 'application') diff --git a/application/src/test/java/com/yahoo/application/container/ContainerTest.java b/application/src/test/java/com/yahoo/application/container/ContainerTest.java index f36237066b5..fda8e0c597a 100644 --- a/application/src/test/java/com/yahoo/application/container/ContainerTest.java +++ b/application/src/test/java/com/yahoo/application/container/ContainerTest.java @@ -64,11 +64,10 @@ public class ContainerTest { try (JDisc container = fromServicesXml("" + // "" + // "" + // - "" + // "", Networking.disable)) { fail("expected exception"); } catch (Exception e) { - assertTrue(e.getMessage().contains("container id='id1', container id='', jdisc id=''")); + assertTrue(e.getMessage().contains("container id='id1', container id=''")); } } diff --git a/config-model/src/main/java/com/yahoo/config/model/provision/HostsXmlProvisioner.java b/config-model/src/main/java/com/yahoo/config/model/provision/HostsXmlProvisioner.java index 5a6a8e86e6a..acad7532404 100644 --- a/config-model/src/main/java/com/yahoo/config/model/provision/HostsXmlProvisioner.java +++ b/config-model/src/main/java/com/yahoo/config/model/provision/HostsXmlProvisioner.java @@ -27,7 +27,7 @@ public class HostsXmlProvisioner implements HostProvisioner { @Override public HostSpec allocateHost(String alias) { - // Some special rules to allow no admin elements as well as jdisc element without nodes. + // Some special rules to allow no admin elements as well as container element without nodes. if (alias.equals(IMPLICIT_ADMIN_HOSTALIAS)) { if (hosts.asCollection().size() > 1) { throw new IllegalArgumentException("More than 1 host specified (" + hosts.asCollection().size() + ") and not specified"); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java index 67b2e4b81b5..472e15add98 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java @@ -391,12 +391,8 @@ public class NodesSpecification { /** Returns the ID of the parent container element of nodesElement, if any */ private static Optional containerIdOf(ModelElement nodesElement) { var element = nodesElement.getXml(); - for (var containerTag : List.of("container", "jdisc")) { - var container = findParentByTag(containerTag, element); - if (container.isEmpty()) continue; - return container.map(el -> el.getAttribute("id")); - } - return Optional.empty(); + var container = findParentByTag("container", element); + return container.map(el -> el.getAttribute("id")); } /** Returns the ID of the container element referencing nodesElement, if any */ diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/component/HttpFilter.java b/config-model/src/main/java/com/yahoo/vespa/model/container/component/HttpFilter.java index 71446438b06..e77099a0598 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/component/HttpFilter.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/component/HttpFilter.java @@ -10,7 +10,7 @@ import com.yahoo.osgi.provider.model.ComponentModel; /** * This is only for the legacy certificate filter setup, outside http. * - * TODO: Remove when 'filter' directly under 'jdisc' can be removed from services.xml + * TODO: Remove when 'filter' directly under 'container' can be removed from services.xml * * @author Tony Vaagenes */ diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java index 0b8598f05f7..552ada756b6 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java @@ -88,7 +88,6 @@ import com.yahoo.vespa.model.container.xml.embedder.EmbedderConfig; import com.yahoo.vespa.model.content.StorageGroup; import org.w3c.dom.Element; import org.w3c.dom.Node; - import java.net.URI; import java.security.cert.X509Certificate; import java.util.ArrayList; @@ -120,7 +119,6 @@ public class ContainerModelBuilder extends ConfigModelBuilder { private static final String HOSTED_VESPA_STATUS_FILE_SETTING = "VESPA_LB_STATUS_FILE"; private static final String CONTAINER_TAG = "container"; - private static final String DEPRECATED_CONTAINER_TAG = "jdisc"; private static final String ENVIRONMENT_VARIABLES_ELEMENT = "environment-variables"; // The node count to enforce in a cluster running ZooKeeper @@ -136,8 +134,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder { private final boolean httpServerEnabled; protected DeployLogger log; - public static final List configModelIds = - ImmutableList.of(ConfigModelId.fromName(CONTAINER_TAG), ConfigModelId.fromName(DEPRECATED_CONTAINER_TAG)); + public static final List configModelIds = ImmutableList.of(ConfigModelId.fromName(CONTAINER_TAG)); private static final String xmlRendererId = RendererRegistry.xmlRendererId.getName(); private static final String jsonRendererId = RendererRegistry.jsonRendererId.getName(); @@ -162,7 +159,6 @@ public class ContainerModelBuilder extends ConfigModelBuilder { app = modelContext.getApplicationPackage(); checkVersion(spec); - checkTagName(spec, log); ApplicationContainerCluster cluster = createContainerCluster(spec, modelContext); addClusterContent(cluster, spec, modelContext); @@ -637,13 +633,6 @@ public class ContainerModelBuilder extends ConfigModelBuilder { throw new IllegalArgumentException("Expected container version to be 1.0, but got " + version); } - private void checkTagName(Element spec, DeployLogger logger) { - if (spec.getTagName().equals(DEPRECATED_CONTAINER_TAG)) { - logger.logApplicationPackage(WARNING, "'" + DEPRECATED_CONTAINER_TAG + - "' is deprecated as tag name. Use '" + CONTAINER_TAG + "' instead."); - } - } - private void addNodes(ApplicationContainerCluster cluster, Element spec, ConfigModelContext context) { if (standaloneBuilder) addStandaloneNode(cluster, context.getDeployState()); @@ -1046,7 +1035,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder { } public static boolean isContainerTag(Element element) { - return CONTAINER_TAG.equals(element.getTagName()) || DEPRECATED_CONTAINER_TAG.equals(element.getTagName()); + return CONTAINER_TAG.equals(element.getTagName()); } /** diff --git a/config-model/src/main/resources/schema/containercluster.rnc b/config-model/src/main/resources/schema/containercluster.rnc index 207324f8d18..1ab3c9893bf 100644 --- a/config-model/src/main/resources/schema/containercluster.rnc +++ b/config-model/src/main/resources/schema/containercluster.rnc @@ -1,5 +1,5 @@ # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -ContainerCluster = element container | jdisc { +ContainerCluster = element container { attribute version { "1.0" } & attribute id { xsd:NCName }? & Include* & diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java index ffc38ba932d..5e56efc4460 100644 --- a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java +++ b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java @@ -249,108 +249,101 @@ public class ModelProvisioningTest { @Test public void testCombinedCluster() { - var containerElements = Set.of("jdisc", "container"); - for (var containerElement : containerElements) { - String xmlWithNodes = - "" + - "" + - " <" + containerElement + " version='1.0' id='container1'>" + - " " + - " " + - " " + - " " + - " 2" + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - ""; - VespaModelTester tester = new VespaModelTester(); - tester.addHosts(5); - VespaModel model = tester.createModel(xmlWithNodes, true); - assertEquals("Nodes in content1", 2, model.getContentClusters().get("content1").getRootGroup().getNodes().size()); - assertEquals("Nodes in container1", 2, model.getContainerClusters().get("container1").getContainers().size()); - assertEquals("Heap size is lowered with combined clusters", - 18, physicalMemoryPercentage(model.getContainerClusters().get("container1"))); - assertEquals("Memory for proton is lowered to account for the jvm heap", - (long)((3 - reservedMemoryGb) * (Math.pow(1024, 3)) * (1 - 0.18)), protonMemorySize(model.getContentClusters().get("content1"))); - assertProvisioned(0, ClusterSpec.Id.from("container1"), ClusterSpec.Type.container, model); - assertProvisioned(2, ClusterSpec.Id.from("content1"), ClusterSpec.Id.from("container1"), ClusterSpec.Type.combined, model); - } + String xmlWithNodes = + "" + + "" + + " " + + " " + + " " + + " " + + " " + + " 2" + + " " + + " " + + " " + + " " + + " " + + " " + + " " + + ""; + VespaModelTester tester = new VespaModelTester(); + tester.addHosts(5); + VespaModel model = tester.createModel(xmlWithNodes, true); + assertEquals("Nodes in content1", 2, model.getContentClusters().get("content1").getRootGroup().getNodes().size()); + assertEquals("Nodes in container1", 2, model.getContainerClusters().get("container1").getContainers().size()); + assertEquals("Heap size is lowered with combined clusters", + 18, physicalMemoryPercentage(model.getContainerClusters().get("container1"))); + assertEquals("Memory for proton is lowered to account for the jvm heap", + (long) ((3 - reservedMemoryGb) * (Math.pow(1024, 3)) * (1 - 0.18)), protonMemorySize(model.getContentClusters() + .get("content1"))); + assertProvisioned(0, ClusterSpec.Id.from("container1"), ClusterSpec.Type.container, model); + assertProvisioned(2, ClusterSpec.Id.from("content1"), ClusterSpec.Id.from("container1"), ClusterSpec.Type.combined, model); } @Test public void testCombinedClusterWithJvmHeapSizeOverride() { - var containerElements = Set.of("jdisc", "container"); - for (var containerElement : containerElements) { - String xmlWithNodes = - "" + - "" + - " <" + containerElement + " version='1.0' id='container1'>" + - " " + - " " + - " " + - " " + - " " + - " " + - " 2" + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - ""; - VespaModelTester tester = new VespaModelTester(); - tester.addHosts(5); - VespaModel model = tester.createModel(xmlWithNodes, true); - assertEquals("Nodes in content1", 2, model.getContentClusters().get("content1").getRootGroup().getNodes().size()); - assertEquals("Nodes in container1", 2, model.getContainerClusters().get("container1").getContainers().size()); - assertEquals("Heap size is lowered with combined clusters", - 30, physicalMemoryPercentage(model.getContainerClusters().get("container1"))); - assertEquals("Memory for proton is lowered to account for the jvm heap", - (long)((3 - reservedMemoryGb) * (Math.pow(1024, 3)) * (1 - 0.30)), protonMemorySize(model.getContentClusters().get("content1"))); - assertProvisioned(0, ClusterSpec.Id.from("container1"), ClusterSpec.Type.container, model); - assertProvisioned(2, ClusterSpec.Id.from("content1"), ClusterSpec.Id.from("container1"), ClusterSpec.Type.combined, model); - } + String xmlWithNodes = + "" + + "" + + " " + + " " + + " " + + " " + + " " + + " " + + " " + + " 2" + + " " + + " " + + " " + + " " + + " " + + " " + + " " + + ""; + VespaModelTester tester = new VespaModelTester(); + tester.addHosts(5); + VespaModel model = tester.createModel(xmlWithNodes, true); + assertEquals("Nodes in content1", 2, model.getContentClusters().get("content1").getRootGroup().getNodes().size()); + assertEquals("Nodes in container1", 2, model.getContainerClusters().get("container1").getContainers().size()); + assertEquals("Heap size is lowered with combined clusters", + 30, physicalMemoryPercentage(model.getContainerClusters().get("container1"))); + assertEquals("Memory for proton is lowered to account for the jvm heap", + (long) ((3 - reservedMemoryGb) * (Math.pow(1024, 3)) * (1 - 0.30)), protonMemorySize(model.getContentClusters() + .get("content1"))); + assertProvisioned(0, ClusterSpec.Id.from("container1"), ClusterSpec.Type.container, model); + assertProvisioned(2, ClusterSpec.Id.from("content1"), ClusterSpec.Id.from("container1"), ClusterSpec.Type.combined, model); } /** For comparison with the above */ @Test public void testNonCombinedCluster() { - var containerElements = Set.of("jdisc", "container"); - for (var containerElement : containerElements) { - String xmlWithNodes = - "" + - "" + - " <" + containerElement + " version='1.0' id='container1'>" + - " " + - " " + - " " + - " " + - " 2" + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - ""; - VespaModelTester tester = new VespaModelTester(); - tester.addHosts(7); - VespaModel model = tester.createModel(xmlWithNodes, true); - assertEquals("Nodes in content1", 2, model.getContentClusters().get("content1").getRootGroup().getNodes().size()); - assertEquals("Nodes in container1", 2, model.getContainerClusters().get("container1").getContainers().size()); - assertEquals("Heap size is normal", - 70, physicalMemoryPercentage(model.getContainerClusters().get("container1"))); - assertEquals("Memory for proton is normal", - (long)((3 - reservedMemoryGb) * (Math.pow(1024, 3))), protonMemorySize(model.getContentClusters().get("content1"))); - } + String xmlWithNodes = + "" + + "" + + " " + + " " + + " " + + " " + + " " + + " 2" + + " " + + " " + + " " + + " " + + " " + + " " + + " " + + ""; + VespaModelTester tester = new VespaModelTester(); + tester.addHosts(7); + VespaModel model = tester.createModel(xmlWithNodes, true); + assertEquals("Nodes in content1", 2, model.getContentClusters().get("content1").getRootGroup().getNodes().size()); + assertEquals("Nodes in container1", 2, model.getContainerClusters().get("container1").getContainers().size()); + assertEquals("Heap size is normal", + 70, physicalMemoryPercentage(model.getContainerClusters().get("container1"))); + assertEquals("Memory for proton is normal", + (long) ((3 - reservedMemoryGb) * (Math.pow(1024, 3))), protonMemorySize(model.getContentClusters().get("content1"))); } @Test @@ -463,35 +456,31 @@ public class ModelProvisioningTest { @Test public void testCombinedClusterWithZooKeeperFails() { - var containerElements = Set.of("jdisc", "container"); - for (var containerElement : containerElements) { - String xmlWithNodes = - "" + - "" + - " <" + containerElement + " version='1.0' id='container1'>" + - " " + - " " + - " " + - " " + - " " + - " 2" + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - ""; - VespaModelTester tester = new VespaModelTester(); - tester.addHosts(2); - try { - tester.createModel(xmlWithNodes, true); - fail("ZooKeeper should not be allowed on combined clusters"); - } - catch (IllegalArgumentException e) { - assertEquals("A combined cluster cannot run ZooKeeper", e.getMessage()); - } + String xmlWithNodes = + "" + + "" + + " " + + " " + + " " + + " " + + " " + + " " + + " 2" + + " " + + " " + + " " + + " " + + " " + + " " + + " " + + ""; + VespaModelTester tester = new VespaModelTester(); + tester.addHosts(2); + try { + tester.createModel(xmlWithNodes, true); + fail("ZooKeeper should not be allowed on combined clusters"); + } catch (IllegalArgumentException e) { + assertEquals("A combined cluster cannot run ZooKeeper", e.getMessage()); } } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/HostResourceTest.java b/config-model/src/test/java/com/yahoo/vespa/model/HostResourceTest.java index 4d8dd3dacfd..ea075dc1129 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/HostResourceTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/HostResourceTest.java @@ -34,9 +34,9 @@ public class HostResourceTest { } @Test - public void host_witrh_membership() { - HostResource host = hostResourceWithMemberships(ClusterMembership.from(clusterSpec(container, "jdisc"), 0)); - assertClusterMembership(host, container, "jdisc"); + public void host_with_membership() { + HostResource host = hostResourceWithMemberships(ClusterMembership.from(clusterSpec(container, "container"), 0)); + assertClusterMembership(host, container, "container"); } private void assertClusterMembership(HostResource host, ClusterSpec.Type type, String id) { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java index e76d89a6854..d91dba0572f 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java @@ -114,22 +114,6 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase { assertTrue(config.bundlePaths().contains(ContainerModelEvaluation.MODEL_INTEGRATION_BUNDLE_FILE.toString())); } - @Test - public void deprecated_jdisc_tag_is_allowed() { - Element clusterElem = DomBuilderTest.parse( - "", - nodesXml, - "" ); - TestLogger logger = new TestLogger(); - createModel(root, logger, clusterElem); - AbstractService container = (AbstractService)root.getProducer("jdisc/container.0"); - assertNotNull(container); - - assertFalse(logger.msgs.isEmpty()); - assertEquals(Level.WARNING, logger.msgs.get(0).getFirst()); - assertEquals("'jdisc' is deprecated as tag name. Use 'container' instead.", logger.msgs.get(0).getSecond()); - } - @Test public void default_port_is_4080() { Element clusterElem = DomBuilderTest.parse( diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/ModelAmendingTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/test/ModelAmendingTestCase.java index 3de8cfe540f..2ae1399e9d1 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/test/ModelAmendingTestCase.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/test/ModelAmendingTestCase.java @@ -82,7 +82,7 @@ public class ModelAmendingTestCase { assertFalse(host + " is amended", host.getHost().getChildrenByTypeRecursive(AmendedService.class).isEmpty()); } - // Check that jdisc clusters are amended + // Check that container clusters are amended assertEquals(2, model.getContainerClusters().size()); assertNotNull(model.getContainerClusters().get("test1").getComponentsMap().get(new ComponentId("com.yahoo.MyAmendedComponent"))); assertNotNull(model.getContainerClusters().get("test2").getComponentsMap().get(new ComponentId("com.yahoo.MyAmendedComponent"))); @@ -129,7 +129,7 @@ public class ModelAmendingTestCase { assertFalse(host + " is amended", host.getHost().getChildrenByTypeRecursive(AmendedService.class).isEmpty()); } - // Check that jdisc clusters are amended + // Check that container clusters are amended assertEquals(2, model.getContainerClusters().size()); assertNotNull(model.getContainerClusters().get("test1").getComponentsMap().get(new ComponentId("com.yahoo.MyAmendedComponent"))); assertNotNull(model.getContainerClusters().get("test2").getComponentsMap().get(new ComponentId("com.yahoo.MyAmendedComponent"))); @@ -211,7 +211,7 @@ public class ModelAmendingTestCase { @Override public void doBuild(ContainerModelAmender model, Element spec, ConfigModelContext modelContext) { - if (built) return; // the same instance will be called once per jdisc cluster + if (built) return; // the same instance will be called once per container cluster for (ContainerModel containerModel : model.containerModels) amend(containerModel.getCluster()); built = true; -- cgit v1.2.3 From 030daab70b51094e9687410ce14690aacb8c4d13 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Sat, 4 Jun 2022 23:52:15 +0200 Subject: Remove config version on Vespa 8 --- application/abi-spec.json | 2 -- .../com/yahoo/config/codegen/JavaClassBuilder.java | 4 +--- configgen/src/test/resources/allfeatures.reference | 2 -- container-core/abi-spec.json | 6 ------ container-disc/abi-spec.json | 2 -- container-search/abi-spec.json | 8 -------- documentapi/abi-spec.json | 4 ---- documentgen-test/pom.xml | 2 +- linguistics-components/abi-spec.json | 4 ---- messagebus/abi-spec.json | 2 -- .../main/java/com/yahoo/vespa/DocumentGenMojo.java | 19 ++----------------- 11 files changed, 4 insertions(+), 51 deletions(-) (limited to 'application') diff --git a/application/abi-spec.json b/application/abi-spec.json index 21eacb152c0..2053eabd9ad 100644 --- a/application/abi-spec.json +++ b/application/abi-spec.json @@ -239,7 +239,6 @@ "public static java.lang.String getDefMd5()", "public static java.lang.String getDefName()", "public static java.lang.String getDefNamespace()", - "public static java.lang.String getDefVersion()", "public void (com.yahoo.application.MockApplicationConfig$Builder)", "public com.yahoo.application.MockApplicationConfig$Mystruct mystruct()", "public java.util.List mystructlist()", @@ -255,7 +254,6 @@ "public static final java.lang.String CONFIG_DEF_MD5", "public static final java.lang.String CONFIG_DEF_NAME", "public static final java.lang.String CONFIG_DEF_NAMESPACE", - "public static final java.lang.String CONFIG_DEF_VERSION", "public static final java.lang.String[] CONFIG_DEF_SCHEMA" ] }, diff --git a/configgen/src/main/java/com/yahoo/config/codegen/JavaClassBuilder.java b/configgen/src/main/java/com/yahoo/config/codegen/JavaClassBuilder.java index f3816adb260..2560b218e54 100644 --- a/configgen/src/main/java/com/yahoo/config/codegen/JavaClassBuilder.java +++ b/configgen/src/main/java/com/yahoo/config/codegen/JavaClassBuilder.java @@ -86,15 +86,13 @@ public class JavaClassBuilder implements ClassBuilder { " public final static String CONFIG_DEF_MD5 = \"" + root.getMd5() + "\";\n" + // " public final static String CONFIG_DEF_NAME = \"" + root.getName() + "\";\n" + // " public final static String CONFIG_DEF_NAMESPACE = \"" + root.getNamespace() + "\";\n" + // - " public final static String CONFIG_DEF_VERSION = \"\";\n" + // TODO: Remove in Vespa 8 " public final static String[] CONFIG_DEF_SCHEMA = {\n" + // "" + indentCode(INDENTATION + INDENTATION, getDefSchema()) + "\n" + // " };\n" + // "\n" + // " public static String getDefMd5() { return CONFIG_DEF_MD5; }\n" + // " public static String getDefName() { return CONFIG_DEF_NAME; }\n" + // - " public static String getDefNamespace() { return CONFIG_DEF_NAMESPACE; }\n" + // - " public static String getDefVersion() { return CONFIG_DEF_VERSION; }"; + " public static String getDefNamespace() { return CONFIG_DEF_NAMESPACE; }"; } private String getDefSchema() { diff --git a/configgen/src/test/resources/allfeatures.reference b/configgen/src/test/resources/allfeatures.reference index 21f49d21413..6ebcfc4ba12 100644 --- a/configgen/src/test/resources/allfeatures.reference +++ b/configgen/src/test/resources/allfeatures.reference @@ -38,7 +38,6 @@ public final class AllfeaturesConfig extends ConfigInstance { public final static String CONFIG_DEF_MD5 = "f901bdc5c96e7005130399c63f247823"; public final static String CONFIG_DEF_NAME = "allfeatures"; public final static String CONFIG_DEF_NAMESPACE = "configgen"; - public final static String CONFIG_DEF_VERSION = ""; public final static String[] CONFIG_DEF_SCHEMA = { "namespace=configgen", "boolVal bool", @@ -92,7 +91,6 @@ public final class AllfeaturesConfig extends ConfigInstance { public static String getDefMd5() { return CONFIG_DEF_MD5; } public static String getDefName() { return CONFIG_DEF_NAME; } public static String getDefNamespace() { return CONFIG_DEF_NAMESPACE; } - public static String getDefVersion() { return CONFIG_DEF_VERSION; } public interface Producer extends ConfigInstance.Producer { void getConfig(Builder builder); diff --git a/container-core/abi-spec.json b/container-core/abi-spec.json index 35dd216eb0a..70b4faa342e 100644 --- a/container-core/abi-spec.json +++ b/container-core/abi-spec.json @@ -355,7 +355,6 @@ "public static java.lang.String getDefMd5()", "public static java.lang.String getDefName()", "public static java.lang.String getDefNamespace()", - "public static java.lang.String getDefVersion()", "public void (com.yahoo.container.handler.ThreadpoolConfig$Builder)", "public int maxthreads()", "public int corePoolSize()", @@ -368,7 +367,6 @@ "public static final java.lang.String CONFIG_DEF_MD5", "public static final java.lang.String CONFIG_DEF_NAME", "public static final java.lang.String CONFIG_DEF_NAMESPACE", - "public static final java.lang.String CONFIG_DEF_VERSION", "public static final java.lang.String[] CONFIG_DEF_SCHEMA" ] }, @@ -1394,7 +1392,6 @@ "public static java.lang.String getDefMd5()", "public static java.lang.String getDefName()", "public static java.lang.String getDefNamespace()", - "public static java.lang.String getDefVersion()", "public void (com.yahoo.jdisc.http.ConnectorConfig$Builder)", "public int listenPort()", "public java.lang.String name()", @@ -1423,7 +1420,6 @@ "public static final java.lang.String CONFIG_DEF_MD5", "public static final java.lang.String CONFIG_DEF_NAME", "public static final java.lang.String CONFIG_DEF_NAMESPACE", - "public static final java.lang.String CONFIG_DEF_VERSION", "public static final java.lang.String[] CONFIG_DEF_SCHEMA" ] }, @@ -2029,7 +2025,6 @@ "public static java.lang.String getDefMd5()", "public static java.lang.String getDefName()", "public static java.lang.String getDefNamespace()", - "public static java.lang.String getDefVersion()", "public void (com.yahoo.jdisc.http.ServerConfig$Builder)", "public boolean developerMode()", "public int responseCompressionLevel()", @@ -2051,7 +2046,6 @@ "public static final java.lang.String CONFIG_DEF_MD5", "public static final java.lang.String CONFIG_DEF_NAME", "public static final java.lang.String CONFIG_DEF_NAMESPACE", - "public static final java.lang.String CONFIG_DEF_VERSION", "public static final java.lang.String[] CONFIG_DEF_SCHEMA" ] }, diff --git a/container-disc/abi-spec.json b/container-disc/abi-spec.json index d924d5196b9..aae37552283 100644 --- a/container-disc/abi-spec.json +++ b/container-disc/abi-spec.json @@ -190,7 +190,6 @@ "public static java.lang.String getDefMd5()", "public static java.lang.String getDefName()", "public static java.lang.String getDefNamespace()", - "public static java.lang.String getDefVersion()", "public void (com.yahoo.container.jdisc.secretstore.SecretStoreConfig$Builder)", "public java.util.List groups()", "public com.yahoo.container.jdisc.secretstore.SecretStoreConfig$Groups groups(int)", @@ -201,7 +200,6 @@ "public static final java.lang.String CONFIG_DEF_MD5", "public static final java.lang.String CONFIG_DEF_NAME", "public static final java.lang.String CONFIG_DEF_NAMESPACE", - "public static final java.lang.String CONFIG_DEF_VERSION", "public static final java.lang.String[] CONFIG_DEF_SCHEMA" ] } diff --git a/container-search/abi-spec.json b/container-search/abi-spec.json index fa66d4aeb60..1cc397d2ed3 100644 --- a/container-search/abi-spec.json +++ b/container-search/abi-spec.json @@ -4436,7 +4436,6 @@ "public static java.lang.String getDefMd5()", "public static java.lang.String getDefName()", "public static java.lang.String getDefNamespace()", - "public static java.lang.String getDefVersion()", "public void (com.yahoo.search.handler.SearchWithRendererHandlerConfig$Builder)", "public java.lang.String rendererId()" ], @@ -4444,7 +4443,6 @@ "public static final java.lang.String CONFIG_DEF_MD5", "public static final java.lang.String CONFIG_DEF_NAME", "public static final java.lang.String CONFIG_DEF_NAMESPACE", - "public static final java.lang.String CONFIG_DEF_VERSION", "public static final java.lang.String[] CONFIG_DEF_SCHEMA" ] }, @@ -4681,7 +4679,6 @@ "public static java.lang.String getDefMd5()", "public static java.lang.String getDefName()", "public static java.lang.String getDefNamespace()", - "public static java.lang.String getDefVersion()", "public void (com.yahoo.search.pagetemplates.PageTemplatesConfig$Builder)", "public java.util.List page()", "public java.lang.String page(int)" @@ -4690,7 +4687,6 @@ "public static final java.lang.String CONFIG_DEF_MD5", "public static final java.lang.String CONFIG_DEF_NAME", "public static final java.lang.String CONFIG_DEF_NAMESPACE", - "public static final java.lang.String CONFIG_DEF_VERSION", "public static final java.lang.String[] CONFIG_DEF_SCHEMA" ] }, @@ -4781,7 +4777,6 @@ "public static java.lang.String getDefMd5()", "public static java.lang.String getDefName()", "public static java.lang.String getDefNamespace()", - "public static java.lang.String getDefVersion()", "public void (com.yahoo.search.pagetemplates.ResolversConfig$Builder)", "public java.util.List component()", "public com.yahoo.search.pagetemplates.ResolversConfig$Component component(int)" @@ -4790,7 +4785,6 @@ "public static final java.lang.String CONFIG_DEF_MD5", "public static final java.lang.String CONFIG_DEF_NAME", "public static final java.lang.String CONFIG_DEF_NAMESPACE", - "public static final java.lang.String CONFIG_DEF_VERSION", "public static final java.lang.String[] CONFIG_DEF_SCHEMA" ] }, @@ -7105,7 +7099,6 @@ "public static java.lang.String getDefMd5()", "public static java.lang.String getDefName()", "public static java.lang.String getDefNamespace()", - "public static java.lang.String getDefVersion()", "public void (com.yahoo.search.query.rewrite.RewritesConfig$Builder)", "public java.util.List fsaDict()", "public com.yahoo.search.query.rewrite.RewritesConfig$FsaDict fsaDict(int)" @@ -7114,7 +7107,6 @@ "public static final java.lang.String CONFIG_DEF_MD5", "public static final java.lang.String CONFIG_DEF_NAME", "public static final java.lang.String CONFIG_DEF_NAMESPACE", - "public static final java.lang.String CONFIG_DEF_VERSION", "public static final java.lang.String[] CONFIG_DEF_SCHEMA" ] }, diff --git a/documentapi/abi-spec.json b/documentapi/abi-spec.json index eef39802a46..c26ab46d316 100644 --- a/documentapi/abi-spec.json +++ b/documentapi/abi-spec.json @@ -2013,7 +2013,6 @@ "public static java.lang.String getDefMd5()", "public static java.lang.String getDefName()", "public static java.lang.String getDefNamespace()", - "public static java.lang.String getDefVersion()", "public void (com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig$Builder)", "public java.util.Map cluster()", "public com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig$Cluster cluster(java.lang.String)" @@ -2022,7 +2021,6 @@ "public static final java.lang.String CONFIG_DEF_MD5", "public static final java.lang.String CONFIG_DEF_NAME", "public static final java.lang.String CONFIG_DEF_NAMESPACE", - "public static final java.lang.String CONFIG_DEF_VERSION", "public static final java.lang.String[] CONFIG_DEF_SCHEMA" ] }, @@ -2201,7 +2199,6 @@ "public static java.lang.String getDefMd5()", "public static java.lang.String getDefName()", "public static java.lang.String getDefNamespace()", - "public static java.lang.String getDefVersion()", "public void (com.yahoo.documentapi.messagebus.protocol.DocumentrouteselectorpolicyConfig$Builder)", "public java.util.List route()", "public com.yahoo.documentapi.messagebus.protocol.DocumentrouteselectorpolicyConfig$Route route(int)" @@ -2210,7 +2207,6 @@ "public static final java.lang.String CONFIG_DEF_MD5", "public static final java.lang.String CONFIG_DEF_NAME", "public static final java.lang.String CONFIG_DEF_NAMESPACE", - "public static final java.lang.String CONFIG_DEF_VERSION", "public static final java.lang.String[] CONFIG_DEF_SCHEMA" ] }, diff --git a/documentgen-test/pom.xml b/documentgen-test/pom.xml index 210b4c10570..c9c62316464 100644 --- a/documentgen-test/pom.xml +++ b/documentgen-test/pom.xml @@ -104,7 +104,7 @@ vespa-documentgen-plugin ${project.version} - etc/complex + etc/complex com.yahoo.vespa.documentgen.test emptyannotation diff --git a/linguistics-components/abi-spec.json b/linguistics-components/abi-spec.json index 39666fd93a3..0db6fff0765 100644 --- a/linguistics-components/abi-spec.json +++ b/linguistics-components/abi-spec.json @@ -134,7 +134,6 @@ "public static java.lang.String getDefMd5()", "public static java.lang.String getDefName()", "public static java.lang.String getDefNamespace()", - "public static java.lang.String getDefVersion()", "public void (com.yahoo.language.sentencepiece.SentencePieceConfig$Builder)", "public boolean collapseUnknowns()", "public com.yahoo.language.sentencepiece.SentencePieceConfig$Scoring$Enum scoring()", @@ -145,7 +144,6 @@ "public static final java.lang.String CONFIG_DEF_MD5", "public static final java.lang.String CONFIG_DEF_NAME", "public static final java.lang.String CONFIG_DEF_NAMESPACE", - "public static final java.lang.String CONFIG_DEF_VERSION", "public static final java.lang.String[] CONFIG_DEF_SCHEMA" ] }, @@ -273,7 +271,6 @@ "public static java.lang.String getDefMd5()", "public static java.lang.String getDefName()", "public static java.lang.String getDefNamespace()", - "public static java.lang.String getDefVersion()", "public void (com.yahoo.language.wordpiece.WordPieceConfig$Builder)", "public java.lang.String subwordPrefix()", "public java.util.List model()", @@ -283,7 +280,6 @@ "public static final java.lang.String CONFIG_DEF_MD5", "public static final java.lang.String CONFIG_DEF_NAME", "public static final java.lang.String CONFIG_DEF_NAMESPACE", - "public static final java.lang.String CONFIG_DEF_VERSION", "public static final java.lang.String[] CONFIG_DEF_SCHEMA" ] }, diff --git a/messagebus/abi-spec.json b/messagebus/abi-spec.json index 83bab8e4734..af298a96d7d 100644 --- a/messagebus/abi-spec.json +++ b/messagebus/abi-spec.json @@ -572,7 +572,6 @@ "public static java.lang.String getDefMd5()", "public static java.lang.String getDefName()", "public static java.lang.String getDefNamespace()", - "public static java.lang.String getDefVersion()", "public void (com.yahoo.messagebus.MessagebusConfig$Builder)", "public java.util.List routingtable()", "public com.yahoo.messagebus.MessagebusConfig$Routingtable routingtable(int)" @@ -581,7 +580,6 @@ "public static final java.lang.String CONFIG_DEF_MD5", "public static final java.lang.String CONFIG_DEF_NAME", "public static final java.lang.String CONFIG_DEF_NAMESPACE", - "public static final java.lang.String CONFIG_DEF_VERSION", "public static final java.lang.String[] CONFIG_DEF_SCHEMA" ] }, diff --git a/vespa-documentgen-plugin/src/main/java/com/yahoo/vespa/DocumentGenMojo.java b/vespa-documentgen-plugin/src/main/java/com/yahoo/vespa/DocumentGenMojo.java index ed497e8ec1b..0183e2d08a6 100644 --- a/vespa-documentgen-plugin/src/main/java/com/yahoo/vespa/DocumentGenMojo.java +++ b/vespa-documentgen-plugin/src/main/java/com/yahoo/vespa/DocumentGenMojo.java @@ -57,20 +57,10 @@ public class DocumentGenMojo extends AbstractMojo { @Parameter( defaultValue = "${project}", readonly = true ) private MavenProject project; - /** - * Directory containing the searchdefinition files - * @deprecated use {@link #schemasDirectory} instead - */ - // TODO: Remove in Vespa 8 - @Deprecated - @Parameter(defaultValue = ".", required = false) - private File sdDirectory; - /** * Directory containing the schema files */ - // TODO: Make this required and with defaultValue "." when sdDirectory is removed in Vespa 8 - @Parameter + @Parameter(defaultValue = ".", required = true) private File schemasDirectory; /** @@ -982,12 +972,7 @@ public class DocumentGenMojo extends AbstractMojo { @Override public void execute() { - File dir = sdDirectory; - // Prefer schemasDirectory if set - if (this.schemasDirectory != null) - dir = this.schemasDirectory; - - execute(dir, this.outputDirectory, packageName); + execute(this.schemasDirectory, this.outputDirectory, packageName); } Map getSearches() { -- cgit v1.2.3 From 10bdcee7461a262c39d7f8d0a800d585822593a7 Mon Sep 17 00:00:00 2001 From: gjoranv Date: Sat, 4 Jun 2022 14:56:04 +0200 Subject: Remove all usage and stop providing net.jcip.annotaitons (only provided build time, not runtime) --- .../main/java/com/yahoo/application/container/handler/Request.java | 2 -- .../main/java/com/yahoo/application/container/handler/Response.java | 2 -- cloud-tenant-base-dependencies-enforcer/pom.xml | 1 - .../vespa/model/container/docproc/model/DocumentProcessorModel.java | 2 -- container-dependencies-enforcer/pom.xml | 1 - container-dependency-versions/pom.xml | 5 ----- container-search/pom.xml | 4 ---- .../yahoo/search/searchchain/model/federation/FederationOptions.java | 3 --- .../yahoo/search/searchchain/model/federation/LocalProviderSpec.java | 3 --- 9 files changed, 23 deletions(-) (limited to 'application') diff --git a/application/src/main/java/com/yahoo/application/container/handler/Request.java b/application/src/main/java/com/yahoo/application/container/handler/Request.java index 1606af498fa..117737b8fee 100644 --- a/application/src/main/java/com/yahoo/application/container/handler/Request.java +++ b/application/src/main/java/com/yahoo/application/container/handler/Request.java @@ -2,7 +2,6 @@ package com.yahoo.application.container.handler; import com.yahoo.api.annotations.Beta; -import net.jcip.annotations.Immutable; import java.nio.charset.StandardCharsets; import java.security.Principal; @@ -16,7 +15,6 @@ import java.util.concurrent.ConcurrentHashMap; * @author Einar M R Rosenvinge * @see Response */ -@Immutable @Beta public class Request { diff --git a/application/src/main/java/com/yahoo/application/container/handler/Response.java b/application/src/main/java/com/yahoo/application/container/handler/Response.java index 91632068328..88f42a429ee 100644 --- a/application/src/main/java/com/yahoo/application/container/handler/Response.java +++ b/application/src/main/java/com/yahoo/application/container/handler/Response.java @@ -4,7 +4,6 @@ package com.yahoo.application.container.handler; import com.yahoo.api.annotations.Beta; import com.yahoo.jdisc.http.HttpHeaders; import com.yahoo.text.Utf8; -import net.jcip.annotations.Immutable; import java.nio.ByteBuffer; import java.nio.charset.CharacterCodingException; @@ -20,7 +19,6 @@ import java.util.regex.Pattern; * @author Einar M R Rosenvinge * @see Request */ -@Immutable @Beta public class Response { diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index f2847c96a44..67baeb9af8b 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -95,7 +95,6 @@ javax.servlet:javax.servlet-api:[${javax.servlet-api.version}]:jar:provided javax.ws.rs:javax.ws.rs-api:[${javax.ws.rs-api.version}]:jar:provided javax.xml.bind:jaxb-api:[${jaxb.version}]:jar:provided - net.jcip:jcip-annotations:[1.0]:jar:provided org.lz4:lz4-java:[${org.lz4.version}]:jar:provided org.apache.felix:org.apache.felix.framework:[${felix.version}]:jar:provided org.apache.felix:org.apache.felix.log:[${felix.log.version}]:jar:provided diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/model/DocumentProcessorModel.java b/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/model/DocumentProcessorModel.java index 669be44d0f6..27fea8a01b4 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/model/DocumentProcessorModel.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/model/DocumentProcessorModel.java @@ -5,7 +5,6 @@ import com.yahoo.collections.Pair; import com.yahoo.container.bundle.BundleInstantiationSpecification; import com.yahoo.component.chain.dependencies.Dependencies; import com.yahoo.component.chain.model.ChainedComponentModel; -import net.jcip.annotations.Immutable; import java.util.HashMap; import java.util.Map; @@ -13,7 +12,6 @@ import java.util.Map; /** * @author Einar M R Rosenvinge */ -@Immutable public class DocumentProcessorModel extends ChainedComponentModel { private final Map, String> fieldNameSchemaMap = new HashMap<>(); diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index a66e1af604d..605d33f1c82 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -80,7 +80,6 @@ javax.servlet:javax.servlet-api:[${javax.servlet-api.version}]:jar:provided javax.ws.rs:javax.ws.rs-api:[${javax.ws.rs-api.version}]:jar:provided javax.xml.bind:jaxb-api:[${jaxb.version}]:jar:provided - net.jcip:jcip-annotations:[1.0]:jar:provided org.lz4:lz4-java:[${org.lz4.version}]:jar:provided org.apache.felix:org.apache.felix.framework:[${felix.version}]:jar:provided org.apache.felix:org.apache.felix.log:[${felix.log.version}]:jar:provided diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index 25c45fa68e7..706ec1b437c 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -129,11 +129,6 @@ - - net.jcip - jcip-annotations - 1.0 - org.lz4 lz4-java diff --git a/container-search/pom.xml b/container-search/pom.xml index 096a49df3a1..adf4e7d9269 100644 --- a/container-search/pom.xml +++ b/container-search/pom.xml @@ -102,10 +102,6 @@ com.ibm.icu icu4j - - net.jcip - jcip-annotations - com.fasterxml.jackson.core jackson-core diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/FederationOptions.java b/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/FederationOptions.java index 57953a915b6..bc9de4ebc2d 100644 --- a/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/FederationOptions.java +++ b/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/FederationOptions.java @@ -1,8 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.searchchain.model.federation; -import net.jcip.annotations.Immutable; - import java.util.Objects; /** @@ -11,7 +9,6 @@ import java.util.Objects; * * @author Tony Vaagenes */ -@Immutable public class FederationOptions implements Cloneable { private final Boolean optional; diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/LocalProviderSpec.java b/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/LocalProviderSpec.java index a12456f5354..3c2767430c7 100644 --- a/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/LocalProviderSpec.java +++ b/container-search/src/main/java/com/yahoo/search/searchchain/model/federation/LocalProviderSpec.java @@ -12,14 +12,11 @@ import java.util.Collection; import java.util.List; import java.util.Objects; -import net.jcip.annotations.Immutable; - /** * Specifies how a local provider is to be set up. * * @author Tony Vaagenes */ -@Immutable public class LocalProviderSpec { public static final Collection searcherModels = -- cgit v1.2.3 From 7e4e4b0b0f9c4c763a764e97c3872b4e52e2e69d Mon Sep 17 00:00:00 2001 From: gjoranv Date: Sun, 5 Jun 2022 00:03:25 +0200 Subject: Don't provide any felix artifacts via 'container' + Stop exporting felix.log packages (org.osgi.service.log) + Completely remove felix.main (the felix launcher including everything in felix.framework). This was probably never needed by vespa. * Add explicit felix.framework dep to vespa-osgi-testrunner and standalone-container, as it's no longer included in container-dev. (The packages are still exported by jdisc_core, so imports will be generated.) * Add felix.framework to 'application', as it's needed for unit tests. * Exclude animal-sniffer-annotations from felix.framework in parent. Not needed anywhere by Vespa. --- application/pom.xml | 4 ++++ cloud-tenant-base-dependencies-enforcer/pom.xml | 7 ++----- container-dependencies-enforcer/pom.xml | 3 --- container-dependency-versions/pom.xml | 17 ----------------- container-dev/pom.xml | 12 ++++++++---- jdisc_core/pom.xml | 1 - .../java/com/yahoo/jdisc/bundle/k/CertificateK.java | 1 - parent/pom.xml | 18 ++++++++++++++++++ provided-dependencies/pom.xml | 4 ---- standalone-container/pom.xml | 5 +++++ vespa-osgi-testrunner/pom.xml | 5 +++++ 11 files changed, 42 insertions(+), 35 deletions(-) (limited to 'application') diff --git a/application/pom.xml b/application/pom.xml index 7e1b54a7904..ceb8653cd1c 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -99,6 +99,10 @@ org.antlr antlr4-runtime + + org.apache.felix + org.apache.felix.framework + org.apache.opennlp opennlp-tools diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 0253683f0e3..729cd91e314 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -21,6 +21,7 @@ 1.10.54 + 7.0.1 5.1.2 4.5.13 4.4.13 @@ -33,8 +34,6 @@ Copied here because vz-tenant-base does not have a parent. --> 1.0 1.68 - 7.0.1 - 1.0.1 27.1-jre 4.2.3 2.13.3 @@ -95,9 +94,6 @@ javax.servlet:javax.servlet-api:[${javax.servlet-api.version}]:jar:provided javax.ws.rs:javax.ws.rs-api:[${javax.ws.rs-api.version}]:jar:provided javax.xml.bind:jaxb-api:[${jaxb.version}]:jar:provided - org.apache.felix:org.apache.felix.framework:[${felix.version}]:jar:provided - org.apache.felix:org.apache.felix.log:[${felix.log.version}]:jar:provided - org.apache.felix:org.apache.felix.main:[${felix.version}]:jar:provided org.bouncycastle:bcpkix-jdk15on:[${bouncycastle.version}]:jar:provided org.bouncycastle:bcprov-jdk15on:[${bouncycastle.version}]:jar:provided org.slf4j:jcl-over-slf4j:[${slf4j.version}]:jar:provided @@ -214,6 +210,7 @@ org.apache.commons:commons-exec:1.3:jar:test org.apache.commons:commons-compress:1.21:jar:test org.apache.commons:commons-math3:3.6.1:jar:test + org.apache.felix:org.apache.felix.framework:[${felix.version}]:jar:test org.apache.httpcomponents.client5:httpclient5:${httpclient5.version}:jar:test org.apache.httpcomponents.core5:httpcore5:${httpclient5.version}:jar:test org.apache.httpcomponents.core5:httpcore5-h2:${httpclient5.version}:jar:test diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml index e507bffa7dc..56ebc92f88d 100644 --- a/container-dependencies-enforcer/pom.xml +++ b/container-dependencies-enforcer/pom.xml @@ -80,9 +80,6 @@ javax.servlet:javax.servlet-api:[${javax.servlet-api.version}]:jar:provided javax.ws.rs:javax.ws.rs-api:[${javax.ws.rs-api.version}]:jar:provided javax.xml.bind:jaxb-api:[${jaxb.version}]:jar:provided - org.apache.felix:org.apache.felix.framework:[${felix.version}]:jar:provided - org.apache.felix:org.apache.felix.log:[${felix.log.version}]:jar:provided - org.apache.felix:org.apache.felix.main:[${felix.version}]:jar:provided org.bouncycastle:bcpkix-jdk15on:[${bouncycastle.version}]:jar:provided org.bouncycastle:bcprov-jdk15on:[${bouncycastle.version}]:jar:provided org.slf4j:jcl-over-slf4j:[${slf4j.version}]:jar:provided diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index 771451084c8..a47b91f3231 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -129,21 +129,6 @@ - - org.apache.felix - org.apache.felix.framework - ${felix.version} - - - org.apache.felix - org.apache.felix.log - ${felix.log.version} - - - org.apache.felix - org.apache.felix.main - ${felix.version} - org.bouncycastle bcpkix-jdk15on @@ -261,8 +246,6 @@ 1.0 1.68 - 7.0.1 - 1.0.1 27.1-jre 4.2.3 2.13.3 diff --git a/container-dev/pom.xml b/container-dev/pom.xml index 39276b888b1..fbea41e94a4 100644 --- a/container-dev/pom.xml +++ b/container-dev/pom.xml @@ -28,6 +28,14 @@ jdisc_core ${project.version} + + org.apache.felix + org.apache.felix.framework + + + org.apache.felix + org.apache.felix.log + org.jvnet.hudson annotation-indexer @@ -52,10 +60,6 @@ guice no_aop - - org.apache.felix - org.apache.felix.main - commons-logging commons-logging diff --git a/jdisc_core/pom.xml b/jdisc_core/pom.xml index 1c5933a02e6..8d09ea1198f 100644 --- a/jdisc_core/pom.xml +++ b/jdisc_core/pom.xml @@ -215,7 +215,6 @@ ${exportPackagesFile} __REPLACE_VERSION__${project.build.directory}/dependency/guava.jar ${project.build.directory}/dependency/guice-no_aop.jar - ${project.build.directory}/dependency/org.apache.felix.log.jar ${project.build.directory}/dependency/slf4j-api.jar ${project.build.directory}/dependency/slf4j-jdk14.jar ${project.build.directory}/dependency/jcl-over-slf4j.jar diff --git a/jdisc_core_test/test_bundles/cert-k-pkgs/src/main/java/com/yahoo/jdisc/bundle/k/CertificateK.java b/jdisc_core_test/test_bundles/cert-k-pkgs/src/main/java/com/yahoo/jdisc/bundle/k/CertificateK.java index 0c3e6e25bae..17a9ca29b1d 100644 --- a/jdisc_core_test/test_bundles/cert-k-pkgs/src/main/java/com/yahoo/jdisc/bundle/k/CertificateK.java +++ b/jdisc_core_test/test_bundles/cert-k-pkgs/src/main/java/com/yahoo/jdisc/bundle/k/CertificateK.java @@ -142,7 +142,6 @@ public class CertificateK { private final org.osgi.framework.AdminPermission permission = null; private final org.osgi.framework.hooks.service.FindHook hook = null; private final org.osgi.framework.launch.Framework framework = null; - private final org.osgi.service.log.LogEntry entry = null; private final org.osgi.service.packageadmin.ExportedPackage pkg = null; private final org.osgi.service.startlevel.StartLevel level = null; private final org.osgi.service.url.URLConstants constants = null; diff --git a/parent/pom.xml b/parent/pom.xml index c23b19a64bf..05b3df87e51 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -666,6 +666,22 @@ commons-csv 1.8 + + org.apache.felix + org.apache.felix.framework + ${felix.version} + + + org.codehaus.mojo + animal-sniffer-annotations + + + + + org.apache.felix + org.apache.felix.log + ${felix.log.version} + org.apache.httpcomponents httpcore @@ -972,6 +988,8 @@ 1.15 3.6.1 11.0.0 + 7.0.1 + 1.0.1 3.0.2 2.8.9 2.1.12 diff --git a/provided-dependencies/pom.xml b/provided-dependencies/pom.xml index f9f6780c72c..a52e7fe7caf 100755 --- a/provided-dependencies/pom.xml +++ b/provided-dependencies/pom.xml @@ -49,10 +49,6 @@ guice no_aop - - org.apache.felix - org.apache.felix.main - diff --git a/standalone-container/pom.xml b/standalone-container/pom.xml index 25c4b8f801f..b9b58f37c00 100644 --- a/standalone-container/pom.xml +++ b/standalone-container/pom.xml @@ -72,6 +72,11 @@ ${project.version} provided + + org.apache.felix + org.apache.felix.framework + provided + diff --git a/vespa-osgi-testrunner/pom.xml b/vespa-osgi-testrunner/pom.xml index 98cb158b71e..03de830e658 100644 --- a/vespa-osgi-testrunner/pom.xml +++ b/vespa-osgi-testrunner/pom.xml @@ -75,6 +75,11 @@ ${project.version} provided + + org.apache.felix + org.apache.felix.framework + provided + -- cgit v1.2.3 From 651306b9172bf91ed278fb717f2ab78f0e331022 Mon Sep 17 00:00:00 2001 From: gjoranv Date: Tue, 7 Jun 2022 12:33:32 +0200 Subject: Revoke deprecated implementation classes in c.y.docproc from public --- .../application/container/DocumentProcessing.java | 15 +- .../observability/ApplicationStatusHandler.java | 2 +- docproc/abi-spec.json | 112 +----- docproc/src/main/java/com/yahoo/docproc/Call.java | 2 +- .../java/com/yahoo/docproc/DocprocExecutor.java | 191 ---------- .../java/com/yahoo/docproc/DocprocService.java | 404 --------------------- .../yahoo/docproc/DocumentOperationWrapper.java | 15 - .../java/com/yahoo/docproc/DocumentProcessor.java | 2 +- .../yahoo/docproc/HandledProcessingException.java | 18 - .../main/java/com/yahoo/docproc/Processing.java | 85 +---- .../java/com/yahoo/docproc/ProcessingEndpoint.java | 15 - .../yahoo/docproc/TransientFailureException.java | 18 - .../com/yahoo/docproc/impl/DocprocExecutor.java | 193 ++++++++++ .../com/yahoo/docproc/impl/DocprocService.java | 404 +++++++++++++++++++++ .../docproc/impl/DocumentOperationWrapper.java | 13 + .../docproc/impl/HandledProcessingException.java | 16 + .../com/yahoo/docproc/impl/ProcessingAccess.java | 31 ++ .../com/yahoo/docproc/impl/ProcessingEndpoint.java | 15 + .../docproc/impl/TransientFailureException.java | 16 + .../java/com/yahoo/docproc/impl/package-info.java | 5 + .../docproc/jdisc/DocumentProcessingHandler.java | 10 +- .../docproc/jdisc/DocumentProcessingTask.java | 12 +- .../jdisc/messagebus/MbusRequestContext.java | 10 +- .../jdisc/messagebus/ProcessingFactory.java | 12 +- .../com/yahoo/docproc/proxy/ProxyDocument.java | 4 +- .../yahoo/docproc/proxy/ProxyDocumentUpdate.java | 3 +- .../java/com/yahoo/docproc/CallbackTestCase.java | 2 + .../DocumentProcessingAbstractTestCase.java | 1 + .../com/yahoo/docproc/EmptyProcessingTestCase.java | 2 +- .../docproc/FailingDocumentProcessingTestCase.java | 2 + ...DocumentProcessingWithoutExceptionTestCase.java | 1 + ...ilingPermanentlyDocumentProcessingTestCase.java | 2 +- .../yahoo/docproc/FailingWithErrorTestCase.java | 3 +- .../NotAcceptingNewProcessingsTestCase.java | 1 + .../yahoo/docproc/ProcessingUpdateTestCase.java | 1 + .../docproc/SimpleDocumentProcessingTestCase.java | 1 + .../docproc/SimpleDocumentProcessorTestCase.java | 1 + .../yahoo/docproc/TransientFailureTestCase.java | 3 + .../jdisc/DocumentProcessingHandlerTestBase.java | 5 +- 39 files changed, 746 insertions(+), 902 deletions(-) delete mode 100644 docproc/src/main/java/com/yahoo/docproc/DocprocExecutor.java delete mode 100644 docproc/src/main/java/com/yahoo/docproc/DocprocService.java delete mode 100644 docproc/src/main/java/com/yahoo/docproc/DocumentOperationWrapper.java delete mode 100644 docproc/src/main/java/com/yahoo/docproc/HandledProcessingException.java delete mode 100644 docproc/src/main/java/com/yahoo/docproc/ProcessingEndpoint.java delete mode 100644 docproc/src/main/java/com/yahoo/docproc/TransientFailureException.java create mode 100644 docproc/src/main/java/com/yahoo/docproc/impl/DocprocExecutor.java create mode 100644 docproc/src/main/java/com/yahoo/docproc/impl/DocprocService.java create mode 100644 docproc/src/main/java/com/yahoo/docproc/impl/DocumentOperationWrapper.java create mode 100644 docproc/src/main/java/com/yahoo/docproc/impl/HandledProcessingException.java create mode 100644 docproc/src/main/java/com/yahoo/docproc/impl/ProcessingAccess.java create mode 100644 docproc/src/main/java/com/yahoo/docproc/impl/ProcessingEndpoint.java create mode 100644 docproc/src/main/java/com/yahoo/docproc/impl/TransientFailureException.java create mode 100644 docproc/src/main/java/com/yahoo/docproc/impl/package-info.java (limited to 'application') diff --git a/application/src/main/java/com/yahoo/application/container/DocumentProcessing.java b/application/src/main/java/com/yahoo/application/container/DocumentProcessing.java index f0f85fb78dd..0c581357281 100644 --- a/application/src/main/java/com/yahoo/application/container/DocumentProcessing.java +++ b/application/src/main/java/com/yahoo/application/container/DocumentProcessing.java @@ -3,8 +3,8 @@ package com.yahoo.application.container; import com.yahoo.api.annotations.Beta; import com.yahoo.component.ComponentSpecification; -import com.yahoo.docproc.DocprocExecutor; -import com.yahoo.docproc.DocprocService; +import com.yahoo.docproc.impl.DocprocExecutor; +import com.yahoo.docproc.impl.DocprocService; import com.yahoo.docproc.DocumentProcessor; import com.yahoo.docproc.jdisc.DocumentProcessingHandler; import com.yahoo.document.DocumentType; @@ -59,13 +59,8 @@ public final class DocumentProcessing { * @return Progress.DONE or Progress.FAILED * @throws RuntimeException if one of the document processors in the chain throws, or if the calling thread is interrupted */ - @SuppressWarnings("removal") // TODO Vespa 8: remove public DocumentProcessor.Progress process(ComponentSpecification chain, com.yahoo.docproc.Processing processing) { DocprocExecutor executor = getExecutor(chain); - - // TODO Vespa 8: Remove statement (registry will be removed from Processing) - processing.setDocprocServiceRegistry(handler.getDocprocServiceRegistry()); - return executor.processUntilDone(processing); } @@ -82,17 +77,11 @@ public final class DocumentProcessing { * @return any Progress * @throws RuntimeException if one of the document processors in the chain throws */ - @SuppressWarnings("removal") // TODO Vespa 8: remove public DocumentProcessor.Progress processOnce(ComponentSpecification chain, com.yahoo.docproc.Processing processing) { DocprocExecutor executor = getExecutor(chain); - - // TODO Vespa 8: Remove statement (registry will be removed from Processing) - processing.setDocprocServiceRegistry(handler.getDocprocServiceRegistry()); - return executor.process(processing); } - @SuppressWarnings("removal") // TODO Vespa 8: remove private DocprocExecutor getExecutor(ComponentSpecification chain) { DocprocService service = handler.getDocprocServiceRegistry().getComponent(chain); if (service == null) { diff --git a/container-search-and-docproc/src/main/java/com/yahoo/container/handler/observability/ApplicationStatusHandler.java b/container-search-and-docproc/src/main/java/com/yahoo/container/handler/observability/ApplicationStatusHandler.java index 7361723a3a5..a798895a7f5 100644 --- a/container-search-and-docproc/src/main/java/com/yahoo/container/handler/observability/ApplicationStatusHandler.java +++ b/container-search-and-docproc/src/main/java/com/yahoo/container/handler/observability/ApplicationStatusHandler.java @@ -16,7 +16,7 @@ import com.yahoo.container.Container; import com.yahoo.container.core.ApplicationMetadataConfig; import com.yahoo.container.jdisc.JdiscBindingsConfig; import com.yahoo.docproc.Call; -import com.yahoo.docproc.DocprocService; +import com.yahoo.docproc.impl.DocprocService; import com.yahoo.docproc.jdisc.DocumentProcessingHandler; import com.yahoo.jdisc.handler.AbstractRequestHandler; import com.yahoo.jdisc.handler.CompletionHandler; diff --git a/docproc/abi-spec.json b/docproc/abi-spec.json index f90d31023d3..41c76cc3a17 100644 --- a/docproc/abi-spec.json +++ b/docproc/abi-spec.json @@ -132,72 +132,6 @@ ], "fields": [] }, - "com.yahoo.docproc.DocprocExecutor": { - "superClass": "java.lang.Object", - "interfaces": [], - "attributes": [ - "public" - ], - "methods": [ - "public void (java.lang.String, com.yahoo.docproc.CallStack)", - "public void (com.yahoo.docproc.DocprocExecutor, com.yahoo.docproc.CallStack)", - "public com.yahoo.docproc.CallStack getCallStack()", - "public java.lang.String getName()", - "public com.yahoo.docproc.DocumentProcessor$Progress process(com.yahoo.docproc.Processing)", - "public com.yahoo.docproc.DocumentProcessor$Progress processUntilDone(com.yahoo.docproc.Processing)" - ], - "fields": [] - }, - "com.yahoo.docproc.DocprocService": { - "superClass": "com.yahoo.component.AbstractComponent", - "interfaces": [], - "attributes": [ - "public" - ], - "methods": [ - "public void (com.yahoo.component.ComponentId)", - "public void (com.yahoo.component.ComponentId, com.yahoo.docproc.CallStack, com.yahoo.document.DocumentTypeManager, int)", - "public void (com.yahoo.component.ComponentId, com.yahoo.docproc.CallStack, com.yahoo.document.DocumentTypeManager)", - "public void (java.lang.String)", - "public void deconstruct()", - "public com.yahoo.document.DocumentTypeManager getDocumentTypeManager()", - "public void setDocumentTypeManager(com.yahoo.document.DocumentTypeManager)", - "public int getQueueSize()", - "public com.yahoo.docproc.DocprocExecutor getExecutor()", - "public java.util.concurrent.ThreadPoolExecutor getThreadPoolExecutor()", - "public void setInService(boolean)", - "public boolean isInService()", - "public boolean isAcceptingNewProcessings()", - "public void setAcceptingNewProcessings(boolean)", - "public java.lang.String getName()", - "public com.yahoo.docproc.CallStack getCallStack()", - "public void setCallStack(com.yahoo.docproc.CallStack)", - "public void process(com.yahoo.docproc.Processing, com.yahoo.docproc.ProcessingEndpoint)", - "public void process(com.yahoo.docproc.Processing)", - "public void process(com.yahoo.document.DocumentOperation, com.yahoo.docproc.ProcessingEndpoint)", - "public void process(com.yahoo.document.DocumentOperation)", - "public void processDocumentOperations(java.util.List, com.yahoo.docproc.ProcessingEndpoint)", - "public void processDocumentOperations(java.util.List)", - "public boolean doWork()", - "public boolean doWorkBlocking()" - ], - "fields": [ - "public static com.yahoo.docproc.proxy.SchemaMap schemaMap" - ] - }, - "com.yahoo.docproc.DocumentOperationWrapper": { - "superClass": "java.lang.Object", - "interfaces": [], - "attributes": [ - "public", - "interface", - "abstract" - ], - "methods": [ - "public abstract com.yahoo.document.DocumentOperation getWrappedDocumentOperation()" - ], - "fields": [] - }, "com.yahoo.docproc.DocumentProcessor$LaterProgress": { "superClass": "com.yahoo.docproc.DocumentProcessor$Progress", "interfaces": [], @@ -252,19 +186,8 @@ ], "fields": [] }, - "com.yahoo.docproc.HandledProcessingException": { - "superClass": "java.lang.RuntimeException", - "interfaces": [], - "attributes": [ - "public" - ], - "methods": [ - "public void (java.lang.String)" - ], - "fields": [] - }, "com.yahoo.docproc.Processing": { - "superClass": "java.lang.Object", + "superClass": "com.yahoo.docproc.impl.ProcessingAccess", "interfaces": [], "attributes": [ "public" @@ -273,39 +196,27 @@ "public void ()", "public static com.yahoo.docproc.Processing of(com.yahoo.document.DocumentOperation)", "public void (java.lang.String, com.yahoo.document.DocumentOperation, com.yahoo.docproc.CallStack)", + "protected void (java.lang.String, java.util.List, com.yahoo.docproc.CallStack, com.yahoo.docproc.impl.ProcessingEndpoint, boolean)", "public static com.yahoo.docproc.Processing createProcessingFromDocumentOperations(java.lang.String, java.util.List, com.yahoo.docproc.CallStack)", - "public com.yahoo.component.provider.ComponentRegistry getDocprocServiceRegistry()", - "public void setDocprocServiceRegistry(com.yahoo.component.provider.ComponentRegistry)", "public java.lang.String getServiceName()", "public void setServiceName(java.lang.String)", - "public com.yahoo.docproc.DocprocService getService()", "public java.lang.Object getVariable(java.lang.String)", "public java.util.Iterator getVariableAndNameIterator()", "public void clearVariables()", "public void setVariable(java.lang.String, java.lang.Object)", "public java.lang.Object removeVariable(java.lang.String)", "public boolean hasVariable(java.lang.String)", + "protected com.yahoo.docproc.impl.ProcessingEndpoint getEndpoint()", + "protected void setEndpoint(com.yahoo.docproc.impl.ProcessingEndpoint)", "public void addDocumentOperation(com.yahoo.document.DocumentOperation)", "public java.util.List getDocumentOperations()", "public com.yahoo.docproc.CallStack callStack()", + "protected void setCallStack(com.yahoo.docproc.CallStack)", + "protected java.util.List getOnceOperationsToBeProcessed()", "public java.lang.String toString()" ], "fields": [] }, - "com.yahoo.docproc.ProcessingEndpoint": { - "superClass": "java.lang.Object", - "interfaces": [], - "attributes": [ - "public", - "interface", - "abstract" - ], - "methods": [ - "public abstract void processingDone(com.yahoo.docproc.Processing)", - "public abstract void processingFailed(com.yahoo.docproc.Processing, java.lang.Exception)" - ], - "fields": [] - }, "com.yahoo.docproc.SimpleDocumentProcessor": { "superClass": "com.yahoo.docproc.DocumentProcessor", "interfaces": [], @@ -320,16 +231,5 @@ "public final com.yahoo.docproc.DocumentProcessor$Progress process(com.yahoo.docproc.Processing)" ], "fields": [] - }, - "com.yahoo.docproc.TransientFailureException": { - "superClass": "java.lang.RuntimeException", - "interfaces": [], - "attributes": [ - "public" - ], - "methods": [ - "public void (java.lang.String)" - ], - "fields": [] } } \ No newline at end of file diff --git a/docproc/src/main/java/com/yahoo/docproc/Call.java b/docproc/src/main/java/com/yahoo/docproc/Call.java index 75670badf91..440935ef494 100644 --- a/docproc/src/main/java/com/yahoo/docproc/Call.java +++ b/docproc/src/main/java/com/yahoo/docproc/Call.java @@ -2,6 +2,7 @@ package com.yahoo.docproc; import com.yahoo.component.ComponentId; +import com.yahoo.docproc.impl.DocumentOperationWrapper; import com.yahoo.docproc.jdisc.metric.NullMetric; import com.yahoo.docproc.proxy.ProxyDocument; import com.yahoo.docproc.proxy.ProxyDocumentUpdate; @@ -122,7 +123,6 @@ public class Call implements Cloneable { } - @SuppressWarnings("removal") // TODO Vespa 8: remove private void unwrapSchemaMapping(Processing processing) { final List documentOperations = processing.getDocumentOperations(); diff --git a/docproc/src/main/java/com/yahoo/docproc/DocprocExecutor.java b/docproc/src/main/java/com/yahoo/docproc/DocprocExecutor.java deleted file mode 100644 index 0e7a217efbe..00000000000 --- a/docproc/src/main/java/com/yahoo/docproc/DocprocExecutor.java +++ /dev/null @@ -1,191 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.docproc; - -import com.yahoo.document.DocumentOperation; -import com.yahoo.document.DocumentPut; -import com.yahoo.document.json.JsonWriter; -import com.yahoo.jdisc.Metric; -import com.yahoo.text.Utf8; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.function.Function; -import java.util.logging.Level; -import java.util.logging.Logger; - -import static java.util.stream.Collectors.counting; -import static java.util.stream.Collectors.groupingBy; - -/** - * An executor executed incoming processings on its CallStack - * - * @author Einar M R Rosenvinge - * @deprecated Will be removed in Vespa 8. Only for internal use. - */ -@Deprecated(forRemoval = true, since = "7") -public class DocprocExecutor { - - private final static String METRIC_NAME_DOCUMENTS_PROCESSED = "documents_processed"; - - private static final Logger log = Logger.getLogger(DocprocExecutor.class.getName()); - - private final String name; - private final String docCounterName; - private final Metric metric; - private final Function contexts; - private final CallStack callStack; - - /** - * Creates a new named DocprocExecutor with the given CallStack. - * - * @param name the name of this executor - * @param callStack the chain of document processors this executor shall execute on processings - */ - public DocprocExecutor(String name, CallStack callStack) { - this.name = name; - String chainDimension = name != null ? name.replaceAll("[^\\p{Alnum}]", "_") : name; - docCounterName = "chain_" + chainDimension + "_documents"; - this.metric = callStack.getMetric(); - this.callStack = callStack; - this.callStack.setName(name); - this.contexts = cachedContexts(chainDimension); - } - - /** - * Creates a new named DocprocExecutor, with the same instance variables as the given executor, - * but a new call stack. - * - * @param oldExecutor the executor to inherit the instance variables from, sans call stack. - * @param callStack the call stack to use. - */ - public DocprocExecutor(DocprocExecutor oldExecutor, CallStack callStack) { - this.name = oldExecutor.name; - this.docCounterName = oldExecutor.docCounterName; - this.metric = oldExecutor.metric; - this.contexts = oldExecutor.contexts; - this.callStack = callStack; - } - - public CallStack getCallStack() { - return callStack; - } - - public String getName() { - return name; - } - - private void incrementNumDocsProcessed(Processing processing) { - List operations = processing.getOnceOperationsToBeProcessed(); - if ( ! operations.isEmpty()) { - metric.add(docCounterName, operations.size(), null); - operations.stream() - .collect(groupingBy(operation -> operation.getId().getDocType(), counting())) - .forEach((type, count) -> metric.add(METRIC_NAME_DOCUMENTS_PROCESSED, count, contexts.apply(type))); - } - } - - /** - * Processes a given Processing through the CallStack of this executor. - * - * @param processing the Processing to process. The CallStack of the Processing will be set to a clone of the CallStack of this executor, iff. it is currently null. - * @return a Progress; if this is LATER, the Processing is not done and must be reprocessed later. - * @throws RuntimeException if a document processor throws an exception during processing. - * @see com.yahoo.docproc.Processing - */ - public DocumentProcessor.Progress process(Processing processing) { - processing.setServiceName(getName()); - if (processing.callStack() == null) { - processing.setCallStack(new CallStack(getCallStack())); - } - - DocumentProcessor.Progress progress = DocumentProcessor.Progress.DONE; - //metrics stuff: - //TODO: Note that this is *wrong* in case of Progress.LATER, documents are then counted several times until the Processing is DONE or FAILED. - incrementNumDocsProcessed(processing); - do { - Call call = processing.callStack().pop(); - if (call == null) { - // No more processors - done - return progress; - } - - //might throw exception, which is OK: - progress = call.call(processing); - - if (log.isLoggable(Level.FINEST)) { - logProgress(processing, progress, call); - } - - if (DocumentProcessor.Progress.LATER.equals(progress)) { - processing.callStack().addNext(call); - return progress; - } - } while (DocumentProcessor.Progress.DONE.equals(progress)); - return progress; - } - - private void logProgress(Processing processing, DocumentProcessor.Progress progress, Call call) { - StringBuilder message = new StringBuilder(); - boolean first = true; - message.append(call.getDocumentProcessorId()).append(" of class ") - .append(call.getDocumentProcessor().getClass().getSimpleName()).append(" returned ").append(progress) - .append(" for the documents: ["); - for (DocumentOperation op : processing.getDocumentOperations()) { - if (first) { - first = false; - } else { - message.append(", "); - } - if (op instanceof DocumentPut) { - message.append(Utf8.toString(JsonWriter.toByteArray(((DocumentPut) op).getDocument()))); - } else { - message.append(op.toString()); - } - } - message.append("]"); - log.log(Level.FINEST, message.toString()); - } - - /** - * Processes a given Processing through the CallStack of this executor. Note that if a DocumentProcessor - * returns a LaterProgress for this processing, it will be re-processed (after waiting the specified delay given - * by the LaterProgress), until done or failed. - * - * @param processing the Processing to process. The CallStack of the Processing will be set to a clone of the CallStack of this executor, iff. it is currently null. - * @return a Progress; this is never a LaterProgress. - * @throws RuntimeException if a document processor throws an exception during processing, or this thread is interrupted while waiting. - * @see com.yahoo.docproc.Processing - * @see com.yahoo.docproc.DocumentProcessor.Progress - * @see com.yahoo.docproc.DocumentProcessor.LaterProgress - */ - public DocumentProcessor.Progress processUntilDone(Processing processing) { - DocumentProcessor.Progress progress; - while (true) { - progress = process(processing); - if (!(progress instanceof DocumentProcessor.LaterProgress)) { - break; - } - DocumentProcessor.LaterProgress later = (DocumentProcessor.LaterProgress) progress; - try { - Thread.sleep(later.getDelay()); - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - throw new RuntimeException(e); - } - } - return progress; - } - - private Function cachedContexts(String chainDimension) { - Map contextCache = new ConcurrentHashMap<>(); - return documentType -> contextCache.computeIfAbsent(documentType, type -> { - Map dimensions = new HashMap<>(2); - dimensions.put("chain", chainDimension); - dimensions.put("documenttype", type); - return metric.createContext(dimensions); - }); - } - -} diff --git a/docproc/src/main/java/com/yahoo/docproc/DocprocService.java b/docproc/src/main/java/com/yahoo/docproc/DocprocService.java deleted file mode 100644 index c6956f44f52..00000000000 --- a/docproc/src/main/java/com/yahoo/docproc/DocprocService.java +++ /dev/null @@ -1,404 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.docproc; - -import com.yahoo.component.AbstractComponent; -import com.yahoo.component.ComponentId; -import com.yahoo.concurrent.DaemonThreadFactory; -import com.yahoo.docproc.proxy.SchemaMap; -import com.yahoo.document.DocumentOperation; -import com.yahoo.document.DocumentTypeManager; - -import java.util.List; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.RejectedExecutionException; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; -import java.util.logging.Level; -import java.util.logging.Logger; - -/** - *

The document processing service. - * Use this to set up a document processing chain and to - * process documents using that chain. Note that there may - * be multiple named instances of this service in the same - * runtime. The default service is called "default" and is always present.

- * - *

To create a server which receives documents from the network - * and processes them, have a look at com.yahoo.docproc.server.Server.

- * - *

This class is thread safe.

- * - * @author bratseth - * @deprecated Will be removed in Vespa 8. Only for internal use. - */ -@SuppressWarnings("removal") // TODO Vespa 8: remove -@Deprecated(forRemoval = true, since = "7") -public class DocprocService extends AbstractComponent { - - private static final Logger log = Logger.getLogger(DocprocService.class.getName()); - private volatile DocprocExecutor executor; - - /** The processings currently in progress at this service */ - private final LinkedBlockingQueue queue; - private final ThreadPoolExecutor threadPool; - /** The current state of this service */ - private boolean inService = false; - /** The current state of this service */ - private boolean acceptingNewProcessings = true; - public static SchemaMap schemaMap = new SchemaMap(); - private DocumentTypeManager documentTypeManager = null; - - private DocprocService(ComponentId id, int numThreads) { - super(id); - queue = new LinkedBlockingQueue<>(); - threadPool = new ThreadPoolExecutor(numThreads, - numThreads, - 0, TimeUnit.SECONDS, - new LinkedBlockingQueue<>(), - new DaemonThreadFactory("docproc-" + id.stringValue() + "-")); - } - - public DocprocService(ComponentId id) { - this(id, Runtime.getRuntime().availableProcessors()); - } - - /** - * Creates a new docproc service, which is set to be in service. - * - * @param id the component id of the new service. - * @param stack the call stack to use. - * @param mgr the document type manager to use. - * @param numThreads to have in the thread pool - */ - public DocprocService(ComponentId id, CallStack stack, DocumentTypeManager mgr, int numThreads) { - this(id, numThreads); - setCallStack(stack); - setDocumentTypeManager(mgr); - setInService(true); - } - - @Deprecated - public DocprocService(ComponentId id, CallStack stack, DocumentTypeManager mgr) { - this(id, stack, mgr, Runtime.getRuntime().availableProcessors()); - } - - /** - * Creates a service with a name with an unbounded input queue. If the given name is null or the empty string, - * it will become the name "default". - * Testing only - */ - public DocprocService(String name) { - this(new ComponentId(name, null), 1); - } - - @Override - public void deconstruct() { - threadPool.shutdown(); - } - - public DocumentTypeManager getDocumentTypeManager() { - return documentTypeManager; - } - - public void setDocumentTypeManager(DocumentTypeManager documentTypeManager) { - this.documentTypeManager = documentTypeManager; - } - - public int getQueueSize() { - return queue.size(); - } - - /** - * Returns the DocprocExecutor of this DocprocService. This can be used to - * synchronously process one Processing. - * - * @return the DocprocExecutor of this DocprocService, or null if a CallStack has not yet been set. - */ - public DocprocExecutor getExecutor() { - return executor; - } - - public ThreadPoolExecutor getThreadPoolExecutor() { - return threadPool; - } - - private void setExecutor(DocprocExecutor executor) { - this.executor = executor; - } - - /** - * Sets whether this should currently perform any processing. - * New processings will be accepted also when this is out of service, - * but no processing will happen when it is out of service. - */ - public void setInService(boolean inService) { - this.inService = inService; - } - - /** - * Returns true if this is currently processing incoming processings - * (in service), or false if they are just queued up (out of service). - * By default, this is out of service. - */ - public boolean isInService() { - return inService; - } - - /** - * Returns true if this service currently accepts new incoming processings via process(...). Default is true. - * - * @return true if accepting new incoming processings - */ - public boolean isAcceptingNewProcessings() { - return acceptingNewProcessings; - } - - /** - * Sets whether this service should accept new incoming processings via process(...). - * - * @param acceptingNewProcessings true if service should accept new incoming processings - */ - public void setAcceptingNewProcessings(boolean acceptingNewProcessings) { - this.acceptingNewProcessings = acceptingNewProcessings; - } - - public String getName() { - return getId().stringValue(); - } - - /** - * Returns the processing chain of this service. This stack can not be modified. - * To change the stack, set a new one. - */ - // TODO: Enforce unmodifiability - public CallStack getCallStack() { - DocprocExecutor ex = getExecutor(); - return (ex == null) ? null : ex.getCallStack(); - } - - /** - * Sets a new processing stack for this service. This will be the Prototype - * for the call stacks of individual processings in this service - */ - public void setCallStack(CallStack stack) { - DocprocExecutor ex = ((getExecutor() == null) ? new DocprocExecutor(getName(), stack) : new DocprocExecutor(getExecutor(), stack)); - setExecutor(ex); - } - - /** - * Asynchronously process the given Processing using the processing - * chain of this service, and call the specified ProcessingEndpoint when done. - * - * @throws RuntimeException caused by a QueueFullException if this DocprocService has a bounded input queue and the queue is full - * @throws IllegalStateException if this DocprocService is not accepting new incoming processings - */ - public void process(Processing processing, ProcessingEndpoint endp) { - processing.setServiceName(getName()); - processing.setCallStack(new CallStack(getCallStack())); - processing.setEndpoint(endp); - addProcessing(processing); - } - - /** - * Asynchronously process the given Processing using the processing - * chain of this service - * - * @throws RuntimeException caused by a QueueFullException if this DocprocService has a bounded input queue and the queue is full - * @throws IllegalStateException if this DocprocService is not accepting new incoming processings - */ - public void process(Processing processing) { - process(processing, null); - } - - /** - * Asynchronously process the given document put or document update using the processing - * chain of this service, and call the specified ProcessingEndpoint when done. - * - * @throws RuntimeException caused by a QueueFullException if this DocprocService has a bounded input queue and the queue is full - * @throws IllegalStateException if this DocprocService is not accepting new incoming processings - */ - public void process(DocumentOperation documentOperation, ProcessingEndpoint endp) { - addProcessing(new Processing(getName(), documentOperation, new CallStack(getCallStack()), endp)); - } - - /** - * Asynchronously process the given document operation using the processing - * chain of this service. - * - * @throws RuntimeException caused by a QueueFullException if this DocprocService has a bounded input queue and the queue is full - * @throws IllegalStateException if this DocprocService is not accepting new incoming processings - */ - public void process(DocumentOperation documentOperation) { - process(documentOperation, null); - } - - /** - * Asynchronously process the given document operations as one unit - * using the processing chain of this service, - * and call the specified ProcessingEndpoint when done. - * - * @throws RuntimeException caused by a QueueFullException if this DocprocService has a bounded input queue and the queue is full - * @throws IllegalStateException if this DocprocService is not accepting new incoming processings - */ - public void processDocumentOperations(List documentOperations, ProcessingEndpoint endp) { - addProcessing(Processing.createProcessingFromDocumentOperations(getName(), documentOperations, new CallStack(getCallStack()), endp)); - } - - /** - * Asynchronously process the given document operations as one unit - * using the processing chain of this service. - * - * @throws RuntimeException caused by a QueueFullException if this DocprocService has a bounded input queue and the queue is full - * @throws IllegalStateException if this DocprocService is not accepting new incoming processings - */ - public void processDocumentOperations(List documentOperations) { - processDocumentOperations(documentOperations, null); - } - - private void addProcessing(Processing processing) { - if ( ! isAcceptingNewProcessings()) - throw new IllegalStateException("Docproc service " + getName() + - " is not accepting new incoming processings. Cannot add " + processing + " "); - - if ( ! queue.offer(processing)) - throw new RejectedExecutionException("Docproc service " + getName() + " is busy, please try later"); - } - - /** - *

Do some work in this service. This will perform some processing and return - * in a "short" while, as long as individual processors also returns.

- * - *

This method is thread safe - multiple threads may call doWork at any time. - * Note that processors - * should be non-blocking, so multiple threads should be used primarily to - * utilize multiple processors.

- * - * @return true if some work was performed, false if no work could be performed - * at this time, because there are no outstanding processings, or because - * this is out of service. Note that since processings may arrive or be put - * back by another thread at any time, this return value does not mean - * that no work will be available if doWork as called again immediately. - */ - public boolean doWork() { - try { - return doWork(false); - } catch (InterruptedException e) { - //will never happen because we are not blocking - throw new RuntimeException(e); - } - } - - private boolean doWork(boolean blocking) throws InterruptedException { - Processing processing; - if (blocking) { - processing = queue.take(); - } else { - processing = queue.poll(); - } - - if (processing == null) { - //did no work, returning nothing to queue - return false; - } - if (!isInService()) { - //did no work, returning processing (because it's not empty) - queue.add(processing); //always successful, since queue is unbounded - return false; - } - - boolean remove = workOn(processing); //NOTE: Exceptions are handled in here, but not Errors - if (!remove) { - queue.add(processing); //always successful, since queue is unbounded - } - return true; - //NOTE: We *could* have called returnProcessing() in a finally block here, but we don't - //want that, since the only thing being thrown out here is Errors, and then the Processing - //can just disappear instead - } - - /** - *

Do some work in this service. This will perform some processing and return - * in a "short" while, as long as individual processors also returns. Note that - * if the internal queue is empty when this method is called, it will block until - * some work is submitted by a call to process() by another thread.

- * - *

This method is thread safe - multiple threads may call doWorkBlocking at any time. - * Note that processors - * should be non-blocking, so multiple threads should be used primarily to - * utilize multiple processors.

- * - * @return always true, since if the internal queue is empty when this method is - * called, it will block until some work is submitted by a call to - * process() by another thread. - * @throws InterruptedException if a call to this method is interrupted while waiting for data to become available - */ - public boolean doWorkBlocking() throws InterruptedException { - return doWork(true); - } - - /** - * Do some work on this processing. Must only be called from the worker thread. - * - * @return true if this processing should be removed, false if there is more work to do on it later - * @throws NoCallStackException if no CallStack has been set on this executor. - */ - boolean workOn(Processing processing) { - DocprocExecutor ex = getExecutor(); - if (ex == null) { - throw new NoCallStackException(); - } - - DocumentProcessor.Progress progress; - - try { - progress = ex.process(processing); - } catch (Exception e) { - processingFailed(processing, processing + " failed", e); - return true; - } - - if (DocumentProcessor.Progress.DONE.equals(progress)) { - //notify endpoint - ProcessingEndpoint recv = processing.getEndpoint(); - if (recv != null) { - recv.processingDone(processing); - } - return true; - } else if (DocumentProcessor.Progress.FAILED.equals(progress)) { - processingFailed(processing, processing + " failed at " + processing.callStack().getLastPopped(), null); - return true; - } else if (DocumentProcessor.Progress.PERMANENT_FAILURE.equals(progress)) { - processingFailed(processing, - processing + " failed PERMANENTLY at " + processing.callStack().getLastPopped() + ", disabling processing service.", null); - setInService(false); - return true; - } else { - //LATER: - return false; - } - } - - private void processingFailed(Processing processing, String errorMsg, Exception e) { - if (e != null) { - if (e instanceof HandledProcessingException) { - errorMsg += ". Error message: " + e.getMessage(); - log.log(Level.WARNING, errorMsg); - log.log(Level.FINE, "Chained exception:", e); - } else { - log.log(Level.WARNING, errorMsg, e); - } - } else { - log.log(Level.WARNING, errorMsg); - } - - //notify endpoint - ProcessingEndpoint recv = processing.getEndpoint(); - if (recv != null) { - recv.processingFailed(processing, e); - } - } - - private class NoCallStackException extends RuntimeException { - } - -} diff --git a/docproc/src/main/java/com/yahoo/docproc/DocumentOperationWrapper.java b/docproc/src/main/java/com/yahoo/docproc/DocumentOperationWrapper.java deleted file mode 100644 index 4530af29600..00000000000 --- a/docproc/src/main/java/com/yahoo/docproc/DocumentOperationWrapper.java +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.docproc; - -import com.yahoo.document.DocumentOperation; - -/** - * @author Einar M R Rosenvinge - * @deprecated Will be removed in Vespa 8. Only for internal use. - */ -@Deprecated(forRemoval = true, since = "7") -public interface DocumentOperationWrapper { - - DocumentOperation getWrappedDocumentOperation(); - -} diff --git a/docproc/src/main/java/com/yahoo/docproc/DocumentProcessor.java b/docproc/src/main/java/com/yahoo/docproc/DocumentProcessor.java index ae7c1358a4f..7b8f07373a5 100644 --- a/docproc/src/main/java/com/yahoo/docproc/DocumentProcessor.java +++ b/docproc/src/main/java/com/yahoo/docproc/DocumentProcessor.java @@ -3,6 +3,7 @@ package com.yahoo.docproc; import com.yahoo.collections.Pair; import com.yahoo.component.chain.ChainedComponent; +import com.yahoo.docproc.impl.DocprocService; import java.util.HashMap; import java.util.Map; @@ -42,7 +43,6 @@ import java.util.logging.Logger; */ public abstract class DocumentProcessor extends ChainedComponent { - @SuppressWarnings("removal") // TODO Vespa 8: remove static Logger log = Logger.getLogger(DocprocService.class.getName()); /** Schema map for doctype-fieldnames */ diff --git a/docproc/src/main/java/com/yahoo/docproc/HandledProcessingException.java b/docproc/src/main/java/com/yahoo/docproc/HandledProcessingException.java deleted file mode 100644 index 2872d53f558..00000000000 --- a/docproc/src/main/java/com/yahoo/docproc/HandledProcessingException.java +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.docproc; - -/** - * Exception generated by known bad input in a docproc. Will cause only message to be logged, - * not stacktrace. - * - * @author Mathias Mølster Lidal - * @deprecated Will be removed in Vespa 8. Only for internal use. - */ -@Deprecated(forRemoval = true, since = "7") -public class HandledProcessingException extends RuntimeException { - - public HandledProcessingException(String message) { - super(message); - } - -} diff --git a/docproc/src/main/java/com/yahoo/docproc/Processing.java b/docproc/src/main/java/com/yahoo/docproc/Processing.java index 834d63c5a86..7579304c8cb 100644 --- a/docproc/src/main/java/com/yahoo/docproc/Processing.java +++ b/docproc/src/main/java/com/yahoo/docproc/Processing.java @@ -1,7 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.docproc; -import com.yahoo.component.provider.ComponentRegistry; +import com.yahoo.docproc.impl.ProcessingAccess; +import com.yahoo.docproc.impl.ProcessingEndpoint; import com.yahoo.document.DocumentOperation; import java.util.ArrayList; @@ -18,7 +19,7 @@ import java.util.Map; * * @author bratseth */ -public class Processing { +public class Processing extends ProcessingAccess { /** The name of the service which owns this processing. Null is the same as "default". */ private String service = null; @@ -40,13 +41,8 @@ public class Processing { private Map context = null; /** The endpoint of this processing. */ - @SuppressWarnings("removal") // TODO Vespa 8: remove private ProcessingEndpoint endpoint = null; - /** The registry of docproc services. */ - @SuppressWarnings("removal") // TODO Vespa 8: remove - private ComponentRegistry docprocServiceRegistry = null; - private boolean operationsGotten = false; /** @@ -79,8 +75,7 @@ public class Processing { * @param callStack the document processors to call in this processing. * @param endp the endpoint of this processing */ - @SuppressWarnings("removal") // TODO Vespa 8: remove - Processing(String service, DocumentOperation documentOperation, CallStack callStack, ProcessingEndpoint endp) { + private Processing(String service, DocumentOperation documentOperation, CallStack callStack, ProcessingEndpoint endp) { this.service = service; this.documentOperations = new ArrayList<>(1); documentOperations.add(documentOperation); @@ -102,9 +97,8 @@ public class Processing { this(service, documentOperation, callStack, null); } - // TODO Vespa 8: remove "removal" - @SuppressWarnings({"unused", "removal"}) - private Processing(String service, List documentOpsAndUpdates, CallStack callStack, ProcessingEndpoint endp, boolean unused) { + @SuppressWarnings({"unused"}) + protected Processing(String service, List documentOpsAndUpdates, CallStack callStack, ProcessingEndpoint endp, boolean unused) { this.service = service; this.documentOperations = new ArrayList<>(documentOpsAndUpdates.size()); documentOperations.addAll(documentOpsAndUpdates); @@ -112,11 +106,6 @@ public class Processing { this.endpoint = endp; } - @SuppressWarnings("removal") // TODO Vespa 8: remove - static Processing createProcessingFromDocumentOperations(String service, List documentOpsAndUpdates, CallStack callStack, ProcessingEndpoint endp) { - return new Processing(service, documentOpsAndUpdates, callStack, endp, false); - } - /** * Creates a Processing from a list of operations. * @@ -133,21 +122,6 @@ public class Processing { return new Processing(service, documentsAndUpdates, callStack, null, false); } - @Deprecated(forRemoval = true, since="7") - @SuppressWarnings("removal") // TODO Vespa 8: remove - public ComponentRegistry getDocprocServiceRegistry() { - return docprocServiceRegistry; - } - - /** - * @deprecated This method will be removed without replacement in Vespa 8. - */ - @Deprecated(forRemoval = true, since="7") - @SuppressWarnings("removal") // TODO Vespa 8: remove - public void setDocprocServiceRegistry(ComponentRegistry docprocServiceRegistry) { - this.docprocServiceRegistry = docprocServiceRegistry; - } - /** Returns the name of the service processing this. This will never return null */ public String getServiceName() { if (service == null) return "default"; @@ -159,23 +133,6 @@ public class Processing { this.service = service; } - /** - * Convenience method for looking up and returning the service processing this. This might return null - * if #getServiceName returns a name that is not registered in {@link com.yahoo.docproc.DocprocService}. - * - * @return the service processing this, or null if unknown. - * @deprecated Formerly used to retrieve the {@link com.yahoo.document.DocumentTypeManager}, - * which can now be directly injected via your component constructor. - */ - @Deprecated(forRemoval = true, since="7") - @SuppressWarnings("removal") // TODO Vespa 8: remove - public DocprocService getService() { - if (docprocServiceRegistry != null) { - return docprocServiceRegistry.getComponent(getServiceName()); - } - return null; - } - /** Returns a context variable, or null if it is not set */ public Object getVariable(String name) { if (context == null) return null; @@ -214,23 +171,13 @@ public class Processing { return context != null && context.containsKey(name); } - /** - * Returns the ProcessingEndpoint that is called when this Processing is complete, if any. - * - * @return the ProcessingEndpoint, or null - */ - @SuppressWarnings("removal") // TODO Vespa 8: remove - ProcessingEndpoint getEndpoint() { + @Override + protected ProcessingEndpoint getEndpoint() { return endpoint; } - /** - * Sets the ProcessingEndpoint to be called when this Processing is complete. - * - * @param endpoint the ProcessingEndpoint to use - */ - @SuppressWarnings("removal") // TODO Vespa 8: remove - void setEndpoint(ProcessingEndpoint endpoint) { + @Override + protected void setEndpoint(ProcessingEndpoint endpoint) { this.endpoint = endpoint; } @@ -256,17 +203,13 @@ public class Processing { return callStack; } - /** - * Package-private method to set the callstack of this processing. Only to be used - * by DocprocService.process(Processing). - * - * @param callStack the callstack to set - */ - void setCallStack(CallStack callStack) { + @Override + protected void setCallStack(CallStack callStack) { this.callStack = callStack; } - List getOnceOperationsToBeProcessed() { + @Override + protected List getOnceOperationsToBeProcessed() { if (operationsGotten) return Collections.emptyList(); diff --git a/docproc/src/main/java/com/yahoo/docproc/ProcessingEndpoint.java b/docproc/src/main/java/com/yahoo/docproc/ProcessingEndpoint.java deleted file mode 100644 index 00b0bc7c7c7..00000000000 --- a/docproc/src/main/java/com/yahoo/docproc/ProcessingEndpoint.java +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.docproc; - -/** - * @author Einar M R Rosenvinge - * @deprecated Will be removed in Vespa 8. Only for internal use. - */ -@Deprecated(forRemoval = true, since = "7") -public interface ProcessingEndpoint { - - void processingDone(Processing processing); - - void processingFailed(Processing processing, Exception exception); - -} diff --git a/docproc/src/main/java/com/yahoo/docproc/TransientFailureException.java b/docproc/src/main/java/com/yahoo/docproc/TransientFailureException.java deleted file mode 100644 index a88158cc367..00000000000 --- a/docproc/src/main/java/com/yahoo/docproc/TransientFailureException.java +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.docproc; - -/** - * Exception to be thrown by a document processor on transient failures. - * Caller is welcome to try the call again later. - * - * @author Einar M R Rosenvinge - * @deprecated Will be removed in Vespa 8. Only for internal use. - */ -@Deprecated(forRemoval = true, since = "7") -public class TransientFailureException extends RuntimeException { - - public TransientFailureException(String s) { - super(s); - } - -} diff --git a/docproc/src/main/java/com/yahoo/docproc/impl/DocprocExecutor.java b/docproc/src/main/java/com/yahoo/docproc/impl/DocprocExecutor.java new file mode 100644 index 00000000000..cfd43099cc8 --- /dev/null +++ b/docproc/src/main/java/com/yahoo/docproc/impl/DocprocExecutor.java @@ -0,0 +1,193 @@ +// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.docproc.impl; + +import com.yahoo.docproc.Call; +import com.yahoo.docproc.CallStack; +import com.yahoo.docproc.DocumentProcessor; +import com.yahoo.docproc.Processing; +import com.yahoo.document.DocumentOperation; +import com.yahoo.document.DocumentPut; +import com.yahoo.document.json.JsonWriter; +import com.yahoo.jdisc.Metric; +import com.yahoo.text.Utf8; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Function; +import java.util.logging.Level; +import java.util.logging.Logger; + +import static java.util.stream.Collectors.counting; +import static java.util.stream.Collectors.groupingBy; + +/** + * An executor executed incoming processings on its CallStack + * + * @author Einar M R Rosenvinge + */ +public class DocprocExecutor { + + private final static String METRIC_NAME_DOCUMENTS_PROCESSED = "documents_processed"; + + private static final Logger log = Logger.getLogger(DocprocExecutor.class.getName()); + + private final String name; + private final String docCounterName; + private final Metric metric; + private final Function contexts; + private final CallStack callStack; + + /** + * Creates a new named DocprocExecutor with the given CallStack. + * + * @param name the name of this executor + * @param callStack the chain of document processors this executor shall execute on processings + */ + public DocprocExecutor(String name, CallStack callStack) { + this.name = name; + String chainDimension = name != null ? name.replaceAll("[^\\p{Alnum}]", "_") : name; + docCounterName = "chain_" + chainDimension + "_documents"; + this.metric = callStack.getMetric(); + this.callStack = callStack; + this.callStack.setName(name); + this.contexts = cachedContexts(chainDimension); + } + + /** + * Creates a new named DocprocExecutor, with the same instance variables as the given executor, + * but a new call stack. + * + * @param oldExecutor the executor to inherit the instance variables from, sans call stack. + * @param callStack the call stack to use. + */ + public DocprocExecutor(DocprocExecutor oldExecutor, CallStack callStack) { + this.name = oldExecutor.name; + this.docCounterName = oldExecutor.docCounterName; + this.metric = oldExecutor.metric; + this.contexts = oldExecutor.contexts; + this.callStack = callStack; + } + + public CallStack getCallStack() { + return callStack; + } + + public String getName() { + return name; + } + + private void incrementNumDocsProcessed(Processing processing) { + List operations = ((ProcessingAccess)processing).getOnceOperationsToBeProcessed(); + if ( ! operations.isEmpty()) { + metric.add(docCounterName, operations.size(), null); + operations.stream() + .collect(groupingBy(operation -> operation.getId().getDocType(), counting())) + .forEach((type, count) -> metric.add(METRIC_NAME_DOCUMENTS_PROCESSED, count, contexts.apply(type))); + } + } + + /** + * Processes a given Processing through the CallStack of this executor. + * + * @param processing the Processing to process. The CallStack of the Processing will be set to a clone of the CallStack of this executor, iff. it is currently null. + * @return a Progress; if this is LATER, the Processing is not done and must be reprocessed later. + * @throws RuntimeException if a document processor throws an exception during processing. + * @see com.yahoo.docproc.Processing + */ + public DocumentProcessor.Progress process(Processing processing) { + processing.setServiceName(getName()); + if (processing.callStack() == null) { + ((ProcessingAccess)processing).setCallStack(new CallStack(getCallStack())); + } + + DocumentProcessor.Progress progress = DocumentProcessor.Progress.DONE; + //metrics stuff: + //TODO: Note that this is *wrong* in case of Progress.LATER, documents are then counted several times until the Processing is DONE or FAILED. + incrementNumDocsProcessed(processing); + do { + Call call = processing.callStack().pop(); + if (call == null) { + // No more processors - done + return progress; + } + + //might throw exception, which is OK: + progress = call.call(processing); + + if (log.isLoggable(Level.FINEST)) { + logProgress(processing, progress, call); + } + + if (DocumentProcessor.Progress.LATER.equals(progress)) { + processing.callStack().addNext(call); + return progress; + } + } while (DocumentProcessor.Progress.DONE.equals(progress)); + return progress; + } + + private void logProgress(Processing processing, DocumentProcessor.Progress progress, Call call) { + StringBuilder message = new StringBuilder(); + boolean first = true; + message.append(call.getDocumentProcessorId()).append(" of class ") + .append(call.getDocumentProcessor().getClass().getSimpleName()).append(" returned ").append(progress) + .append(" for the documents: ["); + for (DocumentOperation op : processing.getDocumentOperations()) { + if (first) { + first = false; + } else { + message.append(", "); + } + if (op instanceof DocumentPut) { + message.append(Utf8.toString(JsonWriter.toByteArray(((DocumentPut) op).getDocument()))); + } else { + message.append(op.toString()); + } + } + message.append("]"); + log.log(Level.FINEST, message.toString()); + } + + /** + * Processes a given Processing through the CallStack of this executor. Note that if a DocumentProcessor + * returns a LaterProgress for this processing, it will be re-processed (after waiting the specified delay given + * by the LaterProgress), until done or failed. + * + * @param processing the Processing to process. The CallStack of the Processing will be set to a clone of the CallStack of this executor, iff. it is currently null. + * @return a Progress; this is never a LaterProgress. + * @throws RuntimeException if a document processor throws an exception during processing, or this thread is interrupted while waiting. + * @see com.yahoo.docproc.Processing + * @see com.yahoo.docproc.DocumentProcessor.Progress + * @see com.yahoo.docproc.DocumentProcessor.LaterProgress + */ + public DocumentProcessor.Progress processUntilDone(Processing processing) { + DocumentProcessor.Progress progress; + while (true) { + progress = process(processing); + if (!(progress instanceof DocumentProcessor.LaterProgress)) { + break; + } + DocumentProcessor.LaterProgress later = (DocumentProcessor.LaterProgress) progress; + try { + Thread.sleep(later.getDelay()); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + throw new RuntimeException(e); + } + } + return progress; + } + + private Function cachedContexts(String chainDimension) { + Map contextCache = new ConcurrentHashMap<>(); + return documentType -> contextCache.computeIfAbsent(documentType, type -> { + Map dimensions = new HashMap<>(2); + dimensions.put("chain", chainDimension); + dimensions.put("documenttype", type); + return metric.createContext(dimensions); + }); + } + +} diff --git a/docproc/src/main/java/com/yahoo/docproc/impl/DocprocService.java b/docproc/src/main/java/com/yahoo/docproc/impl/DocprocService.java new file mode 100644 index 00000000000..62a9a31f47a --- /dev/null +++ b/docproc/src/main/java/com/yahoo/docproc/impl/DocprocService.java @@ -0,0 +1,404 @@ +// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.docproc.impl; + +import com.yahoo.component.AbstractComponent; +import com.yahoo.component.ComponentId; +import com.yahoo.concurrent.DaemonThreadFactory; +import com.yahoo.docproc.CallStack; +import com.yahoo.docproc.DocumentProcessor; +import com.yahoo.docproc.Processing; +import com.yahoo.docproc.proxy.SchemaMap; +import com.yahoo.document.DocumentOperation; +import com.yahoo.document.DocumentTypeManager; + +import java.util.List; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.RejectedExecutionException; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; +import java.util.logging.Level; +import java.util.logging.Logger; + +/** + *

The document processing service. + * Use this to set up a document processing chain and to + * process documents using that chain. Note that there may + * be multiple named instances of this service in the same + * runtime. The default service is called "default" and is always present.

+ * + *

To create a server which receives documents from the network + * and processes them, have a look at com.yahoo.docproc.server.Server.

+ * + *

This class is thread safe.

+ * + * @author bratseth + */ +public class DocprocService extends AbstractComponent { + + private static final Logger log = Logger.getLogger(DocprocService.class.getName()); + private volatile DocprocExecutor executor; + + /** The processings currently in progress at this service */ + private final LinkedBlockingQueue queue; + private final ThreadPoolExecutor threadPool; + /** The current state of this service */ + private boolean inService = false; + /** The current state of this service */ + private boolean acceptingNewProcessings = true; + public static SchemaMap schemaMap = new SchemaMap(); + private DocumentTypeManager documentTypeManager = null; + + private DocprocService(ComponentId id, int numThreads) { + super(id); + queue = new LinkedBlockingQueue<>(); + threadPool = new ThreadPoolExecutor(numThreads, + numThreads, + 0, TimeUnit.SECONDS, + new LinkedBlockingQueue<>(), + new DaemonThreadFactory("docproc-" + id.stringValue() + "-")); + } + + public DocprocService(ComponentId id) { + this(id, Runtime.getRuntime().availableProcessors()); + } + + /** + * Creates a new docproc service, which is set to be in service. + * + * @param id the component id of the new service. + * @param stack the call stack to use. + * @param mgr the document type manager to use. + * @param numThreads to have in the thread pool + */ + public DocprocService(ComponentId id, CallStack stack, DocumentTypeManager mgr, int numThreads) { + this(id, numThreads); + setCallStack(stack); + setDocumentTypeManager(mgr); + setInService(true); + } + + /** + * Creates a service with a name with an unbounded input queue. If the given name is null or the empty string, + * it will become the name "default". + * Testing only + */ + public DocprocService(String name) { + this(new ComponentId(name, null), 1); + } + + @Override + public void deconstruct() { + threadPool.shutdown(); + } + + public DocumentTypeManager getDocumentTypeManager() { + return documentTypeManager; + } + + public void setDocumentTypeManager(DocumentTypeManager documentTypeManager) { + this.documentTypeManager = documentTypeManager; + } + + public int getQueueSize() { + return queue.size(); + } + + /** + * Returns the DocprocExecutor of this DocprocService. This can be used to + * synchronously process one Processing. + * + * @return the DocprocExecutor of this DocprocService, or null if a CallStack has not yet been set. + */ + public DocprocExecutor getExecutor() { + return executor; + } + + public ThreadPoolExecutor getThreadPoolExecutor() { + return threadPool; + } + + private void setExecutor(DocprocExecutor executor) { + this.executor = executor; + } + + /** + * Sets whether this should currently perform any processing. + * New processings will be accepted also when this is out of service, + * but no processing will happen when it is out of service. + */ + public void setInService(boolean inService) { + this.inService = inService; + } + + /** + * Returns true if this is currently processing incoming processings + * (in service), or false if they are just queued up (out of service). + * By default, this is out of service. + */ + public boolean isInService() { + return inService; + } + + /** + * Returns true if this service currently accepts new incoming processings via process(...). Default is true. + * + * @return true if accepting new incoming processings + */ + public boolean isAcceptingNewProcessings() { + return acceptingNewProcessings; + } + + /** + * Sets whether this service should accept new incoming processings via process(...). + * + * @param acceptingNewProcessings true if service should accept new incoming processings + */ + public void setAcceptingNewProcessings(boolean acceptingNewProcessings) { + this.acceptingNewProcessings = acceptingNewProcessings; + } + + public String getName() { + return getId().stringValue(); + } + + /** + * Returns the processing chain of this service. This stack can not be modified. + * To change the stack, set a new one. + */ + // TODO: Enforce unmodifiability + public CallStack getCallStack() { + DocprocExecutor ex = getExecutor(); + return (ex == null) ? null : ex.getCallStack(); + } + + /** + * Sets a new processing stack for this service. This will be the Prototype + * for the call stacks of individual processings in this service + */ + public void setCallStack(CallStack stack) { + DocprocExecutor ex = ((getExecutor() == null) ? new DocprocExecutor(getName(), stack) : new DocprocExecutor(getExecutor(), stack)); + setExecutor(ex); + } + + /** + * Asynchronously process the given Processing using the processing + * chain of this service, and call the specified ProcessingEndpoint when done. + * + * @throws RuntimeException caused by a QueueFullException if this DocprocService has a bounded input queue and the queue is full + * @throws IllegalStateException if this DocprocService is not accepting new incoming processings + */ + public void process(Processing processing, ProcessingEndpoint endp) { + processing.setServiceName(getName()); + ((ProcessingAccess)processing).setCallStack(new CallStack(getCallStack())); + ((ProcessingAccess)processing).setEndpoint(endp); + addProcessing(processing); + } + + /** + * Asynchronously process the given Processing using the processing + * chain of this service + * + * @throws RuntimeException caused by a QueueFullException if this DocprocService has a bounded input queue and the queue is full + * @throws IllegalStateException if this DocprocService is not accepting new incoming processings + */ + public void process(Processing processing) { + process(processing, null); + } + + /** + * Asynchronously process the given document put or document update using the processing + * chain of this service, and call the specified ProcessingEndpoint when done. + * + * @throws RuntimeException caused by a QueueFullException if this DocprocService has a bounded input queue and the queue is full + * @throws IllegalStateException if this DocprocService is not accepting new incoming processings + */ + public void process(DocumentOperation documentOperation, ProcessingEndpoint endp) { + Processing processing = new Processing(getName(), documentOperation, new CallStack(getCallStack())); + ((ProcessingAccess)processing).setEndpoint(endp); + addProcessing(processing); + } + + /** + * Asynchronously process the given document operation using the processing + * chain of this service. + * + * @throws RuntimeException caused by a QueueFullException if this DocprocService has a bounded input queue and the queue is full + * @throws IllegalStateException if this DocprocService is not accepting new incoming processings + */ + public void process(DocumentOperation documentOperation) { + process(documentOperation, null); + } + + /** + * Asynchronously process the given document operations as one unit + * using the processing chain of this service, + * and call the specified ProcessingEndpoint when done. + * + * @throws RuntimeException caused by a QueueFullException if this DocprocService has a bounded input queue and the queue is full + * @throws IllegalStateException if this DocprocService is not accepting new incoming processings + */ + public void processDocumentOperations(List documentOperations, ProcessingEndpoint endp) { + Processing processing = Processing.createProcessingFromDocumentOperations(getName(), documentOperations, new CallStack(getCallStack())); + ((ProcessingAccess)processing).setEndpoint(endp); + addProcessing(processing); + + } + + /** + * Asynchronously process the given document operations as one unit + * using the processing chain of this service. + * + * @throws RuntimeException caused by a QueueFullException if this DocprocService has a bounded input queue and the queue is full + * @throws IllegalStateException if this DocprocService is not accepting new incoming processings + */ + public void processDocumentOperations(List documentOperations) { + processDocumentOperations(documentOperations, null); + } + + private void addProcessing(Processing processing) { + if ( ! isAcceptingNewProcessings()) + throw new IllegalStateException("Docproc service " + getName() + + " is not accepting new incoming processings. Cannot add " + processing + " "); + + if ( ! queue.offer(processing)) + throw new RejectedExecutionException("Docproc service " + getName() + " is busy, please try later"); + } + + /** + *

Do some work in this service. This will perform some processing and return + * in a "short" while, as long as individual processors also returns.

+ * + *

This method is thread safe - multiple threads may call doWork at any time. + * Note that processors + * should be non-blocking, so multiple threads should be used primarily to + * utilize multiple processors.

+ * + * @return true if some work was performed, false if no work could be performed + * at this time, because there are no outstanding processings, or because + * this is out of service. Note that since processings may arrive or be put + * back by another thread at any time, this return value does not mean + * that no work will be available if doWork as called again immediately. + */ + public boolean doWork() { + try { + return doWork(false); + } catch (InterruptedException e) { + //will never happen because we are not blocking + throw new RuntimeException(e); + } + } + + private boolean doWork(boolean blocking) throws InterruptedException { + Processing processing; + if (blocking) { + processing = queue.take(); + } else { + processing = queue.poll(); + } + + if (processing == null) { + //did no work, returning nothing to queue + return false; + } + if (!isInService()) { + //did no work, returning processing (because it's not empty) + queue.add(processing); //always successful, since queue is unbounded + return false; + } + + boolean remove = workOn(processing); //NOTE: Exceptions are handled in here, but not Errors + if (!remove) { + queue.add(processing); //always successful, since queue is unbounded + } + return true; + //NOTE: We *could* have called returnProcessing() in a finally block here, but we don't + //want that, since the only thing being thrown out here is Errors, and then the Processing + //can just disappear instead + } + + /** + *

Do some work in this service. This will perform some processing and return + * in a "short" while, as long as individual processors also returns. Note that + * if the internal queue is empty when this method is called, it will block until + * some work is submitted by a call to process() by another thread.

+ * + *

This method is thread safe - multiple threads may call doWorkBlocking at any time. + * Note that processors + * should be non-blocking, so multiple threads should be used primarily to + * utilize multiple processors.

+ * + * @return always true, since if the internal queue is empty when this method is + * called, it will block until some work is submitted by a call to + * process() by another thread. + * @throws InterruptedException if a call to this method is interrupted while waiting for data to become available + */ + public boolean doWorkBlocking() throws InterruptedException { + return doWork(true); + } + + /** + * Do some work on this processing. Must only be called from the worker thread. + * + * @return true if this processing should be removed, false if there is more work to do on it later + * @throws NoCallStackException if no CallStack has been set on this executor. + */ + boolean workOn(Processing processing) { + DocprocExecutor ex = getExecutor(); + if (ex == null) { + throw new NoCallStackException(); + } + + DocumentProcessor.Progress progress; + + try { + progress = ex.process(processing); + } catch (Exception e) { + processingFailed(processing, processing + " failed", e); + return true; + } + + if (DocumentProcessor.Progress.DONE.equals(progress)) { + //notify endpoint + ProcessingEndpoint recv = ((ProcessingAccess)processing).getEndpoint(); + if (recv != null) { + recv.processingDone(processing); + } + return true; + } else if (DocumentProcessor.Progress.FAILED.equals(progress)) { + processingFailed(processing, processing + " failed at " + processing.callStack().getLastPopped(), null); + return true; + } else if (DocumentProcessor.Progress.PERMANENT_FAILURE.equals(progress)) { + processingFailed(processing, + processing + " failed PERMANENTLY at " + processing.callStack().getLastPopped() + ", disabling processing service.", null); + setInService(false); + return true; + } else { + //LATER: + return false; + } + } + + private void processingFailed(Processing processing, String errorMsg, Exception e) { + if (e != null) { + if (e instanceof HandledProcessingException) { + errorMsg += ". Error message: " + e.getMessage(); + log.log(Level.WARNING, errorMsg); + log.log(Level.FINE, "Chained exception:", e); + } else { + log.log(Level.WARNING, errorMsg, e); + } + } else { + log.log(Level.WARNING, errorMsg); + } + + //notify endpoint + ProcessingEndpoint recv = ((ProcessingAccess)processing).getEndpoint(); + if (recv != null) { + recv.processingFailed(processing, e); + } + } + + private class NoCallStackException extends RuntimeException { + } + +} diff --git a/docproc/src/main/java/com/yahoo/docproc/impl/DocumentOperationWrapper.java b/docproc/src/main/java/com/yahoo/docproc/impl/DocumentOperationWrapper.java new file mode 100644 index 00000000000..32ccc11c1ab --- /dev/null +++ b/docproc/src/main/java/com/yahoo/docproc/impl/DocumentOperationWrapper.java @@ -0,0 +1,13 @@ +// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.docproc.impl; + +import com.yahoo.document.DocumentOperation; + +/** + * @author Einar M R Rosenvinge + */ +public interface DocumentOperationWrapper { + + DocumentOperation getWrappedDocumentOperation(); + +} diff --git a/docproc/src/main/java/com/yahoo/docproc/impl/HandledProcessingException.java b/docproc/src/main/java/com/yahoo/docproc/impl/HandledProcessingException.java new file mode 100644 index 00000000000..7bf706a0b56 --- /dev/null +++ b/docproc/src/main/java/com/yahoo/docproc/impl/HandledProcessingException.java @@ -0,0 +1,16 @@ +// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.docproc.impl; + +/** + * Exception generated by known bad input in a docproc. Will cause only message to be logged, + * not stacktrace. + * + * @author Mathias Mølster Lidal + */ +public class HandledProcessingException extends RuntimeException { + + public HandledProcessingException(String message) { + super(message); + } + +} diff --git a/docproc/src/main/java/com/yahoo/docproc/impl/ProcessingAccess.java b/docproc/src/main/java/com/yahoo/docproc/impl/ProcessingAccess.java new file mode 100644 index 00000000000..a18257f61ec --- /dev/null +++ b/docproc/src/main/java/com/yahoo/docproc/impl/ProcessingAccess.java @@ -0,0 +1,31 @@ +package com.yahoo.docproc.impl; + +import com.yahoo.docproc.CallStack; +import com.yahoo.document.DocumentOperation; + +import java.util.List; + +/** + * Bridge to access protected (originally package private) methods in {@link com.yahoo.docproc.Processing}. + * + * @author gjoranv + */ +public abstract class ProcessingAccess { + + protected ProcessingEndpoint getEndpoint() { + throw new UnsupportedOperationException("docproc.Processing must override this method!"); + } + + protected void setEndpoint(ProcessingEndpoint endpoint) { + throw new UnsupportedOperationException("docproc.Processing must override this method!"); + } + + protected void setCallStack(CallStack callStack) { + throw new UnsupportedOperationException("docproc.Processing must override this method!"); + } + + protected List getOnceOperationsToBeProcessed() { + throw new UnsupportedOperationException("docproc.Processing must override this method!"); + } + +} diff --git a/docproc/src/main/java/com/yahoo/docproc/impl/ProcessingEndpoint.java b/docproc/src/main/java/com/yahoo/docproc/impl/ProcessingEndpoint.java new file mode 100644 index 00000000000..e88c2ef444b --- /dev/null +++ b/docproc/src/main/java/com/yahoo/docproc/impl/ProcessingEndpoint.java @@ -0,0 +1,15 @@ +// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.docproc.impl; + +import com.yahoo.docproc.Processing; + +/** + * @author Einar M R Rosenvinge + */ +public interface ProcessingEndpoint { + + void processingDone(Processing processing); + + void processingFailed(Processing processing, Exception exception); + +} diff --git a/docproc/src/main/java/com/yahoo/docproc/impl/TransientFailureException.java b/docproc/src/main/java/com/yahoo/docproc/impl/TransientFailureException.java new file mode 100644 index 00000000000..b470ba4b806 --- /dev/null +++ b/docproc/src/main/java/com/yahoo/docproc/impl/TransientFailureException.java @@ -0,0 +1,16 @@ +// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.docproc.impl; + +/** + * Exception to be thrown by a document processor on transient failures. + * Caller is welcome to try the call again later. + * + * @author Einar M R Rosenvinge + */ +public class TransientFailureException extends RuntimeException { + + public TransientFailureException(String s) { + super(s); + } + +} diff --git a/docproc/src/main/java/com/yahoo/docproc/impl/package-info.java b/docproc/src/main/java/com/yahoo/docproc/impl/package-info.java new file mode 100644 index 00000000000..f77ab5d9103 --- /dev/null +++ b/docproc/src/main/java/com/yahoo/docproc/impl/package-info.java @@ -0,0 +1,5 @@ +// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +@ExportPackage +package com.yahoo.docproc.impl; + +import com.yahoo.osgi.annotation.ExportPackage; diff --git a/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingHandler.java b/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingHandler.java index 3b31b0447a3..9eda0b12069 100644 --- a/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingHandler.java +++ b/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingHandler.java @@ -12,12 +12,11 @@ import com.yahoo.container.core.ChainsConfig; import com.yahoo.container.core.document.ContainerDocumentConfig; import com.yahoo.docproc.AbstractConcreteDocumentFactory; import com.yahoo.docproc.CallStack; -import com.yahoo.docproc.DocprocService; +import com.yahoo.docproc.impl.DocprocService; import com.yahoo.docproc.DocumentProcessor; import com.yahoo.docproc.jdisc.messagebus.MbusRequestContext; import com.yahoo.docproc.proxy.SchemaMap; import com.yahoo.document.DocumentTypeManager; -import com.yahoo.document.config.DocumentmanagerConfig; import com.yahoo.jdisc.Metric; import com.yahoo.jdisc.Request; import com.yahoo.jdisc.handler.AbstractRequestHandler; @@ -43,7 +42,6 @@ import static com.yahoo.component.chain.model.ChainsModelBuilder.buildFromConfig public class DocumentProcessingHandler extends AbstractRequestHandler { private static final Logger log = Logger.getLogger(DocumentProcessingHandler.class.getName()); - @SuppressWarnings("removal") // TODO Vespa 8: remove private final ComponentRegistry docprocServiceRegistry; private final ComponentRegistry docFactoryRegistry; private final ChainRegistry chainRegistry = new ChainRegistry<>(); @@ -52,7 +50,6 @@ public class DocumentProcessingHandler extends AbstractRequestHandler { private final ContainerDocumentConfig containerDocConfig; private final DocumentTypeManager documentTypeManager; - @SuppressWarnings("removal") // TODO Vespa 8: remove private DocumentProcessingHandler(ComponentRegistry docprocServiceRegistry, ComponentRegistry documentProcessorComponentRegistry, ComponentRegistry docFactoryRegistry, @@ -85,7 +82,6 @@ public class DocumentProcessingHandler extends AbstractRequestHandler { return (maxThreads > 0) ? maxThreads : Runtime.getRuntime().availableProcessors(); } - @SuppressWarnings("removal") // TODO Vespa 8: remove DocumentProcessingHandler(ComponentRegistry docprocServiceRegistry, ComponentRegistry documentProcessorComponentRegistry, ComponentRegistry docFactoryRegistry, @@ -118,13 +114,11 @@ public class DocumentProcessingHandler extends AbstractRequestHandler { } @Override - @SuppressWarnings("removal") // TODO Vespa 8: remove protected void destroy() { laterExecutor.shutdown(); docprocServiceRegistry.allComponents().forEach(docprocService -> docprocService.deconstruct()); } - @SuppressWarnings("removal") // TODO Vespa 8: remove public ComponentRegistry getDocprocServiceRegistry() { return docprocServiceRegistry; } @@ -140,7 +134,6 @@ public class DocumentProcessingHandler extends AbstractRequestHandler { } - @SuppressWarnings("removal") // TODO Vespa 8: remove private static CallStack convertToCallStack(Chain chain, Metric metric) { CallStack stack = new CallStack(chain.getId().stringValue(), metric); for (DocumentProcessor processor : chain.components()) { @@ -151,7 +144,6 @@ public class DocumentProcessingHandler extends AbstractRequestHandler { } @Override - @SuppressWarnings("removal") // TODO Vespa 8: remove public ContentChannel handleRequest(Request request, ResponseHandler handler) { RequestContext requestContext; if (request instanceof MbusRequest) { diff --git a/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingTask.java b/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingTask.java index e629953ccff..f7f8d0e6a10 100644 --- a/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingTask.java +++ b/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingTask.java @@ -4,10 +4,10 @@ package com.yahoo.docproc.jdisc; import com.yahoo.collections.Tuple2; import com.yahoo.docproc.Call; import com.yahoo.docproc.CallStack; -import com.yahoo.docproc.DocprocExecutor; -import com.yahoo.docproc.DocprocService; +import com.yahoo.docproc.impl.DocprocExecutor; +import com.yahoo.docproc.impl.DocprocService; import com.yahoo.docproc.DocumentProcessor; -import com.yahoo.docproc.HandledProcessingException; +import com.yahoo.docproc.impl.HandledProcessingException; import com.yahoo.docproc.Processing; import java.util.logging.Level; import com.yahoo.yolean.Exceptions; @@ -19,7 +19,6 @@ import java.util.Iterator; import java.util.List; import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.ThreadPoolExecutor; -import java.util.logging.Level; import java.util.logging.Logger; /** @@ -34,11 +33,9 @@ public class DocumentProcessingTask implements Runnable { private final DocumentProcessingHandler docprocHandler; private final RequestContext requestContext; - @SuppressWarnings("removal") // TODO Vespa 8: remove private final DocprocService service; private final ThreadPoolExecutor executor; - @SuppressWarnings("removal") // TODO Vespa 8: remove public DocumentProcessingTask(RequestContext requestContext, DocumentProcessingHandler docprocHandler, DocprocService service, ThreadPoolExecutor executor) { this.requestContext = requestContext; @@ -67,7 +64,6 @@ public class DocumentProcessingTask implements Runnable { return; } - @SuppressWarnings("removal") // TODO Vespa 8: remove DocprocExecutor executor = service.getExecutor(); DocumentProcessor.Progress progress = process(executor); @@ -91,7 +87,6 @@ public class DocumentProcessingTask implements Runnable { * * @param executor the DocprocService to use for processing */ - @SuppressWarnings("removal") // TODO Vespa 8: remove private DocumentProcessor.Progress process(DocprocExecutor executor) { Iterator iterator = processings.iterator(); List> later = new ArrayList<>(); @@ -188,7 +183,6 @@ public class DocumentProcessingTask implements Runnable { '}'; } - @SuppressWarnings("removal") // TODO Vespa 8: remove private static void logProcessingFailure(Processing processing, Exception exception) { //LOGGING ONLY: String errorMsg = processing + " failed at " + processing.callStack().getLastPopped(); diff --git a/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MbusRequestContext.java b/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MbusRequestContext.java index 50d7acb4064..caaff318cdd 100644 --- a/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MbusRequestContext.java +++ b/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MbusRequestContext.java @@ -5,10 +5,10 @@ import com.yahoo.component.provider.ComponentRegistry; import com.yahoo.concurrent.CopyOnWriteHashMap; import com.yahoo.container.core.document.ContainerDocumentConfig; import com.yahoo.docproc.AbstractConcreteDocumentFactory; -import com.yahoo.docproc.DocprocService; -import com.yahoo.docproc.HandledProcessingException; +import com.yahoo.docproc.impl.DocprocService; +import com.yahoo.docproc.impl.HandledProcessingException; import com.yahoo.docproc.Processing; -import com.yahoo.docproc.TransientFailureException; +import com.yahoo.docproc.impl.TransientFailureException; import com.yahoo.docproc.jdisc.RequestContext; import com.yahoo.document.DocumentOperation; import com.yahoo.documentapi.messagebus.protocol.DocumentMessage; @@ -53,7 +53,6 @@ public class MbusRequestContext implements RequestContext, ResponseHandler { public final static String internalNoThrottledSource = "internalNoThrottledSource"; private final static String internalNoThrottledSourcePath = "/" + internalNoThrottledSource; - @SuppressWarnings("removal") // TODO Vespa 8: remove public MbusRequestContext(MbusRequest request, ResponseHandler responseHandler, ComponentRegistry docprocServiceComponentRegistry, ComponentRegistry docFactoryRegistry, @@ -61,7 +60,7 @@ public class MbusRequestContext implements RequestContext, ResponseHandler { this.request = request; this.requestMsg = (DocumentMessage)request.getMessage(); this.responseHandler = responseHandler; - this.processingFactory = new ProcessingFactory(docprocServiceComponentRegistry, docFactoryRegistry, + this.processingFactory = new ProcessingFactory(docFactoryRegistry, containerDocConfig, getServiceName()); this.messageFactory = newMessageFactory(requestMsg); } @@ -112,7 +111,6 @@ public class MbusRequestContext implements RequestContext, ResponseHandler { } @Override - @SuppressWarnings("removal") // TODO Vespa 8: remove public void processingFailed(Exception exception) { ErrorCode errorCode; if (exception instanceof TransientFailureException) { diff --git a/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/ProcessingFactory.java b/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/ProcessingFactory.java index 33cd6647ede..52f112f9b43 100644 --- a/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/ProcessingFactory.java +++ b/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/ProcessingFactory.java @@ -8,7 +8,6 @@ import com.yahoo.component.ComponentId; import com.yahoo.component.provider.ComponentRegistry; import com.yahoo.container.core.document.ContainerDocumentConfig; import com.yahoo.docproc.AbstractConcreteDocumentFactory; -import com.yahoo.docproc.DocprocService; import com.yahoo.docproc.Processing; import com.yahoo.document.Document; import com.yahoo.document.DocumentOperation; @@ -27,18 +26,13 @@ import com.yahoo.messagebus.Message; class ProcessingFactory { private final static Logger log = Logger.getLogger(ProcessingFactory.class.getName()); - @SuppressWarnings("removal") // TODO Vespa 8: remove - private final ComponentRegistry docprocServiceComponentRegistry; private final ComponentRegistry docFactoryRegistry; private final ContainerDocumentConfig containerDocConfig; private final String serviceName; - @SuppressWarnings("removal") // TODO Vespa 8: remove - public ProcessingFactory(ComponentRegistry docprocServiceComponentRegistry, - ComponentRegistry docFactoryRegistry, + public ProcessingFactory(ComponentRegistry docFactoryRegistry, ContainerDocumentConfig containerDocConfig, String serviceName) { - this.docprocServiceComponentRegistry = docprocServiceComponentRegistry; this.docFactoryRegistry = docFactoryRegistry; this.containerDocConfig = containerDocConfig; this.serviceName = serviceName; @@ -100,15 +94,11 @@ class ProcessingFactory { return null; } - @SuppressWarnings("removal") // TODO Vespa 8: remove private Processing createProcessing(DocumentOperation documentOperation, Message message) { Processing processing = new Processing(); processing.addDocumentOperation(documentOperation); processing.setServiceName(serviceName); - // TODO Vespa 8: Remove statement (registry will be removed from Processing) - processing.setDocprocServiceRegistry(docprocServiceComponentRegistry); - processing.setVariable("route", message.getRoute()); processing.setVariable("timeout", message.getTimeRemaining()); return processing; diff --git a/docproc/src/main/java/com/yahoo/docproc/proxy/ProxyDocument.java b/docproc/src/main/java/com/yahoo/docproc/proxy/ProxyDocument.java index e2432dd71c9..975d396a5cb 100644 --- a/docproc/src/main/java/com/yahoo/docproc/proxy/ProxyDocument.java +++ b/docproc/src/main/java/com/yahoo/docproc/proxy/ProxyDocument.java @@ -2,7 +2,7 @@ package com.yahoo.docproc.proxy; import com.yahoo.docproc.Accesses; -import com.yahoo.docproc.DocumentOperationWrapper; +import com.yahoo.docproc.impl.DocumentOperationWrapper; import com.yahoo.docproc.DocumentProcessor; import com.yahoo.document.DataType; import com.yahoo.document.Document; @@ -15,7 +15,6 @@ import com.yahoo.document.FieldPath; import com.yahoo.document.datatypes.FieldPathIteratorHandler; import com.yahoo.document.datatypes.FieldPathIteratorHandler.ModificationStatus; import com.yahoo.document.datatypes.FieldValue; -import com.yahoo.document.datatypes.Struct; import com.yahoo.document.serialization.DocumentReader; import com.yahoo.document.serialization.DocumentWriter; import com.yahoo.document.serialization.FieldReader; @@ -42,7 +41,6 @@ import java.util.Set; * * @author Vegard Havdal */ -@SuppressWarnings("removal") // TODO Vespa 8: remove public class ProxyDocument extends Document implements DocumentOperationWrapper { private final Map fieldMap; diff --git a/docproc/src/main/java/com/yahoo/docproc/proxy/ProxyDocumentUpdate.java b/docproc/src/main/java/com/yahoo/docproc/proxy/ProxyDocumentUpdate.java index 68af456829d..642ae216687 100644 --- a/docproc/src/main/java/com/yahoo/docproc/proxy/ProxyDocumentUpdate.java +++ b/docproc/src/main/java/com/yahoo/docproc/proxy/ProxyDocumentUpdate.java @@ -1,6 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.docproc.proxy; -import com.yahoo.docproc.DocumentOperationWrapper; +import com.yahoo.docproc.impl.DocumentOperationWrapper; import com.yahoo.document.Document; import com.yahoo.document.DocumentId; import com.yahoo.document.DocumentOperation; @@ -18,7 +18,6 @@ import java.util.Map; * * @author vegardh */ -@SuppressWarnings("removal") // TODO Vespa 8: remove public class ProxyDocumentUpdate extends DocumentUpdate implements DocumentOperationWrapper { private DocumentUpdate docU; diff --git a/docproc/src/test/java/com/yahoo/docproc/CallbackTestCase.java b/docproc/src/test/java/com/yahoo/docproc/CallbackTestCase.java index 93ba8089395..c5ff24741a9 100644 --- a/docproc/src/test/java/com/yahoo/docproc/CallbackTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/CallbackTestCase.java @@ -1,6 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.docproc; +import com.yahoo.docproc.impl.DocprocService; +import com.yahoo.docproc.impl.ProcessingEndpoint; import com.yahoo.document.DataType; import com.yahoo.document.DocumentId; import com.yahoo.document.DocumentOperation; diff --git a/docproc/src/test/java/com/yahoo/docproc/DocumentProcessingAbstractTestCase.java b/docproc/src/test/java/com/yahoo/docproc/DocumentProcessingAbstractTestCase.java index 6a0d7727393..bce32936aab 100644 --- a/docproc/src/test/java/com/yahoo/docproc/DocumentProcessingAbstractTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/DocumentProcessingAbstractTestCase.java @@ -1,6 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.docproc; +import com.yahoo.docproc.impl.DocprocService; import com.yahoo.document.DataType; import com.yahoo.document.DocumentId; import com.yahoo.document.DocumentOperation; diff --git a/docproc/src/test/java/com/yahoo/docproc/EmptyProcessingTestCase.java b/docproc/src/test/java/com/yahoo/docproc/EmptyProcessingTestCase.java index 14a6dc3c2d5..fd312acd3ff 100644 --- a/docproc/src/test/java/com/yahoo/docproc/EmptyProcessingTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/EmptyProcessingTestCase.java @@ -1,12 +1,12 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.docproc; +import com.yahoo.docproc.impl.DocprocService; import org.junit.Test; /** * @author Einar M R Rosenvinge */ -@SuppressWarnings("removal") // TODO Vespa 8: remove public class EmptyProcessingTestCase { @Test diff --git a/docproc/src/test/java/com/yahoo/docproc/FailingDocumentProcessingTestCase.java b/docproc/src/test/java/com/yahoo/docproc/FailingDocumentProcessingTestCase.java index 669621bb926..7c057b43030 100644 --- a/docproc/src/test/java/com/yahoo/docproc/FailingDocumentProcessingTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/FailingDocumentProcessingTestCase.java @@ -1,6 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.docproc; +import com.yahoo.docproc.impl.DocprocService; +import com.yahoo.docproc.impl.HandledProcessingException; import com.yahoo.document.DataType; import com.yahoo.document.DocumentId; import com.yahoo.document.DocumentPut; diff --git a/docproc/src/test/java/com/yahoo/docproc/FailingDocumentProcessingWithoutExceptionTestCase.java b/docproc/src/test/java/com/yahoo/docproc/FailingDocumentProcessingWithoutExceptionTestCase.java index 6293ac8e9f4..b3c631bdf46 100644 --- a/docproc/src/test/java/com/yahoo/docproc/FailingDocumentProcessingWithoutExceptionTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/FailingDocumentProcessingWithoutExceptionTestCase.java @@ -1,6 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.docproc; +import com.yahoo.docproc.impl.DocprocService; import com.yahoo.document.DataType; import com.yahoo.document.DocumentId; import com.yahoo.document.DocumentOperation; diff --git a/docproc/src/test/java/com/yahoo/docproc/FailingPermanentlyDocumentProcessingTestCase.java b/docproc/src/test/java/com/yahoo/docproc/FailingPermanentlyDocumentProcessingTestCase.java index 4da76484c1f..b19187e37ef 100644 --- a/docproc/src/test/java/com/yahoo/docproc/FailingPermanentlyDocumentProcessingTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/FailingPermanentlyDocumentProcessingTestCase.java @@ -1,8 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.docproc; +import com.yahoo.docproc.impl.DocprocService; import com.yahoo.document.DataType; -import com.yahoo.document.Document; import com.yahoo.document.DocumentId; import com.yahoo.document.DocumentOperation; import com.yahoo.document.DocumentPut; diff --git a/docproc/src/test/java/com/yahoo/docproc/FailingWithErrorTestCase.java b/docproc/src/test/java/com/yahoo/docproc/FailingWithErrorTestCase.java index c4442fadad3..59ba6c43e93 100644 --- a/docproc/src/test/java/com/yahoo/docproc/FailingWithErrorTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/FailingWithErrorTestCase.java @@ -1,10 +1,9 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.docproc; +import com.yahoo.docproc.impl.DocprocService; import com.yahoo.document.DataType; -import com.yahoo.document.Document; import com.yahoo.document.DocumentId; -import com.yahoo.document.DocumentOperation; import com.yahoo.document.DocumentPut; import com.yahoo.document.DocumentType; import org.junit.Test; diff --git a/docproc/src/test/java/com/yahoo/docproc/NotAcceptingNewProcessingsTestCase.java b/docproc/src/test/java/com/yahoo/docproc/NotAcceptingNewProcessingsTestCase.java index 7b1cee20d17..2f5b859d699 100644 --- a/docproc/src/test/java/com/yahoo/docproc/NotAcceptingNewProcessingsTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/NotAcceptingNewProcessingsTestCase.java @@ -1,6 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.docproc; +import com.yahoo.docproc.impl.DocprocService; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/docproc/src/test/java/com/yahoo/docproc/ProcessingUpdateTestCase.java b/docproc/src/test/java/com/yahoo/docproc/ProcessingUpdateTestCase.java index 9afce98dda1..5ee593cfbf7 100644 --- a/docproc/src/test/java/com/yahoo/docproc/ProcessingUpdateTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/ProcessingUpdateTestCase.java @@ -1,6 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.docproc; +import com.yahoo.docproc.impl.DocprocService; import com.yahoo.document.DataType; import com.yahoo.document.Document; import com.yahoo.document.DocumentId; diff --git a/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessingTestCase.java b/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessingTestCase.java index 84d0cad7a4e..f1e0162080f 100644 --- a/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessingTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessingTestCase.java @@ -3,6 +3,7 @@ package com.yahoo.docproc; import com.yahoo.component.chain.dependencies.After; import com.yahoo.docproc.Accesses.Field.Tree; +import com.yahoo.docproc.impl.DocprocService; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessorTestCase.java b/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessorTestCase.java index e23c1d2e7fd..1b591f89942 100644 --- a/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessorTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessorTestCase.java @@ -1,6 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.docproc; +import com.yahoo.docproc.impl.DocprocService; import com.yahoo.jdisc.test.MockMetric; import com.yahoo.document.DataType; import com.yahoo.document.DocumentId; diff --git a/docproc/src/test/java/com/yahoo/docproc/TransientFailureTestCase.java b/docproc/src/test/java/com/yahoo/docproc/TransientFailureTestCase.java index 44c0347aa1f..2dd2bfb9cfc 100644 --- a/docproc/src/test/java/com/yahoo/docproc/TransientFailureTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/TransientFailureTestCase.java @@ -1,6 +1,9 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.docproc; +import com.yahoo.docproc.impl.DocprocService; +import com.yahoo.docproc.impl.ProcessingEndpoint; +import com.yahoo.docproc.impl.TransientFailureException; import com.yahoo.document.DataType; import com.yahoo.document.DocumentId; import com.yahoo.document.DocumentOperation; diff --git a/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerTestBase.java b/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerTestBase.java index 5e07b26accd..499eb93fe80 100644 --- a/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerTestBase.java +++ b/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerTestBase.java @@ -1,7 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.docproc.jdisc; -import com.yahoo.cloud.config.SlobroksConfig; import com.yahoo.collections.Pair; import com.yahoo.component.ComponentId; import com.yahoo.component.provider.ComponentRegistry; @@ -11,15 +10,13 @@ import com.yahoo.container.jdisc.messagebus.MbusServerProvider; import com.yahoo.container.jdisc.messagebus.NetworkMultiplexerProvider; import com.yahoo.container.jdisc.messagebus.SessionCache; import com.yahoo.docproc.CallStack; -import com.yahoo.docproc.DocprocService; +import com.yahoo.docproc.impl.DocprocService; import com.yahoo.docproc.jdisc.messagebus.MbusRequestContext; import com.yahoo.document.DocumentType; import com.yahoo.document.DocumentTypeManager; -import com.yahoo.document.config.DocumentmanagerConfig; import com.yahoo.documentapi.messagebus.protocol.DocumentMessage; import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol; -import com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig; import com.yahoo.jdisc.AbstractResource; import com.yahoo.jdisc.ReferencedResource; import com.yahoo.jdisc.application.ContainerBuilder; -- cgit v1.2.3 From 23d34618733d9c67270ebbfe01aac72750a47241 Mon Sep 17 00:00:00 2001 From: gjoranv Date: Wed, 8 Jun 2022 01:22:39 +0200 Subject: Set project version to 8-SNAPSHOT --- abi-check-plugin/pom.xml | 4 ++-- annotations/pom.xml | 4 ++-- application-model/pom.xml | 4 ++-- application-preprocessor/pom.xml | 4 ++-- application/pom.xml | 4 ++-- athenz-identity-provider-service/pom.xml | 2 +- bundle-plugin-test/integration-test/pom.xml | 4 ++-- bundle-plugin-test/pom.xml | 4 ++-- .../test-bundles/artifact-version-for-exports-dep/pom.xml | 4 ++-- bundle-plugin-test/test-bundles/artifact-version-for-exports/pom.xml | 4 ++-- bundle-plugin-test/test-bundles/main/pom.xml | 4 ++-- bundle-plugin-test/test-bundles/pom.xml | 4 ++-- bundle-plugin/pom.xml | 4 ++-- client/pom.xml | 4 ++-- cloud-tenant-base-dependencies-enforcer/pom.xml | 4 ++-- cloud-tenant-base/pom.xml | 4 ++-- cloud-tenant-cd/pom.xml | 2 +- clustercontroller-apps/pom.xml | 4 ++-- clustercontroller-core/pom.xml | 4 ++-- clustercontroller-reindexer/pom.xml | 2 +- clustercontroller-utils/pom.xml | 4 ++-- component/pom.xml | 4 ++-- config-application-package/pom.xml | 4 ++-- config-bundle/pom.xml | 4 ++-- config-class-plugin/pom.xml | 4 ++-- config-lib/pom.xml | 4 ++-- config-model-api/pom.xml | 4 ++-- config-model-fat/pom.xml | 4 ++-- config-model/pom.xml | 4 ++-- config-provisioning/pom.xml | 2 +- config-proxy/pom.xml | 4 ++-- config/pom.xml | 4 ++-- config_test/pom.xml | 2 +- configdefinitions/pom.xml | 4 ++-- configgen/pom.xml | 4 ++-- configserver-flags/pom.xml | 4 ++-- configserver/pom.xml | 4 ++-- container-apache-http-client-bundle/pom.xml | 4 ++-- container-core/pom.xml | 4 ++-- container-dependencies-enforcer/pom.xml | 4 ++-- container-dependency-versions/pom.xml | 2 +- container-dev/pom.xml | 4 ++-- container-disc/pom.xml | 4 ++-- container-documentapi/pom.xml | 4 ++-- container-integration-test/pom.xml | 4 ++-- container-messagebus/pom.xml | 4 ++-- container-search-and-docproc/pom.xml | 4 ++-- container-search-gui/pom.xml | 4 ++-- container-search/pom.xml | 4 ++-- container-test/pom.xml | 4 ++-- container/pom.xml | 4 ++-- controller-api/pom.xml | 4 ++-- controller-server/pom.xml | 4 ++-- defaults/pom.xml | 4 ++-- docproc/pom.xml | 4 ++-- docprocs/pom.xml | 4 ++-- document/pom.xml | 4 ++-- documentapi-dependencies/pom.xml | 4 ++-- documentapi/pom.xml | 4 ++-- documentgen-test/pom.xml | 4 ++-- fat-model-dependencies/pom.xml | 4 ++-- fileacquirer/pom.xml | 4 ++-- filedistribution/pom.xml | 4 ++-- flags/pom.xml | 4 ++-- fsa/pom.xml | 4 ++-- hosted-api/pom.xml | 2 +- hosted-tenant-base/pom.xml | 2 +- hosted-zone-api/pom.xml | 2 +- http-client/pom.xml | 2 +- http-utils/pom.xml | 4 ++-- indexinglanguage/pom.xml | 4 ++-- integration/intellij/pom.xml | 2 +- jaxrs_utils/pom.xml | 4 ++-- jdisc-cloud-aws/pom.xml | 4 ++-- jdisc-security-filters/pom.xml | 4 ++-- jdisc_core/pom.xml | 4 ++-- jdisc_core_test/integration_test/pom.xml | 4 ++-- jdisc_core_test/pom.xml | 4 ++-- jdisc_core_test/test_bundles/app-a/pom.xml | 4 ++-- jdisc_core_test/test_bundles/app-b-priv/pom.xml | 4 ++-- jdisc_core_test/test_bundles/app-ca/pom.xml | 4 ++-- jdisc_core_test/test_bundles/app-dj/pom.xml | 4 ++-- jdisc_core_test/test_bundles/app-ej-priv/pom.xml | 4 ++-- jdisc_core_test/test_bundles/app-f-more/pom.xml | 4 ++-- jdisc_core_test/test_bundles/app-g-act/pom.xml | 4 ++-- jdisc_core_test/test_bundles/app-h-log/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-a/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-b/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-ca/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-dc/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-eab/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-fac/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-gg/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-hi/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-ih/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-j-priv/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-k-pkgs/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-l1-dup/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-l1/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-l2/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-ml-dup/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-ml/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-nac/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-oa-path/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-p-jar/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-q-frag/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-rq/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-s-act/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-tp/pom.xml | 4 ++-- jdisc_core_test/test_bundles/cert-us/pom.xml | 4 ++-- jdisc_core_test/test_bundles/my-bundle-activator/pom.xml | 4 ++-- jdisc_core_test/test_bundles/my-guice-module/pom.xml | 4 ++-- jdisc_core_test/test_bundles/my-server-provider/pom.xml | 4 ++-- jdisc_core_test/test_bundles/pom.xml | 4 ++-- jdisc_jetty/pom.xml | 4 ++-- jrt/pom.xml | 4 ++-- linguistics-components/pom.xml | 4 ++-- linguistics/pom.xml | 4 ++-- logd/pom.xml | 4 ++-- logserver/pom.xml | 4 ++-- maven-plugins/pom.xml | 4 ++-- messagebus/pom.xml | 4 ++-- metrics-proxy/pom.xml | 4 ++-- metrics/pom.xml | 4 ++-- model-evaluation/pom.xml | 4 ++-- model-integration/pom.xml | 4 ++-- node-admin/pom.xml | 4 ++-- node-repository/pom.xml | 4 ++-- orchestrator-restapi/pom.xml | 4 ++-- orchestrator/pom.xml | 4 ++-- parent/pom.xml | 4 ++-- pom.xml | 2 +- predicate-search-core/pom.xml | 4 ++-- predicate-search/pom.xml | 4 ++-- provided-dependencies/pom.xml | 4 ++-- routing-generator/pom.xml | 4 ++-- searchcore/pom.xml | 4 ++-- searchlib/pom.xml | 4 ++-- searchsummary/pom.xml | 4 ++-- security-tools/pom.xml | 4 ++-- security-utils/pom.xml | 4 ++-- service-monitor/pom.xml | 4 ++-- socket_test/pom.xml | 4 ++-- standalone-container/pom.xml | 4 ++-- storage/pom.xml | 4 ++-- streamingvisitors/pom.xml | 4 ++-- tenant-base/pom.xml | 2 +- tenant-cd-api/pom.xml | 2 +- tenant-cd-commons/pom.xml | 2 +- testutil/pom.xml | 4 ++-- vdslib/pom.xml | 4 ++-- vespa-3party-bundles/pom.xml | 4 ++-- vespa-application-maven-plugin/pom.xml | 4 ++-- vespa-athenz/pom.xml | 4 ++-- vespa-documentgen-plugin/pom.xml | 4 ++-- vespa-feed-client-api/pom.xml | 4 ++-- vespa-feed-client-cli/pom.xml | 4 ++-- vespa-feed-client/pom.xml | 4 ++-- vespa-hadoop/pom.xml | 4 ++-- vespa-maven-plugin/pom.xml | 2 +- vespa-osgi-testrunner/pom.xml | 2 +- vespa-testrunner-components/pom.xml | 2 +- vespa_feed_perf/pom.xml | 4 ++-- vespaclient-container-plugin/pom.xml | 4 ++-- vespaclient-core/pom.xml | 4 ++-- vespaclient-java/pom.xml | 4 ++-- vespajlib/pom.xml | 4 ++-- vespalog/pom.xml | 4 ++-- yolean/pom.xml | 4 ++-- zkfacade/pom.xml | 4 ++-- zookeeper-client-common/pom.xml | 4 ++-- zookeeper-command-line-client/pom.xml | 4 ++-- zookeeper-server/pom.xml | 4 ++-- zookeeper-server/zookeeper-server-3.7.1/pom.xml | 4 ++-- zookeeper-server/zookeeper-server-common/pom.xml | 4 ++-- zookeeper-server/zookeeper-server/pom.xml | 4 ++-- 176 files changed, 334 insertions(+), 334 deletions(-) (limited to 'application') diff --git a/abi-check-plugin/pom.xml b/abi-check-plugin/pom.xml index 8d782b1d426..d24765a5f88 100644 --- a/abi-check-plugin/pom.xml +++ b/abi-check-plugin/pom.xml @@ -6,11 +6,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml abi-check-plugin - 7-SNAPSHOT + 8-SNAPSHOT maven-plugin ${project.artifactId} Maven Plugin for ensuring ABI stability. diff --git a/annotations/pom.xml b/annotations/pom.xml index 358188f71c2..e3f5455c88b 100644 --- a/annotations/pom.xml +++ b/annotations/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml annotations bundle - 7-SNAPSHOT + 8-SNAPSHOT annotations Public API annotations diff --git a/application-model/pom.xml b/application-model/pom.xml index 7eac247e249..2143f3a5ffd 100644 --- a/application-model/pom.xml +++ b/application-model/pom.xml @@ -6,12 +6,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml application-model container-plugin - 7-SNAPSHOT + 8-SNAPSHOT ${project.artifactId} Model classes for Vespa application entities such as host name, application id etc. diff --git a/application-preprocessor/pom.xml b/application-preprocessor/pom.xml index 644903e79dd..f8b521140f7 100644 --- a/application-preprocessor/pom.xml +++ b/application-preprocessor/pom.xml @@ -6,12 +6,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml application-preprocessor jar - 7-SNAPSHOT + 8-SNAPSHOT com.yahoo.vespa diff --git a/application/pom.xml b/application/pom.xml index ceb8653cd1c..b0036b3ca3e 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -6,12 +6,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml application jar - 7-SNAPSHOT + 8-SNAPSHOT Runs an application directly from services.xml diff --git a/athenz-identity-provider-service/pom.xml b/athenz-identity-provider-service/pom.xml index 08521216736..d5e6b85f571 100644 --- a/athenz-identity-provider-service/pom.xml +++ b/athenz-identity-provider-service/pom.xml @@ -10,7 +10,7 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml diff --git a/bundle-plugin-test/integration-test/pom.xml b/bundle-plugin-test/integration-test/pom.xml index 5f9192b064b..a97d30fbaec 100644 --- a/bundle-plugin-test/integration-test/pom.xml +++ b/bundle-plugin-test/integration-test/pom.xml @@ -8,11 +8,11 @@ com.yahoo.vespa.bundle-plugin bundle-plugin-test - 7-SNAPSHOT + 8-SNAPSHOT ../pom.xml integration-test - 7-SNAPSHOT + 8-SNAPSHOT jar diff --git a/bundle-plugin-test/pom.xml b/bundle-plugin-test/pom.xml index 0500e69acb3..16dd1238f53 100644 --- a/bundle-plugin-test/pom.xml +++ b/bundle-plugin-test/pom.xml @@ -8,12 +8,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml com.yahoo.vespa.bundle-plugin bundle-plugin-test - 7-SNAPSHOT + 8-SNAPSHOT pom integration-test diff --git a/bundle-plugin-test/test-bundles/artifact-version-for-exports-dep/pom.xml b/bundle-plugin-test/test-bundles/artifact-version-for-exports-dep/pom.xml index e4ef18d179d..6d8095c2153 100644 --- a/bundle-plugin-test/test-bundles/artifact-version-for-exports-dep/pom.xml +++ b/bundle-plugin-test/test-bundles/artifact-version-for-exports-dep/pom.xml @@ -8,7 +8,7 @@ com.yahoo.vespa.bundle-plugin test-bundles - 7-SNAPSHOT + 8-SNAPSHOT ../pom.xml artifact-version-for-exports-dep @@ -16,7 +16,7 @@ But version is set to the release version by build scripts before building. Then, the dependent bundle will not find the artifact. Skipping this step for a sub-module seems impossible with the maven-versions-plugin, and cumbersome with factorylib. --> - 7-SNAPSHOT + 8-SNAPSHOT container-plugin diff --git a/bundle-plugin-test/test-bundles/artifact-version-for-exports/pom.xml b/bundle-plugin-test/test-bundles/artifact-version-for-exports/pom.xml index ede831adfbc..289d2f67eb0 100644 --- a/bundle-plugin-test/test-bundles/artifact-version-for-exports/pom.xml +++ b/bundle-plugin-test/test-bundles/artifact-version-for-exports/pom.xml @@ -8,11 +8,11 @@ com.yahoo.vespa.bundle-plugin test-bundles - 7-SNAPSHOT + 8-SNAPSHOT ../pom.xml artifact-version-for-exports - 7-SNAPSHOT + 8-SNAPSHOT container-plugin diff --git a/bundle-plugin-test/test-bundles/main/pom.xml b/bundle-plugin-test/test-bundles/main/pom.xml index 8153d46bcb7..b5f8f7b9a6a 100644 --- a/bundle-plugin-test/test-bundles/main/pom.xml +++ b/bundle-plugin-test/test-bundles/main/pom.xml @@ -8,11 +8,11 @@ com.yahoo.vespa.bundle-plugin test-bundles - 7-SNAPSHOT + 8-SNAPSHOT ../pom.xml main - 7-SNAPSHOT + 8-SNAPSHOT container-plugin diff --git a/bundle-plugin-test/test-bundles/pom.xml b/bundle-plugin-test/test-bundles/pom.xml index faddeafc76d..3af10826adc 100644 --- a/bundle-plugin-test/test-bundles/pom.xml +++ b/bundle-plugin-test/test-bundles/pom.xml @@ -8,11 +8,11 @@ com.yahoo.vespa.bundle-plugin bundle-plugin-test - 7-SNAPSHOT + 8-SNAPSHOT ../pom.xml test-bundles - 7-SNAPSHOT + 8-SNAPSHOT pom diff --git a/bundle-plugin/pom.xml b/bundle-plugin/pom.xml index 7993dfecafd..be5d2d59de2 100644 --- a/bundle-plugin/pom.xml +++ b/bundle-plugin/pom.xml @@ -6,11 +6,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml bundle-plugin - 7-SNAPSHOT + 8-SNAPSHOT maven-plugin ${project.artifactId} Maven Plugin for creating OSGi bundles for the JDisc Container. diff --git a/client/pom.xml b/client/pom.xml index 190b0a4a73f..065cb2c4317 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -8,13 +8,13 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml client jar - 7-SNAPSHOT + 8-SNAPSHOT diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index ace3ba946e9..116ba1ba403 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -8,12 +8,12 @@ com.yahoo.vespa cloud-tenant-base - 7-SNAPSHOT + 8-SNAPSHOT ../cloud-tenant-base/pom.xml cloud-tenant-base-dependencies-enforcer - 7-SNAPSHOT + 8-SNAPSHOT pom diff --git a/cloud-tenant-base/pom.xml b/cloud-tenant-base/pom.xml index bb4171bd096..64ed23b6c33 100644 --- a/cloud-tenant-base/pom.xml +++ b/cloud-tenant-base/pom.xml @@ -7,7 +7,7 @@ cloud-tenant-base Vespa Cloud tenant base - 7-SNAPSHOT + 8-SNAPSHOT Parent POM for all Vespa Cloud applications. https://github.com/vespa-engine pom @@ -15,7 +15,7 @@ hosted-tenant-base com.yahoo.vespa - 7-SNAPSHOT + 8-SNAPSHOT ../hosted-tenant-base/pom.xml diff --git a/cloud-tenant-cd/pom.xml b/cloud-tenant-cd/pom.xml index ec23337f82b..baccbab54f5 100644 --- a/cloud-tenant-cd/pom.xml +++ b/cloud-tenant-cd/pom.xml @@ -13,7 +13,7 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent diff --git a/clustercontroller-apps/pom.xml b/clustercontroller-apps/pom.xml index 4b90f3c6ca9..fa0f5c064ad 100644 --- a/clustercontroller-apps/pom.xml +++ b/clustercontroller-apps/pom.xml @@ -5,11 +5,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml clustercontroller-apps - 7-SNAPSHOT + 8-SNAPSHOT container-plugin diff --git a/clustercontroller-core/pom.xml b/clustercontroller-core/pom.xml index 7a3ccaf61f4..243b69bf1e2 100644 --- a/clustercontroller-core/pom.xml +++ b/clustercontroller-core/pom.xml @@ -5,11 +5,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml clustercontroller-core - 7-SNAPSHOT + 8-SNAPSHOT container-plugin ${project.artifactId} diff --git a/clustercontroller-reindexer/pom.xml b/clustercontroller-reindexer/pom.xml index f39922e0379..42e746c1bae 100644 --- a/clustercontroller-reindexer/pom.xml +++ b/clustercontroller-reindexer/pom.xml @@ -6,7 +6,7 @@ parent com.yahoo.vespa - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml 4.0.0 diff --git a/clustercontroller-utils/pom.xml b/clustercontroller-utils/pom.xml index bf97dbd79ae..03a368ed667 100644 --- a/clustercontroller-utils/pom.xml +++ b/clustercontroller-utils/pom.xml @@ -6,11 +6,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml clustercontroller-utils - 7-SNAPSHOT + 8-SNAPSHOT container-plugin diff --git a/component/pom.xml b/component/pom.xml index 40837457b17..a4330957069 100755 --- a/component/pom.xml +++ b/component/pom.xml @@ -8,12 +8,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml component container-plugin - 7-SNAPSHOT + 8-SNAPSHOT junit diff --git a/config-application-package/pom.xml b/config-application-package/pom.xml index 869e161f57d..3d471f1c94b 100644 --- a/config-application-package/pom.xml +++ b/config-application-package/pom.xml @@ -6,12 +6,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml config-application-package container-plugin - 7-SNAPSHOT + 8-SNAPSHOT com.yahoo.vespa diff --git a/config-bundle/pom.xml b/config-bundle/pom.xml index e8409bc1bbe..50205f9fe71 100644 --- a/config-bundle/pom.xml +++ b/config-bundle/pom.xml @@ -6,12 +6,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml config-bundle container-plugin - 7-SNAPSHOT + 8-SNAPSHOT com.yahoo.vespa diff --git a/config-class-plugin/pom.xml b/config-class-plugin/pom.xml index 50471514cc0..26dac276ea2 100644 --- a/config-class-plugin/pom.xml +++ b/config-class-plugin/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml config-class-plugin maven-plugin - 7-SNAPSHOT + 8-SNAPSHOT config-class-plugin (Vespa ConfigGen Plugin) diff --git a/config-lib/pom.xml b/config-lib/pom.xml index 7c13bd22227..ea72afb568d 100644 --- a/config-lib/pom.xml +++ b/config-lib/pom.xml @@ -8,12 +8,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml config-lib container-plugin - 7-SNAPSHOT + 8-SNAPSHOT ${project.artifactId} diff --git a/config-model-api/pom.xml b/config-model-api/pom.xml index 3e83a6dfddf..1d28965fa3c 100644 --- a/config-model-api/pom.xml +++ b/config-model-api/pom.xml @@ -8,11 +8,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml config-model-api - 7-SNAPSHOT + 8-SNAPSHOT container-plugin ${project.artifactId} diff --git a/config-model-fat/pom.xml b/config-model-fat/pom.xml index 96cafd4ec0f..44880d052b6 100644 --- a/config-model-fat/pom.xml +++ b/config-model-fat/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml config-model-fat bundle - 7-SNAPSHOT + 8-SNAPSHOT com.yahoo.vespa diff --git a/config-model/pom.xml b/config-model/pom.xml index 7e705cfa0aa..13af9d38263 100644 --- a/config-model/pom.xml +++ b/config-model/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml config-model container-plugin - 7-SNAPSHOT + 8-SNAPSHOT com.yahoo.vespa diff --git a/config-provisioning/pom.xml b/config-provisioning/pom.xml index c7616b2187a..119931465bf 100644 --- a/config-provisioning/pom.xml +++ b/config-provisioning/pom.xml @@ -5,7 +5,7 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml diff --git a/config-proxy/pom.xml b/config-proxy/pom.xml index 95cbac62dda..4272cf6617e 100644 --- a/config-proxy/pom.xml +++ b/config-proxy/pom.xml @@ -6,12 +6,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml config-proxy jar - 7-SNAPSHOT + 8-SNAPSHOT junit diff --git a/config/pom.xml b/config/pom.xml index f7098bfa6ce..f787a7b0b49 100755 --- a/config/pom.xml +++ b/config/pom.xml @@ -6,12 +6,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml config container-plugin - 7-SNAPSHOT + 8-SNAPSHOT diff --git a/config_test/pom.xml b/config_test/pom.xml index b87ac3aed7c..dc35b53510b 100644 --- a/config_test/pom.xml +++ b/config_test/pom.xml @@ -6,7 +6,7 @@ com.yahoo.vespa config_test container-plugin - 7-SNAPSHOT + 8-SNAPSHOT junit diff --git a/configdefinitions/pom.xml b/configdefinitions/pom.xml index 0f4f1ddbad3..47cc106c789 100644 --- a/configdefinitions/pom.xml +++ b/configdefinitions/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml configdefinitions container-plugin - 7-SNAPSHOT + 8-SNAPSHOT configdefinitions diff --git a/configgen/pom.xml b/configgen/pom.xml index ad8e1672dad..11d6a195bc6 100644 --- a/configgen/pom.xml +++ b/configgen/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml configgen jar - 7-SNAPSHOT + 8-SNAPSHOT configgen Config java code generation from config definition files for Java Vespa components. diff --git a/configserver-flags/pom.xml b/configserver-flags/pom.xml index 51eee97455f..a2a90483e75 100644 --- a/configserver-flags/pom.xml +++ b/configserver-flags/pom.xml @@ -8,11 +8,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml configserver-flags - 7-SNAPSHOT + 8-SNAPSHOT container-plugin Config Server Flags. diff --git a/configserver/pom.xml b/configserver/pom.xml index a307772376a..86289a46d19 100644 --- a/configserver/pom.xml +++ b/configserver/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml configserver container-plugin - 7-SNAPSHOT + 8-SNAPSHOT diff --git a/container-search-and-docproc/pom.xml b/container-search-and-docproc/pom.xml index 9be054570e0..036a378da3a 100644 --- a/container-search-and-docproc/pom.xml +++ b/container-search-and-docproc/pom.xml @@ -8,11 +8,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml container-search-and-docproc - 7-SNAPSHOT + 8-SNAPSHOT container-plugin diff --git a/container-search-gui/pom.xml b/container-search-gui/pom.xml index 3f6f7f48921..d0c6706189d 100644 --- a/container-search-gui/pom.xml +++ b/container-search-gui/pom.xml @@ -8,12 +8,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml container-search-gui container-plugin - 7-SNAPSHOT + 8-SNAPSHOT com.google.inject diff --git a/container-search/pom.xml b/container-search/pom.xml index adf4e7d9269..e29445f5564 100644 --- a/container-search/pom.xml +++ b/container-search/pom.xml @@ -8,12 +8,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml container-search jar - 7-SNAPSHOT + 8-SNAPSHOT junit diff --git a/container-test/pom.xml b/container-test/pom.xml index c8ead0089d1..91519da6dd3 100644 --- a/container-test/pom.xml +++ b/container-test/pom.xml @@ -10,11 +10,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml container-test - 7-SNAPSHOT + 8-SNAPSHOT jar diff --git a/container/pom.xml b/container/pom.xml index 0b6bef77282..b2a3a1baef8 100644 --- a/container/pom.xml +++ b/container/pom.xml @@ -10,11 +10,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml container - 7-SNAPSHOT + 8-SNAPSHOT jar diff --git a/controller-api/pom.xml b/controller-api/pom.xml index 580809c4181..f7057c93561 100644 --- a/controller-api/pom.xml +++ b/controller-api/pom.xml @@ -8,12 +8,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml controller-api container-plugin - 7-SNAPSHOT + 8-SNAPSHOT diff --git a/controller-server/pom.xml b/controller-server/pom.xml index ff7367e03b2..773d63202b6 100644 --- a/controller-server/pom.xml +++ b/controller-server/pom.xml @@ -8,12 +8,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml controller-server container-plugin - 7-SNAPSHOT + 8-SNAPSHOT diff --git a/defaults/pom.xml b/defaults/pom.xml index 86872b6d700..ffafc683fd6 100644 --- a/defaults/pom.xml +++ b/defaults/pom.xml @@ -7,13 +7,13 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml com.yahoo.vespa defaults container-plugin - 7-SNAPSHOT + 8-SNAPSHOT defaults Library with the defaults for Vespa. diff --git a/docproc/pom.xml b/docproc/pom.xml index d758606f8b7..e7d8d6e3a3e 100644 --- a/docproc/pom.xml +++ b/docproc/pom.xml @@ -8,12 +8,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml docproc jar - 7-SNAPSHOT + 8-SNAPSHOT diff --git a/docprocs/pom.xml b/docprocs/pom.xml index 7ad13ce83e1..42ae75e36f1 100644 --- a/docprocs/pom.xml +++ b/docprocs/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml docprocs container-plugin - 7-SNAPSHOT + 8-SNAPSHOT com.yahoo.vespa diff --git a/document/pom.xml b/document/pom.xml index 06488d799eb..5db432d2447 100644 --- a/document/pom.xml +++ b/document/pom.xml @@ -8,11 +8,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml document - 7-SNAPSHOT + 8-SNAPSHOT jar ${project.artifactId} diff --git a/documentapi-dependencies/pom.xml b/documentapi-dependencies/pom.xml index 7a977a36842..25552700528 100644 --- a/documentapi-dependencies/pom.xml +++ b/documentapi-dependencies/pom.xml @@ -6,12 +6,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml documentapi-dependencies pom - 7-SNAPSHOT + 8-SNAPSHOT diff --git a/documentapi/pom.xml b/documentapi/pom.xml index 7d91e246cfe..9b690f345ae 100644 --- a/documentapi/pom.xml +++ b/documentapi/pom.xml @@ -6,12 +6,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml documentapi jar - 7-SNAPSHOT + 8-SNAPSHOT diff --git a/documentgen-test/pom.xml b/documentgen-test/pom.xml index c9c62316464..1898872c1a0 100644 --- a/documentgen-test/pom.xml +++ b/documentgen-test/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml documentgen-test jar - 7-SNAPSHOT + 8-SNAPSHOT documentgen_test Tests for vespa-documentgen-plugin diff --git a/fat-model-dependencies/pom.xml b/fat-model-dependencies/pom.xml index 5c489662842..180a39778a8 100644 --- a/fat-model-dependencies/pom.xml +++ b/fat-model-dependencies/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml fat-model-dependencies pom - 7-SNAPSHOT + 8-SNAPSHOT com.yahoo.vespa diff --git a/fileacquirer/pom.xml b/fileacquirer/pom.xml index 1a85849fd98..ed02667b2a0 100644 --- a/fileacquirer/pom.xml +++ b/fileacquirer/pom.xml @@ -6,11 +6,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml fileacquirer - 7-SNAPSHOT + 8-SNAPSHOT junit diff --git a/filedistribution/pom.xml b/filedistribution/pom.xml index 9dca254cebe..7916698b62c 100644 --- a/filedistribution/pom.xml +++ b/filedistribution/pom.xml @@ -8,12 +8,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml filedistribution - 7-SNAPSHOT + 8-SNAPSHOT container-plugin ${project.artifactId} diff --git a/flags/pom.xml b/flags/pom.xml index e853f869228..6eaecc35c47 100644 --- a/flags/pom.xml +++ b/flags/pom.xml @@ -8,13 +8,13 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml flags container-plugin - 7-SNAPSHOT + 8-SNAPSHOT ${project.artifactId} Feature flags diff --git a/fsa/pom.xml b/fsa/pom.xml index db863ba5522..5d18bdb666c 100644 --- a/fsa/pom.xml +++ b/fsa/pom.xml @@ -6,12 +6,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml fsa container-plugin - 7-SNAPSHOT + 8-SNAPSHOT This is the FSA library and tools, an implementation of finite state automata (FSA) and related algorithms. diff --git a/hosted-api/pom.xml b/hosted-api/pom.xml index a9d8e7eee46..6f7c6186ece 100644 --- a/hosted-api/pom.xml +++ b/hosted-api/pom.xml @@ -8,7 +8,7 @@ parent com.yahoo.vespa - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml hosted-api diff --git a/hosted-tenant-base/pom.xml b/hosted-tenant-base/pom.xml index 6eaeb508322..7e68f2e1acb 100644 --- a/hosted-tenant-base/pom.xml +++ b/hosted-tenant-base/pom.xml @@ -7,7 +7,7 @@ com.yahoo.vespa hosted-tenant-base - 7-SNAPSHOT + 8-SNAPSHOT Base pom for all tenant base poms Parent POM for all Vespa base poms. https://github.com/vespa-engine diff --git a/hosted-zone-api/pom.xml b/hosted-zone-api/pom.xml index ea3b035618b..87012df8479 100644 --- a/hosted-zone-api/pom.xml +++ b/hosted-zone-api/pom.xml @@ -5,7 +5,7 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml hosted-zone-api diff --git a/http-client/pom.xml b/http-client/pom.xml index 75e9bdc27cb..49512c09a72 100644 --- a/http-client/pom.xml +++ b/http-client/pom.xml @@ -8,7 +8,7 @@ parent com.yahoo.vespa - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml container-plugin diff --git a/http-utils/pom.xml b/http-utils/pom.xml index 4a84fb820eb..52dac0cfeea 100644 --- a/http-utils/pom.xml +++ b/http-utils/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml http-utils jar - 7-SNAPSHOT + 8-SNAPSHOT diff --git a/indexinglanguage/pom.xml b/indexinglanguage/pom.xml index 48fa89c428e..040a13efc91 100644 --- a/indexinglanguage/pom.xml +++ b/indexinglanguage/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml indexinglanguage jar - 7-SNAPSHOT + 8-SNAPSHOT indexinglanguage Interpreter for the Indexing Language diff --git a/integration/intellij/pom.xml b/integration/intellij/pom.xml index dfc44ab9dc2..d7146a60f7a 100644 --- a/integration/intellij/pom.xml +++ b/integration/intellij/pom.xml @@ -5,7 +5,7 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml vespa-intellij diff --git a/jaxrs_utils/pom.xml b/jaxrs_utils/pom.xml index 492bc095a57..cb7839bc73d 100644 --- a/jaxrs_utils/pom.xml +++ b/jaxrs_utils/pom.xml @@ -8,11 +8,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml jaxrs_utils - 7-SNAPSHOT + 8-SNAPSHOT container-plugin ${project.artifactId} diff --git a/jdisc-cloud-aws/pom.xml b/jdisc-cloud-aws/pom.xml index 41259a7fb42..5ae3e056309 100644 --- a/jdisc-cloud-aws/pom.xml +++ b/jdisc-cloud-aws/pom.xml @@ -8,11 +8,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml jdisc-cloud-aws - 7-SNAPSHOT + 8-SNAPSHOT container-plugin ${project.artifactId} diff --git a/jdisc-security-filters/pom.xml b/jdisc-security-filters/pom.xml index d27055d592e..dcfb61de3cc 100644 --- a/jdisc-security-filters/pom.xml +++ b/jdisc-security-filters/pom.xml @@ -7,12 +7,12 @@ 4.0.0 jdisc-security-filters container-plugin - 7-SNAPSHOT + 8-SNAPSHOT com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml diff --git a/jdisc_core/pom.xml b/jdisc_core/pom.xml index 8d09ea1198f..3ab469983c5 100644 --- a/jdisc_core/pom.xml +++ b/jdisc_core/pom.xml @@ -8,11 +8,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml jdisc_core - 7-SNAPSHOT + 8-SNAPSHOT jar ${project.artifactId} diff --git a/jdisc_core_test/integration_test/pom.xml b/jdisc_core_test/integration_test/pom.xml index 7aadee990c6..cee12f1b26a 100644 --- a/jdisc_core_test/integration_test/pom.xml +++ b/jdisc_core_test/integration_test/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core integration-test-parent - 7-SNAPSHOT + 8-SNAPSHOT integration_test - 7-SNAPSHOT + 8-SNAPSHOT jar ${project.artifactId} diff --git a/jdisc_core_test/pom.xml b/jdisc_core_test/pom.xml index 4216c25266e..0cf340e907a 100644 --- a/jdisc_core_test/pom.xml +++ b/jdisc_core_test/pom.xml @@ -8,12 +8,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml com.yahoo.vespa.jdisc_core integration-test-parent - 7-SNAPSHOT + 8-SNAPSHOT pom ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/app-a/pom.xml b/jdisc_core_test/test_bundles/app-a/pom.xml index 9b8304284ae..b13b4b699c7 100644 --- a/jdisc_core_test/test_bundles/app-a/pom.xml +++ b/jdisc_core_test/test_bundles/app-a/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT app-a - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/app-b-priv/pom.xml b/jdisc_core_test/test_bundles/app-b-priv/pom.xml index 3b595562718..852f70441cc 100644 --- a/jdisc_core_test/test_bundles/app-b-priv/pom.xml +++ b/jdisc_core_test/test_bundles/app-b-priv/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT app-b-priv - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/app-ca/pom.xml b/jdisc_core_test/test_bundles/app-ca/pom.xml index 6126af80de0..ce2d977c2a5 100644 --- a/jdisc_core_test/test_bundles/app-ca/pom.xml +++ b/jdisc_core_test/test_bundles/app-ca/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT app-ca - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/app-dj/pom.xml b/jdisc_core_test/test_bundles/app-dj/pom.xml index e17020bdd0c..9f6bae624dc 100644 --- a/jdisc_core_test/test_bundles/app-dj/pom.xml +++ b/jdisc_core_test/test_bundles/app-dj/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT app-dj - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/app-ej-priv/pom.xml b/jdisc_core_test/test_bundles/app-ej-priv/pom.xml index 7d55bfbe895..fb05e6bca86 100644 --- a/jdisc_core_test/test_bundles/app-ej-priv/pom.xml +++ b/jdisc_core_test/test_bundles/app-ej-priv/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT app-ej-priv - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/app-f-more/pom.xml b/jdisc_core_test/test_bundles/app-f-more/pom.xml index a488b333092..00fd8977c06 100644 --- a/jdisc_core_test/test_bundles/app-f-more/pom.xml +++ b/jdisc_core_test/test_bundles/app-f-more/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT app-f-more - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/app-g-act/pom.xml b/jdisc_core_test/test_bundles/app-g-act/pom.xml index a8389b8ce33..ea849ad295d 100644 --- a/jdisc_core_test/test_bundles/app-g-act/pom.xml +++ b/jdisc_core_test/test_bundles/app-g-act/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT app-g-act - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/app-h-log/pom.xml b/jdisc_core_test/test_bundles/app-h-log/pom.xml index 99a82c5e9b1..e1e0c2e8de3 100644 --- a/jdisc_core_test/test_bundles/app-h-log/pom.xml +++ b/jdisc_core_test/test_bundles/app-h-log/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT app-h-log - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-a/pom.xml b/jdisc_core_test/test_bundles/cert-a/pom.xml index 68986875b56..17decc78ffd 100644 --- a/jdisc_core_test/test_bundles/cert-a/pom.xml +++ b/jdisc_core_test/test_bundles/cert-a/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-a - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-b/pom.xml b/jdisc_core_test/test_bundles/cert-b/pom.xml index 287d914cebc..587826a64b1 100644 --- a/jdisc_core_test/test_bundles/cert-b/pom.xml +++ b/jdisc_core_test/test_bundles/cert-b/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-b - 7-SNAPSHOT + 8-SNAPSHOT container-plugin ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-ca/pom.xml b/jdisc_core_test/test_bundles/cert-ca/pom.xml index 32b9b1e58f9..37621a927ef 100644 --- a/jdisc_core_test/test_bundles/cert-ca/pom.xml +++ b/jdisc_core_test/test_bundles/cert-ca/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-ca - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-dc/pom.xml b/jdisc_core_test/test_bundles/cert-dc/pom.xml index 77bb210fc87..114ab11d96d 100644 --- a/jdisc_core_test/test_bundles/cert-dc/pom.xml +++ b/jdisc_core_test/test_bundles/cert-dc/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-dc - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-eab/pom.xml b/jdisc_core_test/test_bundles/cert-eab/pom.xml index 7870603defe..09f432f42dc 100644 --- a/jdisc_core_test/test_bundles/cert-eab/pom.xml +++ b/jdisc_core_test/test_bundles/cert-eab/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-eab - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-fac/pom.xml b/jdisc_core_test/test_bundles/cert-fac/pom.xml index 9bc7c947862..b7beb071edc 100644 --- a/jdisc_core_test/test_bundles/cert-fac/pom.xml +++ b/jdisc_core_test/test_bundles/cert-fac/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-fac - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-gg/pom.xml b/jdisc_core_test/test_bundles/cert-gg/pom.xml index 09c90f2c146..7ecfca57bcc 100644 --- a/jdisc_core_test/test_bundles/cert-gg/pom.xml +++ b/jdisc_core_test/test_bundles/cert-gg/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-gg - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-hi/pom.xml b/jdisc_core_test/test_bundles/cert-hi/pom.xml index b4d66abca2c..82e5d9f1d81 100644 --- a/jdisc_core_test/test_bundles/cert-hi/pom.xml +++ b/jdisc_core_test/test_bundles/cert-hi/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-hi - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-ih/pom.xml b/jdisc_core_test/test_bundles/cert-ih/pom.xml index 5797fdd145b..0d546f96965 100644 --- a/jdisc_core_test/test_bundles/cert-ih/pom.xml +++ b/jdisc_core_test/test_bundles/cert-ih/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-ih - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-j-priv/pom.xml b/jdisc_core_test/test_bundles/cert-j-priv/pom.xml index 65383b2cddb..0d818144820 100644 --- a/jdisc_core_test/test_bundles/cert-j-priv/pom.xml +++ b/jdisc_core_test/test_bundles/cert-j-priv/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-j-priv - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-k-pkgs/pom.xml b/jdisc_core_test/test_bundles/cert-k-pkgs/pom.xml index e9ad347905b..b810c0fb19f 100644 --- a/jdisc_core_test/test_bundles/cert-k-pkgs/pom.xml +++ b/jdisc_core_test/test_bundles/cert-k-pkgs/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-k-pkgs - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-l1-dup/pom.xml b/jdisc_core_test/test_bundles/cert-l1-dup/pom.xml index 3eef44629ab..f48fd1e66f6 100644 --- a/jdisc_core_test/test_bundles/cert-l1-dup/pom.xml +++ b/jdisc_core_test/test_bundles/cert-l1-dup/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-l1-dup - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-l1/pom.xml b/jdisc_core_test/test_bundles/cert-l1/pom.xml index e89eeae449e..afee36532d4 100644 --- a/jdisc_core_test/test_bundles/cert-l1/pom.xml +++ b/jdisc_core_test/test_bundles/cert-l1/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-l1 - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-l2/pom.xml b/jdisc_core_test/test_bundles/cert-l2/pom.xml index b00e1ecaec2..31fe9b1a6f2 100644 --- a/jdisc_core_test/test_bundles/cert-l2/pom.xml +++ b/jdisc_core_test/test_bundles/cert-l2/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-l2 - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-ml-dup/pom.xml b/jdisc_core_test/test_bundles/cert-ml-dup/pom.xml index 021d14a1336..703c1ff73cb 100644 --- a/jdisc_core_test/test_bundles/cert-ml-dup/pom.xml +++ b/jdisc_core_test/test_bundles/cert-ml-dup/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-ml-dup - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-ml/pom.xml b/jdisc_core_test/test_bundles/cert-ml/pom.xml index f3e9013ce97..30e12cc35aa 100644 --- a/jdisc_core_test/test_bundles/cert-ml/pom.xml +++ b/jdisc_core_test/test_bundles/cert-ml/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-ml - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-nac/pom.xml b/jdisc_core_test/test_bundles/cert-nac/pom.xml index fe88e4cdd4f..73e4e62887e 100644 --- a/jdisc_core_test/test_bundles/cert-nac/pom.xml +++ b/jdisc_core_test/test_bundles/cert-nac/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-nac - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-oa-path/pom.xml b/jdisc_core_test/test_bundles/cert-oa-path/pom.xml index cdc16200b11..621822f76eb 100644 --- a/jdisc_core_test/test_bundles/cert-oa-path/pom.xml +++ b/jdisc_core_test/test_bundles/cert-oa-path/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-oa-path - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-p-jar/pom.xml b/jdisc_core_test/test_bundles/cert-p-jar/pom.xml index 1d6fe7bba4c..817bb7d3451 100644 --- a/jdisc_core_test/test_bundles/cert-p-jar/pom.xml +++ b/jdisc_core_test/test_bundles/cert-p-jar/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-p-jar - 7-SNAPSHOT + 8-SNAPSHOT jar ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-q-frag/pom.xml b/jdisc_core_test/test_bundles/cert-q-frag/pom.xml index 563e4eb60d4..b57d04be877 100644 --- a/jdisc_core_test/test_bundles/cert-q-frag/pom.xml +++ b/jdisc_core_test/test_bundles/cert-q-frag/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-q-frag - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-rq/pom.xml b/jdisc_core_test/test_bundles/cert-rq/pom.xml index 0070ddadeca..6162cdd6075 100644 --- a/jdisc_core_test/test_bundles/cert-rq/pom.xml +++ b/jdisc_core_test/test_bundles/cert-rq/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-rq - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-s-act/pom.xml b/jdisc_core_test/test_bundles/cert-s-act/pom.xml index ed34708dc8a..e7350f70665 100644 --- a/jdisc_core_test/test_bundles/cert-s-act/pom.xml +++ b/jdisc_core_test/test_bundles/cert-s-act/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-s-act - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-tp/pom.xml b/jdisc_core_test/test_bundles/cert-tp/pom.xml index b657f36c695..6618b22efdd 100644 --- a/jdisc_core_test/test_bundles/cert-tp/pom.xml +++ b/jdisc_core_test/test_bundles/cert-tp/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-tp - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/cert-us/pom.xml b/jdisc_core_test/test_bundles/cert-us/pom.xml index 731b5af098f..b4306daa5e8 100644 --- a/jdisc_core_test/test_bundles/cert-us/pom.xml +++ b/jdisc_core_test/test_bundles/cert-us/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT cert-us - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/my-bundle-activator/pom.xml b/jdisc_core_test/test_bundles/my-bundle-activator/pom.xml index 5daef993b4a..deb8ddb80fc 100644 --- a/jdisc_core_test/test_bundles/my-bundle-activator/pom.xml +++ b/jdisc_core_test/test_bundles/my-bundle-activator/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT my-bundle-activator - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/my-guice-module/pom.xml b/jdisc_core_test/test_bundles/my-guice-module/pom.xml index 296ca98acb8..be8f22f3c40 100644 --- a/jdisc_core_test/test_bundles/my-guice-module/pom.xml +++ b/jdisc_core_test/test_bundles/my-guice-module/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT my-guice-module - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/my-server-provider/pom.xml b/jdisc_core_test/test_bundles/my-server-provider/pom.xml index 3fc2ed2a755..b5b78191010 100644 --- a/jdisc_core_test/test_bundles/my-server-provider/pom.xml +++ b/jdisc_core_test/test_bundles/my-server-provider/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core test_bundles - 7-SNAPSHOT + 8-SNAPSHOT my-server-provider - 7-SNAPSHOT + 8-SNAPSHOT bundle ${project.artifactId} diff --git a/jdisc_core_test/test_bundles/pom.xml b/jdisc_core_test/test_bundles/pom.xml index ff3c14ee354..63f31c1963b 100644 --- a/jdisc_core_test/test_bundles/pom.xml +++ b/jdisc_core_test/test_bundles/pom.xml @@ -8,10 +8,10 @@ com.yahoo.vespa.jdisc_core integration-test-parent - 7-SNAPSHOT + 8-SNAPSHOT test_bundles - 7-SNAPSHOT + 8-SNAPSHOT pom ${project.artifactId} diff --git a/jdisc_jetty/pom.xml b/jdisc_jetty/pom.xml index 76140f67416..dc3976098fa 100644 --- a/jdisc_jetty/pom.xml +++ b/jdisc_jetty/pom.xml @@ -8,11 +8,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml jdisc_jetty - 7-SNAPSHOT + 8-SNAPSHOT jar diff --git a/jrt/pom.xml b/jrt/pom.xml index fea45602e58..c4fb87d24c4 100644 --- a/jrt/pom.xml +++ b/jrt/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml jrt container-plugin - 7-SNAPSHOT + 8-SNAPSHOT jrt diff --git a/linguistics-components/pom.xml b/linguistics-components/pom.xml index aa68f6590cb..eae50c778b5 100644 --- a/linguistics-components/pom.xml +++ b/linguistics-components/pom.xml @@ -7,12 +7,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml linguistics-components container-plugin - 7-SNAPSHOT + 8-SNAPSHOT com.google.protobuf diff --git a/linguistics/pom.xml b/linguistics/pom.xml index d0314622fcf..763dff1d653 100644 --- a/linguistics/pom.xml +++ b/linguistics/pom.xml @@ -7,12 +7,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml linguistics container-plugin - 7-SNAPSHOT + 8-SNAPSHOT junit diff --git a/logd/pom.xml b/logd/pom.xml index 2baf77e5aa3..4eae0afc77b 100644 --- a/logd/pom.xml +++ b/logd/pom.xml @@ -7,11 +7,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml logd - 7-SNAPSHOT + 8-SNAPSHOT jar ${project.artifactId} diff --git a/logserver/pom.xml b/logserver/pom.xml index 2d5eecd01ce..61b777ad86b 100644 --- a/logserver/pom.xml +++ b/logserver/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml logserver jar - 7-SNAPSHOT + 8-SNAPSHOT logserver Log server. diff --git a/maven-plugins/pom.xml b/maven-plugins/pom.xml index 806015c3100..6f8b44540e2 100644 --- a/maven-plugins/pom.xml +++ b/maven-plugins/pom.xml @@ -5,13 +5,13 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml com.yahoo.vespa maven-plugins pom - 7-SNAPSHOT + 8-SNAPSHOT Parent artifact for Vespa maven plugins. http://yahoo.github.io/vespa diff --git a/messagebus/pom.xml b/messagebus/pom.xml index d26e9b32909..512c001e3ff 100644 --- a/messagebus/pom.xml +++ b/messagebus/pom.xml @@ -7,11 +7,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml messagebus - 7-SNAPSHOT + 8-SNAPSHOT jar diff --git a/metrics-proxy/pom.xml b/metrics-proxy/pom.xml index b68b329b603..bbb1c14dfe7 100644 --- a/metrics-proxy/pom.xml +++ b/metrics-proxy/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml metrics-proxy container-plugin - 7-SNAPSHOT + 8-SNAPSHOT diff --git a/metrics/pom.xml b/metrics/pom.xml index b0482e26697..2cf5ccc57d1 100644 --- a/metrics/pom.xml +++ b/metrics/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml metrics jar - 7-SNAPSHOT + 8-SNAPSHOT metrics diff --git a/model-evaluation/pom.xml b/model-evaluation/pom.xml index 4da293a1aab..9188ff9af80 100644 --- a/model-evaluation/pom.xml +++ b/model-evaluation/pom.xml @@ -8,11 +8,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml model-evaluation - 7-SNAPSHOT + 8-SNAPSHOT container-plugin diff --git a/model-integration/pom.xml b/model-integration/pom.xml index d064a3ff709..7d3ab3f7a5f 100644 --- a/model-integration/pom.xml +++ b/model-integration/pom.xml @@ -8,11 +8,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml model-integration - 7-SNAPSHOT + 8-SNAPSHOT container-plugin diff --git a/node-admin/pom.xml b/node-admin/pom.xml index ff1e159de0d..ae7e6ac2bce 100644 --- a/node-admin/pom.xml +++ b/node-admin/pom.xml @@ -8,12 +8,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml node-admin - 7-SNAPSHOT + 8-SNAPSHOT container-plugin ${project.artifactId} diff --git a/node-repository/pom.xml b/node-repository/pom.xml index 60aa0a83107..52be67024d0 100644 --- a/node-repository/pom.xml +++ b/node-repository/pom.xml @@ -8,11 +8,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml node-repository - 7-SNAPSHOT + 8-SNAPSHOT container-plugin Keeps track of node assignment in a multi-application setup. diff --git a/orchestrator-restapi/pom.xml b/orchestrator-restapi/pom.xml index da40a1a50a1..156e9367760 100644 --- a/orchestrator-restapi/pom.xml +++ b/orchestrator-restapi/pom.xml @@ -8,11 +8,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml orchestrator-restapi - 7-SNAPSHOT + 8-SNAPSHOT container-plugin ${project.artifactId} diff --git a/orchestrator/pom.xml b/orchestrator/pom.xml index 3d9c45c9ff6..3f8d2bb83db 100644 --- a/orchestrator/pom.xml +++ b/orchestrator/pom.xml @@ -8,11 +8,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml orchestrator - 7-SNAPSHOT + 8-SNAPSHOT container-plugin ${project.artifactId} diff --git a/parent/pom.xml b/parent/pom.xml index 976a74ec152..9709c55d8c6 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -4,7 +4,7 @@ 4.0.0 parent pom - 7-SNAPSHOT + 8-SNAPSHOT parent Parent artifact for all Vespa maven projects. https://github.com/vespa-engine @@ -12,7 +12,7 @@ com.yahoo.vespa container-dependency-versions - 7-SNAPSHOT + 8-SNAPSHOT ../container-dependency-versions/pom.xml diff --git a/pom.xml b/pom.xml index 7900cdac08e..3a41ee3b1ec 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.yahoo.vespa vespa pom - 7-SNAPSHOT + 8-SNAPSHOT Aggregator pom for vespa. https://github.com/vespa-engine diff --git a/predicate-search-core/pom.xml b/predicate-search-core/pom.xml index 733501122bf..4951b3d40f1 100644 --- a/predicate-search-core/pom.xml +++ b/predicate-search-core/pom.xml @@ -6,11 +6,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml predicate-search-core - 7-SNAPSHOT + 8-SNAPSHOT jar ${project.artifactId} diff --git a/predicate-search/pom.xml b/predicate-search/pom.xml index 83efe9d9754..75c9350707c 100644 --- a/predicate-search/pom.xml +++ b/predicate-search/pom.xml @@ -6,11 +6,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml predicate-search - 7-SNAPSHOT + 8-SNAPSHOT jar ${project.artifactId} diff --git a/provided-dependencies/pom.xml b/provided-dependencies/pom.xml index 562db6d4f1f..da7cc007053 100755 --- a/provided-dependencies/pom.xml +++ b/provided-dependencies/pom.xml @@ -8,12 +8,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml provided-dependencies jar - 7-SNAPSHOT + 8-SNAPSHOT Dependencies that are installed and should not be included in artifacts with dependencies. diff --git a/routing-generator/pom.xml b/routing-generator/pom.xml index 09a5b206a08..ee5e511c045 100644 --- a/routing-generator/pom.xml +++ b/routing-generator/pom.xml @@ -6,14 +6,14 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml com.yahoo.vespa routing-generator container-plugin - 7-SNAPSHOT + 8-SNAPSHOT diff --git a/searchcore/pom.xml b/searchcore/pom.xml index 27b0e55c781..46b576921cf 100644 --- a/searchcore/pom.xml +++ b/searchcore/pom.xml @@ -8,12 +8,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml searchcore jar - 7-SNAPSHOT + 8-SNAPSHOT ${project.artifactId} diff --git a/searchlib/pom.xml b/searchlib/pom.xml index 69bc88b18f3..e1e61c954b9 100644 --- a/searchlib/pom.xml +++ b/searchlib/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml searchlib container-plugin - 7-SNAPSHOT + 8-SNAPSHOT searchlib Search library functions. diff --git a/searchsummary/pom.xml b/searchsummary/pom.xml index 2cfe3ef632f..d7501d19618 100644 --- a/searchsummary/pom.xml +++ b/searchsummary/pom.xml @@ -7,11 +7,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml searchsummary - 7-SNAPSHOT + 8-SNAPSHOT jar ${project.artifactId} diff --git a/security-tools/pom.xml b/security-tools/pom.xml index 424b5002d1d..7f248c185a2 100644 --- a/security-tools/pom.xml +++ b/security-tools/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml security-tools jar - 7-SNAPSHOT + 8-SNAPSHOT diff --git a/security-utils/pom.xml b/security-utils/pom.xml index ac856dff6c3..d4b4bc8d0f6 100644 --- a/security-utils/pom.xml +++ b/security-utils/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml security-utils bundle - 7-SNAPSHOT + 8-SNAPSHOT diff --git a/service-monitor/pom.xml b/service-monitor/pom.xml index 067ea451e35..6a46838a0ce 100644 --- a/service-monitor/pom.xml +++ b/service-monitor/pom.xml @@ -6,12 +6,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml service-monitor container-plugin - 7-SNAPSHOT + 8-SNAPSHOT ${project.artifactId} Service monitor component for hosted vespa. diff --git a/socket_test/pom.xml b/socket_test/pom.xml index 8e8797564fe..f68b04d01c8 100644 --- a/socket_test/pom.xml +++ b/socket_test/pom.xml @@ -7,11 +7,11 @@ 4.0.0 com.yahoo.vespa socket_test - 7-SNAPSHOT + 8-SNAPSHOT com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml jar diff --git a/standalone-container/pom.xml b/standalone-container/pom.xml index ffdfaf469a2..86cad2ad012 100644 --- a/standalone-container/pom.xml +++ b/standalone-container/pom.xml @@ -6,11 +6,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml standalone-container - 7-SNAPSHOT + 8-SNAPSHOT container-plugin diff --git a/storage/pom.xml b/storage/pom.xml index 74854da2f3f..3d057b7b928 100644 --- a/storage/pom.xml +++ b/storage/pom.xml @@ -7,11 +7,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml storage - 7-SNAPSHOT + 8-SNAPSHOT jar ${project.artifactId} diff --git a/streamingvisitors/pom.xml b/streamingvisitors/pom.xml index 2cc777be593..dfc5e7a0b10 100644 --- a/streamingvisitors/pom.xml +++ b/streamingvisitors/pom.xml @@ -7,11 +7,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml vsm - 7-SNAPSHOT + 8-SNAPSHOT jar ${project.artifactId} diff --git a/tenant-base/pom.xml b/tenant-base/pom.xml index 3a15b9be142..1d0d8b6f426 100644 --- a/tenant-base/pom.xml +++ b/tenant-base/pom.xml @@ -7,7 +7,7 @@ com.yahoo.vespa tenant-base - 7-SNAPSHOT + 8-SNAPSHOT Hosted Vespa tenant base Parent POM for all hosted Vespa applications. https://github.com/vespa-engine diff --git a/tenant-cd-api/pom.xml b/tenant-cd-api/pom.xml index a43c7f96a47..f8411cc74d1 100644 --- a/tenant-cd-api/pom.xml +++ b/tenant-cd-api/pom.xml @@ -15,7 +15,7 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent diff --git a/tenant-cd-commons/pom.xml b/tenant-cd-commons/pom.xml index 0ada43bca0b..92347a96f31 100644 --- a/tenant-cd-commons/pom.xml +++ b/tenant-cd-commons/pom.xml @@ -12,7 +12,7 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent diff --git a/testutil/pom.xml b/testutil/pom.xml index 9df445e8d9f..5c6aa1881f7 100644 --- a/testutil/pom.xml +++ b/testutil/pom.xml @@ -6,12 +6,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml testutil jar - 7-SNAPSHOT + 8-SNAPSHOT ${project.artifactId} Library of useful Hamcrest matchers. diff --git a/vdslib/pom.xml b/vdslib/pom.xml index 0a6eae7ec3e..b4825c63ae9 100644 --- a/vdslib/pom.xml +++ b/vdslib/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml vdslib container-plugin - 7-SNAPSHOT + 8-SNAPSHOT vdslib diff --git a/vespa-3party-bundles/pom.xml b/vespa-3party-bundles/pom.xml index efa4edf89b4..b1ed6457c94 100644 --- a/vespa-3party-bundles/pom.xml +++ b/vespa-3party-bundles/pom.xml @@ -8,11 +8,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml vespa-3party-bundles - 7-SNAPSHOT + 8-SNAPSHOT pom diff --git a/vespa-application-maven-plugin/pom.xml b/vespa-application-maven-plugin/pom.xml index 99248fb0907..d2d960f6112 100644 --- a/vespa-application-maven-plugin/pom.xml +++ b/vespa-application-maven-plugin/pom.xml @@ -6,11 +6,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml vespa-application-maven-plugin - 7-SNAPSHOT + 8-SNAPSHOT maven-plugin Maven Plugin for assembling a vespa application package diff --git a/vespa-athenz/pom.xml b/vespa-athenz/pom.xml index 5a7cb97205e..580910799c1 100644 --- a/vespa-athenz/pom.xml +++ b/vespa-athenz/pom.xml @@ -7,12 +7,12 @@ 4.0.0 vespa-athenz container-plugin - 7-SNAPSHOT + 8-SNAPSHOT com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml diff --git a/vespa-documentgen-plugin/pom.xml b/vespa-documentgen-plugin/pom.xml index f3d94fa809d..f3357d64e27 100644 --- a/vespa-documentgen-plugin/pom.xml +++ b/vespa-documentgen-plugin/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml vespa-documentgen-plugin maven-plugin - 7-SNAPSHOT + 8-SNAPSHOT Vespa DocumentGen Plugin diff --git a/vespa-feed-client-api/pom.xml b/vespa-feed-client-api/pom.xml index 64b71ae6fb1..5509c339eee 100644 --- a/vespa-feed-client-api/pom.xml +++ b/vespa-feed-client-api/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml vespa-feed-client-api jar - 7-SNAPSHOT + 8-SNAPSHOT diff --git a/vespa-feed-client-cli/pom.xml b/vespa-feed-client-cli/pom.xml index 04f9e308cfa..46679906fc4 100644 --- a/vespa-feed-client-cli/pom.xml +++ b/vespa-feed-client-cli/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml vespa-feed-client-cli jar - 7-SNAPSHOT + 8-SNAPSHOT diff --git a/vespa-feed-client/pom.xml b/vespa-feed-client/pom.xml index a7c4ab0a13c..536637bdce2 100644 --- a/vespa-feed-client/pom.xml +++ b/vespa-feed-client/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml vespa-feed-client jar - 7-SNAPSHOT + 8-SNAPSHOT diff --git a/vespa-hadoop/pom.xml b/vespa-hadoop/pom.xml index 1dde2d58610..8060a2d67a1 100644 --- a/vespa-hadoop/pom.xml +++ b/vespa-hadoop/pom.xml @@ -7,11 +7,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml vespa-hadoop - 7-SNAPSHOT + 8-SNAPSHOT ${project.artifactId} Integration tools between Vespa and Hadoop diff --git a/vespa-maven-plugin/pom.xml b/vespa-maven-plugin/pom.xml index 5984c6a1324..8f46e5ff35f 100644 --- a/vespa-maven-plugin/pom.xml +++ b/vespa-maven-plugin/pom.xml @@ -7,7 +7,7 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml vespa-maven-plugin diff --git a/vespa-osgi-testrunner/pom.xml b/vespa-osgi-testrunner/pom.xml index 03de830e658..c79a8ca7de7 100644 --- a/vespa-osgi-testrunner/pom.xml +++ b/vespa-osgi-testrunner/pom.xml @@ -6,7 +6,7 @@ parent com.yahoo.vespa - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml 4.0.0 diff --git a/vespa-testrunner-components/pom.xml b/vespa-testrunner-components/pom.xml index 4b4b0cfa92c..332a0eaa82d 100644 --- a/vespa-testrunner-components/pom.xml +++ b/vespa-testrunner-components/pom.xml @@ -11,7 +11,7 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml diff --git a/vespa_feed_perf/pom.xml b/vespa_feed_perf/pom.xml index 31fae41a357..a570cb69c36 100644 --- a/vespa_feed_perf/pom.xml +++ b/vespa_feed_perf/pom.xml @@ -12,11 +12,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml vespa_feed_perf - 7-SNAPSHOT + 8-SNAPSHOT jar ${project.artifactId} diff --git a/vespaclient-container-plugin/pom.xml b/vespaclient-container-plugin/pom.xml index d7b36e39c94..5c3a04beeb8 100644 --- a/vespaclient-container-plugin/pom.xml +++ b/vespaclient-container-plugin/pom.xml @@ -8,11 +8,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml vespaclient-container-plugin - 7-SNAPSHOT + 8-SNAPSHOT container-plugin diff --git a/vespaclient-core/pom.xml b/vespaclient-core/pom.xml index 8f2865a22cf..5afc2b57868 100644 --- a/vespaclient-core/pom.xml +++ b/vespaclient-core/pom.xml @@ -6,11 +6,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml vespaclient-core - 7-SNAPSHOT + 8-SNAPSHOT junit diff --git a/vespaclient-java/pom.xml b/vespaclient-java/pom.xml index 2d80d441438..8323890ca2b 100644 --- a/vespaclient-java/pom.xml +++ b/vespaclient-java/pom.xml @@ -6,11 +6,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml vespaclient-java - 7-SNAPSHOT + 8-SNAPSHOT junit diff --git a/vespajlib/pom.xml b/vespajlib/pom.xml index ed6ae3678f4..c4d100aa10c 100644 --- a/vespajlib/pom.xml +++ b/vespajlib/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml vespajlib container-plugin - 7-SNAPSHOT + 8-SNAPSHOT Library for use in Java components of Vespa. Shared code which do not fit anywhere else. diff --git a/vespalog/pom.xml b/vespalog/pom.xml index 4ced763f13f..c18a319adac 100644 --- a/vespalog/pom.xml +++ b/vespalog/pom.xml @@ -5,11 +5,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml vespalog - 7-SNAPSHOT + 8-SNAPSHOT Vespa Log container-plugin diff --git a/yolean/pom.xml b/yolean/pom.xml index 68313e3e1a8..a767e6dfcdd 100644 --- a/yolean/pom.xml +++ b/yolean/pom.xml @@ -5,11 +5,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml yolean - 7-SNAPSHOT + 8-SNAPSHOT container-plugin ${project.artifactId} diff --git a/zkfacade/pom.xml b/zkfacade/pom.xml index a25f4a01e55..0360b9ce91f 100644 --- a/zkfacade/pom.xml +++ b/zkfacade/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml zkfacade container-plugin - 7-SNAPSHOT + 8-SNAPSHOT junit diff --git a/zookeeper-client-common/pom.xml b/zookeeper-client-common/pom.xml index 7e23e0cb1c8..5eafd040e79 100644 --- a/zookeeper-client-common/pom.xml +++ b/zookeeper-client-common/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml zookeeper-client-common jar - 7-SNAPSHOT + 8-SNAPSHOT diff --git a/zookeeper-command-line-client/pom.xml b/zookeeper-command-line-client/pom.xml index 5dfc5ab22be..a0c268e0f95 100644 --- a/zookeeper-command-line-client/pom.xml +++ b/zookeeper-command-line-client/pom.xml @@ -5,11 +5,11 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml zookeeper-command-line-client - 7-SNAPSHOT + 8-SNAPSHOT org.apache.zookeeper diff --git a/zookeeper-server/pom.xml b/zookeeper-server/pom.xml index 06bb3a131af..b9cc4478bc2 100644 --- a/zookeeper-server/pom.xml +++ b/zookeeper-server/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa parent - 7-SNAPSHOT + 8-SNAPSHOT ../parent/pom.xml zookeeper-server-parent pom - 7-SNAPSHOT + 8-SNAPSHOT zookeeper-server-common zookeeper-server diff --git a/zookeeper-server/zookeeper-server-3.7.1/pom.xml b/zookeeper-server/zookeeper-server-3.7.1/pom.xml index ed677ef8601..ea0e61075f1 100644 --- a/zookeeper-server/zookeeper-server-3.7.1/pom.xml +++ b/zookeeper-server/zookeeper-server-3.7.1/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa zookeeper-server-parent - 7-SNAPSHOT + 8-SNAPSHOT ../pom.xml zookeeper-server-3.7.1 container-plugin - 7-SNAPSHOT + 8-SNAPSHOT 3.7.1 diff --git a/zookeeper-server/zookeeper-server-common/pom.xml b/zookeeper-server/zookeeper-server-common/pom.xml index 82494e7bd14..db377fa8e8f 100644 --- a/zookeeper-server/zookeeper-server-common/pom.xml +++ b/zookeeper-server/zookeeper-server-common/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa zookeeper-server-parent - 7-SNAPSHOT + 8-SNAPSHOT ../pom.xml zookeeper-server-common container-plugin - 7-SNAPSHOT + 8-SNAPSHOT junit diff --git a/zookeeper-server/zookeeper-server/pom.xml b/zookeeper-server/zookeeper-server/pom.xml index 01cd666d5ab..72cb21b2362 100644 --- a/zookeeper-server/zookeeper-server/pom.xml +++ b/zookeeper-server/zookeeper-server/pom.xml @@ -5,12 +5,12 @@ com.yahoo.vespa zookeeper-server-parent - 7-SNAPSHOT + 8-SNAPSHOT ../pom.xml zookeeper-server-3.7.0 container-plugin - 7-SNAPSHOT + 8-SNAPSHOT 3.7.0 -- cgit v1.2.3