diff options
25 files changed, 246 insertions, 79 deletions
diff --git a/Changelog.md b/Changelog.md index f0cae0f0..2d9c9fc2 100644 --- a/Changelog.md +++ b/Changelog.md @@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [1.10.0] - 11/02/2022 + - [DCAEGEN2-3038](https://jira.onap.org/browse/DCAEGEN2-3083) - Add scram-sha support for kafka conect + ## [1.9.1] - 25/08/2021 - [DCAEGEN2-2718](https://jira.onap.org/browse/DCAEGEN2-2718) - Update DCAE SDK version from 1.8.2 to 1.8.7 diff --git a/build/hv-collector-analysis/pom.xml b/build/hv-collector-analysis/pom.xml index 425359a5..1ad11cd0 100644 --- a/build/hv-collector-analysis/pom.xml +++ b/build/hv-collector-analysis/pom.xml @@ -4,6 +4,7 @@ ~ dcaegen2-collectors-veshv ~ ================================================================================ ~ Copyright (C) 2018-2021 NOKIA + ~ Copyright (C) 2022 Nordix Foundation ~ ================================================================================ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. @@ -33,8 +34,8 @@ <parent> <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId> <artifactId>hv-collector-build</artifactId> - <version>1.9.1-SNAPSHOT</version> - <relativePath>..</relativePath> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>hv-collector-analysis</artifactId> diff --git a/build/hv-collector-coverage/pom.xml b/build/hv-collector-coverage/pom.xml index b9c12859..e4ba513d 100644 --- a/build/hv-collector-coverage/pom.xml +++ b/build/hv-collector-coverage/pom.xml @@ -4,6 +4,7 @@ ~ dcaegen2-collectors-veshv ~ ================================================================================ ~ Copyright (C) 2018-2021 NOKIA + ~ Copyright (C) 2022 Nordix Foundation ~ ================================================================================ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. @@ -33,8 +34,8 @@ <parent> <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId> <artifactId>hv-collector-build</artifactId> - <version>1.9.1-SNAPSHOT</version> - <relativePath>..</relativePath> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>hv-collector-coverage</artifactId> @@ -180,4 +181,4 @@ </dependency> </dependencies> -</project>
\ No newline at end of file +</project> diff --git a/build/pom.xml b/build/pom.xml index 252a8e61..469b175f 100644 --- a/build/pom.xml +++ b/build/pom.xml @@ -4,6 +4,7 @@ ~ dcaegen2-collectors-veshv ~ ================================================================================ ~ Copyright (C) 2018-2021 NOKIA + ~ Copyright (C) 2022 Nordix Foundation ~ ================================================================================ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. @@ -32,8 +33,8 @@ <parent> <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId> <artifactId>ves-hv-collector</artifactId> - <version>1.9.1-SNAPSHOT</version> - <relativePath>..</relativePath> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>hv-collector-build</artifactId> @@ -4,6 +4,7 @@ ~ dcaegen2-collectors-veshv ~ ================================================================================ ~ Copyright (C) 2018-2021 NOKIA + ~ Copyright (C) 2022 Nordix Foundation ~ ================================================================================ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. @@ -39,7 +40,7 @@ <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId> <artifactId>ves-hv-collector</artifactId> - <version>1.9.1-SNAPSHOT</version> + <version>${revision}</version> <name>dcaegen2-collectors-veshv</name> <description>VES HighVolume Collector</description> <packaging>pom</packaging> @@ -50,6 +51,7 @@ </modules> <properties> + <revision>1.10.0-SNAPSHOT</revision> <maven-resources-plugin.version>3.2.0</maven-resources-plugin.version> <asm.version>9.1</asm.version> <commons-lang3.version>3.12.0</commons-lang3.version> diff --git a/sources/hv-collector-commandline/pom.xml b/sources/hv-collector-commandline/pom.xml index 3c60cff7..55822211 100644 --- a/sources/hv-collector-commandline/pom.xml +++ b/sources/hv-collector-commandline/pom.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ ============LICENSE_START======================================================= + ~ dcaegen2-collectors-veshv + ~ ================================================================================ + ~ Copyright (C) 2019 NOKIA + ~ Copyright (C) 2022 Nordix Foundation + ~ ================================================================================ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + ~ ============LICENSE_END========================================================= + --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> @@ -7,7 +27,8 @@ <parent> <artifactId>hv-collector-sources</artifactId> <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId> - <version>1.9.1-SNAPSHOT</version> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>hv-collector-commandline</artifactId> @@ -52,4 +73,4 @@ <scope>test</scope> </dependency> </dependencies> -</project>
\ No newline at end of file +</project> diff --git a/sources/hv-collector-configuration/pom.xml b/sources/hv-collector-configuration/pom.xml index 87d6eddf..5d331e25 100644 --- a/sources/hv-collector-configuration/pom.xml +++ b/sources/hv-collector-configuration/pom.xml @@ -4,6 +4,7 @@ ~ dcaegen2-collectors-veshv ~ ================================================================================ ~ Copyright (C) 2019-2021 NOKIA + ~ Copyright (C) 2022 Nordix Foundation ~ ================================================================================ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. @@ -33,7 +34,8 @@ <parent> <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId> <artifactId>hv-collector-sources</artifactId> - <version>1.9.1-SNAPSHOT</version> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>hv-collector-configuration</artifactId> @@ -98,4 +100,4 @@ <artifactId>arrow-extras-data</artifactId> </dependency> </dependencies> -</project>
\ No newline at end of file +</project> diff --git a/sources/hv-collector-core/pom.xml b/sources/hv-collector-core/pom.xml index 2895c416..dc190b9c 100644 --- a/sources/hv-collector-core/pom.xml +++ b/sources/hv-collector-core/pom.xml @@ -4,6 +4,7 @@ ~ dcaegen2-collectors-veshv ~ ================================================================================ ~ Copyright (C) 2018-2021 NOKIA + ~ Copyright (C) 2022 Nordix Foundation. ~ ================================================================================ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. @@ -33,8 +34,8 @@ <parent> <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId> <artifactId>hv-collector-sources</artifactId> - <version>1.9.1-SNAPSHOT</version> - <relativePath>..</relativePath> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>hv-collector-core</artifactId> @@ -105,6 +106,12 @@ <version>${project.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>io.kotest</groupId> + <artifactId>kotest-runner-junit5-jvm</artifactId> + <version>4.2.0</version> + <scope>test</scope> + </dependency> </dependencies> </project> diff --git a/sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/kafka/KafkaSenderOptionsFactory.kt b/sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/kafka/KafkaSenderOptionsFactory.kt index 1c4acf64..2fcc99e5 100644 --- a/sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/kafka/KafkaSenderOptionsFactory.kt +++ b/sources/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/kafka/KafkaSenderOptionsFactory.kt @@ -3,6 +3,7 @@ * dcaegen2-collectors-veshv * ================================================================================ * Copyright (C) 2019 NOKIA + * Copyright (C) 2022 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,13 +25,17 @@ import org.apache.kafka.clients.producer.ProducerConfig import org.apache.kafka.common.config.SaslConfigs import org.apache.kafka.common.security.auth.SecurityProtocol import org.apache.kafka.common.security.plain.internals.PlainSaslServer -import org.jetbrains.annotations.Nullable +import org.apache.kafka.common.security.scram.internals.ScramMechanism import org.onap.dcae.collectors.veshv.domain.VesMessage import org.onap.dcae.collectors.veshv.utils.applyIf import org.onap.dcaegen2.services.sdk.model.streams.AafCredentials import org.onap.dcaegen2.services.sdk.model.streams.dmaap.KafkaSink import org.onap.ves.VesEventOuterClass.CommonEventHeader import reactor.kafka.sender.SenderOptions +import java.lang.Boolean.parseBoolean + + + internal object KafkaSenderOptionsFactory { @@ -40,6 +45,7 @@ internal object KafkaSenderOptionsFactory { private const val LOGIN_MODULE_CLASS = "org.apache.kafka.common.security.plain.PlainLoginModule" private val SASL_PLAINTEXT = (SecurityProtocol.SASL_PLAINTEXT as Enum<SecurityProtocol>).name + private val USE_SCRAM = parseBoolean(System.getenv().getOrDefault("USE_SCRAM", "false")) fun createSenderOptions(kafkaSink: KafkaSink): SenderOptions<CommonEventHeader, VesMessage> = SenderOptions.create<CommonEventHeader, VesMessage>() @@ -52,14 +58,19 @@ internal object KafkaSenderOptionsFactory { .producerProperty(ProducerConfig.RETRIES_CONFIG, 1) .producerProperty(ProducerConfig.ACKS_CONFIG, "1") .stopOnError(false) - .applyIf(kafkaSink.aafCredentials() != null) { - producerProperty(CommonClientConfigs.SECURITY_PROTOCOL_CONFIG, SASL_PLAINTEXT) - .producerProperty(SaslConfigs.SASL_MECHANISM, PlainSaslServer.PLAIN_MECHANISM) - .producerProperty(SaslConfigs.SASL_JAAS_CONFIG, jaasConfig(kafkaSink.aafCredentials()!!)) - } + .applyIf(kafkaSink.aafCredentials() != null) { + producerProperty(CommonClientConfigs.SECURITY_PROTOCOL_CONFIG, SASL_PLAINTEXT) + .producerProperty(SaslConfigs.SASL_MECHANISM, PlainSaslServer.PLAIN_MECHANISM) + .producerProperty(SaslConfigs.SASL_JAAS_CONFIG, jaasConfig(kafkaSink.aafCredentials()!!)) + } + .applyIf(USE_SCRAM) { + producerProperty(CommonClientConfigs.SECURITY_PROTOCOL_CONFIG, SASL_PLAINTEXT) + .producerProperty(SaslConfigs.SASL_MECHANISM, ScramMechanism.SCRAM_SHA_512.mechanismName()) + .producerProperty(SaslConfigs.SASL_JAAS_CONFIG, System.getenv("JAAS_CONFIG")) + } private fun jaasConfig(aafCredentials: AafCredentials) = - """$LOGIN_MODULE_CLASS required username="${aafCredentials.username().jaasEscape()}" password="${aafCredentials.password().jaasEscape()}";""" + """$LOGIN_MODULE_CLASS required username="${aafCredentials.username().jaasEscape()}" password="${aafCredentials.password().jaasEscape()}";""" private fun String?.jaasEscape() = this?.replace("\"", "\\\"") diff --git a/sources/hv-collector-core/src/test/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/kafka/KafkaSenderOptionsFactoryTest.kt b/sources/hv-collector-core/src/test/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/kafka/KafkaSenderOptionsFactoryTest.kt index fec17856..37d67838 100644 --- a/sources/hv-collector-core/src/test/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/kafka/KafkaSenderOptionsFactoryTest.kt +++ b/sources/hv-collector-core/src/test/kotlin/org/onap/dcae/collectors/veshv/impl/adapters/kafka/KafkaSenderOptionsFactoryTest.kt @@ -3,6 +3,7 @@ * dcaegen2-collectors-veshv * ================================================================================ * Copyright (C) 2019 NOKIA + * Copyright (C) 2022 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,29 +20,24 @@ */ package org.onap.dcae.collectors.veshv.impl.adapters.kafka +import io.kotest.extensions.system.OverrideMode import org.apache.kafka.clients.CommonClientConfigs import org.apache.kafka.clients.producer.ProducerConfig -import org.apache.kafka.common.KafkaException import org.apache.kafka.common.config.SaslConfigs import org.assertj.core.api.Assertions.assertThat import org.jetbrains.spek.api.Spek -import org.jetbrains.spek.api.dsl.TestContainer -import org.jetbrains.spek.api.dsl.describe -import org.jetbrains.spek.api.dsl.given -import org.jetbrains.spek.api.dsl.it -import org.jetbrains.spek.api.dsl.on import org.onap.dcae.collectors.veshv.domain.VesMessage import org.onap.dcaegen2.services.sdk.model.streams.ImmutableAafCredentials import org.onap.dcaegen2.services.sdk.model.streams.dmaap.ImmutableKafkaSink -import org.onap.dcaegen2.services.sdk.model.streams.dmaap.KafkaSink import org.onap.ves.VesEventOuterClass import reactor.kafka.sender.SenderOptions -import java.io.IOException -import java.io.StreamTokenizer -import java.io.StringReader -import java.util.* -import javax.security.auth.login.AppConfigurationEntry -import javax.security.auth.login.Configuration +import io.kotest.extensions.system.withEnvironment +import io.kotest.matchers.shouldBe +import org.jetbrains.spek.api.dsl.describe +import org.jetbrains.spek.api.dsl.given +import org.jetbrains.spek.api.dsl.on +import org.jetbrains.spek.api.dsl.TestContainer +import org.jetbrains.spek.api.dsl.it /** * @author [Piotr Jaszczyk](mailto:piotr.jaszczyk@nokia.com) @@ -55,7 +51,6 @@ internal class KafkaSenderOptionsFactoryTest : Spek({ .bootstrapServers("dmaap1,dmaap2") .topicName("PERF_DATA") .build() - on("calling the CUT method") { val result = KafkaSenderOptionsFactory.createSenderOptions(sink) val itShouldHavePropertySet = propertyChecker(result) @@ -68,22 +63,54 @@ internal class KafkaSenderOptionsFactoryTest : Spek({ itShouldHavePropertySet(ProducerConfig.MAX_IN_FLIGHT_REQUESTS_PER_CONNECTION, 1) itShouldHavePropertySet(ProducerConfig.RETRIES_CONFIG, 1) itShouldHavePropertySet(ProducerConfig.ACKS_CONFIG, "1") - itShouldHavePropertySet(CommonClientConfigs.SECURITY_PROTOCOL_CONFIG, null) itShouldHavePropertySet(SaslConfigs.SASL_MECHANISM, null) itShouldHavePropertySet(SaslConfigs.SASL_JAAS_CONFIG, null) } } - given("authenticated KafkaSink") { + given("authenticated AAF KafkaSink") { val aafCredentials = ImmutableAafCredentials.builder() - .username("user \" with quote") - .password("password \" with quote") - .build() + .username("user \" with quote") + .password("password \" with quote") + .build() + + val sink = ImmutableKafkaSink.builder() + .bootstrapServers("dmaap-service") + .topicName("OTHER_TOPIC") + .aafCredentials(aafCredentials) + .build() + + on("calling the CUT method") { + val result = KafkaSenderOptionsFactory.createSenderOptions(sink) + val itShouldHavePropertySet = propertyChecker(result) + + itShouldHavePropertySet(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, sink.bootstrapServers()) + itShouldHavePropertySet(ProducerConfig.MAX_REQUEST_SIZE_CONFIG, 1_258_291) + itShouldHavePropertySet(ProducerConfig.BUFFER_MEMORY_CONFIG, 33_554_432) + itShouldHavePropertySet(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, ProtobufSerializer::class.java) + itShouldHavePropertySet(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, VesMessageSerializer::class.java) + itShouldHavePropertySet(ProducerConfig.MAX_IN_FLIGHT_REQUESTS_PER_CONNECTION, 1) + itShouldHavePropertySet(ProducerConfig.RETRIES_CONFIG, 1) + itShouldHavePropertySet(ProducerConfig.ACKS_CONFIG, "1") + itShouldHavePropertySet(CommonClientConfigs.SECURITY_PROTOCOL_CONFIG, "SASL_PLAINTEXT") + itShouldHavePropertySet(SaslConfigs.SASL_MECHANISM, "PLAIN") + itShouldHavePropertySet(SaslConfigs.SASL_JAAS_CONFIG, + "org.apache.kafka.common.security.plain.PlainLoginModule required " + + """username="user \" with quote" password="password \" with quote";""") + } + + } + given("authenticated SCRAM KafkaSink") { + withEnvironment("USE_SCRAM", "true", OverrideMode.SetOrOverride) { + System.getenv("USE_SCRAM") shouldBe "true" + } + withEnvironment("JAAS_CONFIG", "org.apache.kafka.common.security.scram.ScramLoginModule required username=\"onap-dcae-hv-ves-kafka-user\" password=\"oJumEmQAH6kN\";", OverrideMode.SetOrOverride) { + System.getenv("JAAS_CONFIG") shouldBe "org.apache.kafka.common.security.scram.ScramLoginModule required username=\"onap-dcae-hv-ves-kafka-user\" password=\"oJumEmQAH6kN\";" + } val sink = ImmutableKafkaSink.builder() .bootstrapServers("dmaap-service") .topicName("OTHER_TOPIC") - .aafCredentials(aafCredentials) .build() on("calling the CUT method") { @@ -98,12 +125,10 @@ internal class KafkaSenderOptionsFactoryTest : Spek({ itShouldHavePropertySet(ProducerConfig.MAX_IN_FLIGHT_REQUESTS_PER_CONNECTION, 1) itShouldHavePropertySet(ProducerConfig.RETRIES_CONFIG, 1) itShouldHavePropertySet(ProducerConfig.ACKS_CONFIG, "1") - itShouldHavePropertySet(CommonClientConfigs.SECURITY_PROTOCOL_CONFIG, "SASL_PLAINTEXT") - itShouldHavePropertySet(SaslConfigs.SASL_MECHANISM, "PLAIN") + itShouldHavePropertySet(SaslConfigs.SASL_MECHANISM, "SCRAM-SHA-512") itShouldHavePropertySet(SaslConfigs.SASL_JAAS_CONFIG, - "org.apache.kafka.common.security.plain.PlainLoginModule required " + - """username="user \" with quote" password="password \" with quote";""") + "org.apache.kafka.common.security.scram.ScramLoginModule required username=\"onap-dcae-hv-ves-kafka-user\" password=\"oJumEmQAH6kN\";") } } diff --git a/sources/hv-collector-ct/pom.xml b/sources/hv-collector-ct/pom.xml index bb756be5..2f0e5d4c 100644 --- a/sources/hv-collector-ct/pom.xml +++ b/sources/hv-collector-ct/pom.xml @@ -4,6 +4,7 @@ ~ dcaegen2-collectors-veshv ~ ================================================================================ ~ Copyright (C) 2018-2021 NOKIA + ~ Copyright (C) 2022 Nordix Foundation ~ ================================================================================ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. @@ -33,8 +34,8 @@ <parent> <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId> <artifactId>hv-collector-sources</artifactId> - <version>1.9.1-SNAPSHOT</version> - <relativePath>..</relativePath> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>hv-collector-ct</artifactId> @@ -106,4 +107,4 @@ <scope>test</scope> </dependency> </dependencies> -</project>
\ No newline at end of file +</project> diff --git a/sources/hv-collector-dcae-app-simulator/pom.xml b/sources/hv-collector-dcae-app-simulator/pom.xml index 7f33bc66..35be622e 100644 --- a/sources/hv-collector-dcae-app-simulator/pom.xml +++ b/sources/hv-collector-dcae-app-simulator/pom.xml @@ -4,6 +4,7 @@ ~ dcaegen2-collectors-veshv ~ ================================================================================ ~ Copyright (C) 2018-2021 NOKIA + ~ Copyright (C) 2022 Nordix Foundation ~ ================================================================================ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. @@ -33,8 +34,8 @@ <parent> <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId> <artifactId>hv-collector-sources</artifactId> - <version>1.9.1-SNAPSHOT</version> - <relativePath>..</relativePath> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>hv-collector-dcae-app-simulator</artifactId> @@ -118,4 +119,4 @@ </dependencies> -</project>
\ No newline at end of file +</project> diff --git a/sources/hv-collector-domain/pom.xml b/sources/hv-collector-domain/pom.xml index 34c8da89..893ea8a9 100644 --- a/sources/hv-collector-domain/pom.xml +++ b/sources/hv-collector-domain/pom.xml @@ -4,6 +4,7 @@ ~ dcaegen2-collectors-veshv ~ ================================================================================ ~ Copyright (C) 2018-2021 NOKIA + ~ Copyright (C) 2022 Nordix Foundation ~ ================================================================================ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. @@ -33,7 +34,8 @@ <parent> <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId> <artifactId>hv-collector-sources</artifactId> - <version>1.9.1-SNAPSHOT</version> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>hv-collector-domain</artifactId> diff --git a/sources/hv-collector-health-check/pom.xml b/sources/hv-collector-health-check/pom.xml index bfe8044a..99400339 100644 --- a/sources/hv-collector-health-check/pom.xml +++ b/sources/hv-collector-health-check/pom.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ ============LICENSE_START======================================================= + ~ dcaegen2-collectors-veshv + ~ ================================================================================ + ~ Copyright (C) 2018-2021 NOKIA + ~ Copyright (C) 2022 Nordix Foundation. + ~ ================================================================================ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + ~ ============LICENSE_END========================================================= + --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> @@ -15,7 +35,8 @@ <parent> <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId> <artifactId>hv-collector-sources</artifactId> - <version>1.9.1-SNAPSHOT</version> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>hv-collector-health-check</artifactId> @@ -74,4 +95,4 @@ <scope>test</scope> </dependency> </dependencies> -</project>
\ No newline at end of file +</project> diff --git a/sources/hv-collector-kafka-consumer/pom.xml b/sources/hv-collector-kafka-consumer/pom.xml index d948a017..17339f19 100644 --- a/sources/hv-collector-kafka-consumer/pom.xml +++ b/sources/hv-collector-kafka-consumer/pom.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ ============LICENSE_START======================================================= + ~ dcaegen2-collectors-veshv + ~ ================================================================================ + ~ Copyright (C) 2019 NOKIA + ~ Copyright (C) 2022 Nordix Foundation. + ~ ================================================================================ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + ~ ============LICENSE_END========================================================= + --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> @@ -15,8 +35,8 @@ <parent> <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId> <artifactId>hv-collector-sources</artifactId> - <version>1.9.1-SNAPSHOT</version> - <relativePath>..</relativePath> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> diff --git a/sources/hv-collector-kafka/pom.xml b/sources/hv-collector-kafka/pom.xml index 29c3781d..6f1d6877 100644 --- a/sources/hv-collector-kafka/pom.xml +++ b/sources/hv-collector-kafka/pom.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ ============LICENSE_START======================================================= + ~ dcaegen2-collectors-veshv + ~ ================================================================================ + ~ Copyright (C) 2019 NOKIA + ~ Copyright (C) 2022 Nordix Foundation. + ~ ================================================================================ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + ~ ============LICENSE_END========================================================= + --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> @@ -15,8 +35,8 @@ <parent> <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId> <artifactId>hv-collector-sources</artifactId> - <version>1.9.1-SNAPSHOT</version> - <relativePath>..</relativePath> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> diff --git a/sources/hv-collector-main/pom.xml b/sources/hv-collector-main/pom.xml index e34d9f2e..a72bdcfc 100644 --- a/sources/hv-collector-main/pom.xml +++ b/sources/hv-collector-main/pom.xml @@ -4,6 +4,7 @@ ~ dcaegen2-collectors-veshv ~ ================================================================================ ~ Copyright (C) 2018-2021 NOKIA + ~ Copyright (C) 2022 Nordix Foundation ~ ================================================================================ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. @@ -33,7 +34,8 @@ <parent> <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId> <artifactId>hv-collector-sources</artifactId> - <version>1.9.1-SNAPSHOT</version> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>hv-collector-main</artifactId> diff --git a/sources/hv-collector-server/pom.xml b/sources/hv-collector-server/pom.xml index fbd83676..63a81a5a 100644 --- a/sources/hv-collector-server/pom.xml +++ b/sources/hv-collector-server/pom.xml @@ -4,6 +4,7 @@ ~ dcaegen2-collectors-veshv ~ ================================================================================ ~ Copyright (C) 2019-2021 NOKIA + ~ Copyright (C) 2022 Nordix Foundation ~ ================================================================================ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. @@ -33,8 +34,8 @@ <parent> <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId> <artifactId>hv-collector-sources</artifactId> - <version>1.9.1-SNAPSHOT</version> - <relativePath>..</relativePath> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>hv-collector-server</artifactId> diff --git a/sources/hv-collector-ssl/pom.xml b/sources/hv-collector-ssl/pom.xml index ddf0db72..9a09a03c 100644 --- a/sources/hv-collector-ssl/pom.xml +++ b/sources/hv-collector-ssl/pom.xml @@ -4,6 +4,7 @@ ~ dcaegen2-collectors-veshv ~ ================================================================================ ~ Copyright (C) 2018-2021 NOKIA + ~ Copyright (C) 2022 Nordix Foundation ~ ================================================================================ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. @@ -33,8 +34,8 @@ <parent> <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId> <artifactId>hv-collector-sources</artifactId> - <version>1.9.1-SNAPSHOT</version> - <relativePath>..</relativePath> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>hv-collector-ssl</artifactId> diff --git a/sources/hv-collector-test-utils/pom.xml b/sources/hv-collector-test-utils/pom.xml index 3415304a..a5e670c0 100644 --- a/sources/hv-collector-test-utils/pom.xml +++ b/sources/hv-collector-test-utils/pom.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ ============LICENSE_START======================================================= + ~ dcaegen2-collectors-veshv + ~ ================================================================================ + ~ Copyright (C) 2018-2021 NOKIA + ~ Copyright (C) 2022 Nordix Foundation. + ~ ================================================================================ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + ~ ============LICENSE_END========================================================= + --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> @@ -14,8 +34,8 @@ <parent> <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId> <artifactId>hv-collector-sources</artifactId> - <version>1.9.1-SNAPSHOT</version> - <relativePath>..</relativePath> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>hv-collector-test-utils</artifactId> @@ -92,4 +112,4 @@ <scope>compile</scope> </dependency> </dependencies> -</project>
\ No newline at end of file +</project> diff --git a/sources/hv-collector-utils/pom.xml b/sources/hv-collector-utils/pom.xml index db5eb603..68296650 100644 --- a/sources/hv-collector-utils/pom.xml +++ b/sources/hv-collector-utils/pom.xml @@ -4,6 +4,7 @@ ~ dcaegen2-collectors-veshv ~ ================================================================================ ~ Copyright (C) 2018-2021 NOKIA + ~ Copyright (C) 2022 Nordix Foundation ~ ================================================================================ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. @@ -33,8 +34,8 @@ <parent> <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId> <artifactId>hv-collector-sources</artifactId> - <version>1.9.1-SNAPSHOT</version> - <relativePath>..</relativePath> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>hv-collector-utils</artifactId> @@ -134,4 +135,4 @@ <scope>provided</scope> </dependency> </dependencies> -</project>
\ No newline at end of file +</project> diff --git a/sources/hv-collector-ves-message-generator/pom.xml b/sources/hv-collector-ves-message-generator/pom.xml index 2cf7bf97..ce0d53e2 100644 --- a/sources/hv-collector-ves-message-generator/pom.xml +++ b/sources/hv-collector-ves-message-generator/pom.xml @@ -4,6 +4,7 @@ ~ dcaegen2-collectors-veshv ~ ================================================================================ ~ Copyright (C) 2018-2021 NOKIA + ~ Copyright (C) 2022 Nordix Foundation ~ ================================================================================ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. @@ -33,8 +34,8 @@ <parent> <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId> <artifactId>hv-collector-sources</artifactId> - <version>1.9.1-SNAPSHOT</version> - <relativePath>..</relativePath> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>hv-collector-ves-message-generator</artifactId> @@ -117,4 +118,4 @@ </dependencies> -</project>
\ No newline at end of file +</project> diff --git a/sources/hv-collector-xnf-simulator/pom.xml b/sources/hv-collector-xnf-simulator/pom.xml index dee47d4f..2f17a849 100644 --- a/sources/hv-collector-xnf-simulator/pom.xml +++ b/sources/hv-collector-xnf-simulator/pom.xml @@ -4,6 +4,7 @@ ~ dcaegen2-collectors-veshv ~ ================================================================================ ~ Copyright (C) 2018-2021 NOKIA + ~ Copyright (C) 2022 Nordix Foundation ~ ================================================================================ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. @@ -33,8 +34,8 @@ <parent> <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId> <artifactId>hv-collector-sources</artifactId> - <version>1.9.1-SNAPSHOT</version> - <relativePath>..</relativePath> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>hv-collector-xnf-simulator</artifactId> diff --git a/sources/pom.xml b/sources/pom.xml index 16ebf304..fd5a86aa 100644 --- a/sources/pom.xml +++ b/sources/pom.xml @@ -4,6 +4,7 @@ ~ dcaegen2-collectors-veshv ~ ================================================================================ ~ Copyright (C) 2018-2021 NOKIA + ~ Copyright (C) 2022 Nordix Foundation ~ ================================================================================ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. @@ -33,8 +34,8 @@ <parent> <groupId>org.onap.dcaegen2.collectors.hv-ves</groupId> <artifactId>ves-hv-collector</artifactId> - <version>1.9.1-SNAPSHOT</version> - <relativePath>..</relativePath> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>hv-collector-sources</artifactId> @@ -126,7 +127,7 @@ <dependency> <groupId>${project.groupId}</groupId> <artifactId>hv-collector-analysis</artifactId> - <version>1.9.1-SNAPSHOT</version> + <version>${revision}</version> </dependency> </dependencies> </plugin> diff --git a/version.properties b/version.properties index e31b2def..e9e55960 100644 --- a/version.properties +++ b/version.properties @@ -1,6 +1,6 @@ major=1 -minor=9 -patch=1 +minor=10 +patch=0 base_version=${major}.${minor}.${patch} release_version=${base_version} snapshot_version=${base_version}-SNAPSHOT |