diff options
9 files changed, 0 insertions, 23 deletions
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 @@ <include>javax.servlet:javax.servlet-api:[${javax.servlet-api.version}]:jar:provided</include> <include>javax.ws.rs:javax.ws.rs-api:[${javax.ws.rs-api.version}]:jar:provided</include> <include>javax.xml.bind:jaxb-api:[${jaxb.version}]:jar:provided</include> - <include>net.jcip:jcip-annotations:[1.0]:jar:provided</include> <include>org.lz4:lz4-java:[${org.lz4.version}]:jar:provided</include> <include>org.apache.felix:org.apache.felix.framework:[${felix.version}]:jar:provided</include> <include>org.apache.felix:org.apache.felix.log:[${felix.log.version}]:jar:provided</include> 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<Pair<String, String>, 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 @@ <include>javax.servlet:javax.servlet-api:[${javax.servlet-api.version}]:jar:provided</include> <include>javax.ws.rs:javax.ws.rs-api:[${javax.ws.rs-api.version}]:jar:provided</include> <include>javax.xml.bind:jaxb-api:[${jaxb.version}]:jar:provided</include> - <include>net.jcip:jcip-annotations:[1.0]:jar:provided</include> <include>org.lz4:lz4-java:[${org.lz4.version}]:jar:provided</include> <include>org.apache.felix:org.apache.felix.framework:[${felix.version}]:jar:provided</include> <include>org.apache.felix:org.apache.felix.log:[${felix.log.version}]:jar:provided</include> 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 @@ -130,11 +130,6 @@ <!-- jaxb end --> <dependency> - <groupId>net.jcip</groupId> - <artifactId>jcip-annotations</artifactId> - <version>1.0</version> - </dependency> - <dependency> <groupId>org.lz4</groupId> <artifactId>lz4-java</artifactId> <version>${org.lz4.version}</version> 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 @@ -103,10 +103,6 @@ <artifactId>icu4j</artifactId> </dependency> <dependency> - <groupId>net.jcip</groupId> - <artifactId>jcip-annotations</artifactId> - </dependency> - <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> <scope>provided</scope> 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<ChainedComponentModel> searcherModels = |