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
~ 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.
<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>
~ 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.
<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>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
~ 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.
<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>
~ 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.
<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>
</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>
<?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">
<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>
<scope>test</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
~ 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.
<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>
<artifactId>arrow-extras-data</artifactId>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
~ 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.
<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>
<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>
* 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.
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 {
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>()
.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("\"", "\\\"")
* 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.
*/
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)
.bootstrapServers("dmaap1,dmaap2")
.topicName("PERF_DATA")
.build()
-
on("calling the CUT method") {
val result = KafkaSenderOptionsFactory.createSenderOptions(sink)
val itShouldHavePropertySet = propertyChecker(result)
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") {
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\";")
}
}
~ 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.
<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>
<scope>test</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
~ 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.
<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>
</dependencies>
-</project>
\ No newline at end of file
+</project>
~ 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.
<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>
<?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">
<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>
<scope>test</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
<?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">
<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>
<?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">
<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>
~ 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.
<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>
~ 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.
<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>
~ 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.
<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>
<?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">
<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>
<scope>compile</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
~ 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.
<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>
<scope>provided</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
~ 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.
<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>
</dependencies>
-</project>
\ No newline at end of file
+</project>
~ 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.
<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>
~ 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.
<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>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>hv-collector-analysis</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>${revision}</version>
</dependency>
</dependencies>
</plugin>
major=1
-minor=9
-patch=1
+minor=10
+patch=0
base_version=${major}.${minor}.${patch}
release_version=${base_version}
snapshot_version=${base_version}-SNAPSHOT
Code Review / dcaegen2 / collectors / hv-ves.git / commitdiff