From 732932155b1bde692fa98848529d0771ccf6faa4 Mon Sep 17 00:00:00 2001 From: dfarrelly Date: Thu, 27 Feb 2020 08:24:15 +0000 Subject: Fix PM Mapper certficate handling Remove decoding of keystore files Issue-ID: DCAEGEN2-2096 Signed-off-by: dfarrelly Change-Id: Ieccf3c6bb44a87fac2ec3d2f5883a7b0a914e712 --- dpo/blueprints/k8s-pm-mapper.yaml | 8 ++--- pom.xml | 2 +- .../services/pmmapper/ssl/SSLContextFactory.java | 10 +++--- .../invalid_configs/empty_filter_object.json | 4 +-- .../invalid_configs/invalid_filter_object.json | 4 +-- .../invalid_configs/null_aaf_identity.json | 4 +-- .../invalid_configs/null_aaf_password.json | 4 +-- .../invalid_configs/null_client_role.json | 4 +-- .../null_dmaap_dr_delete_endpoint.json | 4 +-- .../invalid_configs/null_dr_location.json | 4 +-- .../invalid_configs/null_dr_password.json | 4 +-- .../invalid_configs/null_dr_subscriber_id.json | 4 +-- .../invalid_configs/null_dr_username.json | 4 +-- .../resources/invalid_configs/null_filter.json | 4 +-- .../invalid_configs/null_filter_array.json | 4 +-- .../invalid_configs/null_key_store_pass_path.json | 4 +-- .../invalid_configs/null_key_store_path.json | 2 +- .../resources/invalid_configs/null_location.json | 4 +-- .../resources/invalid_configs/null_topic_url.json | 4 +-- .../null_trust_store_pass_path.json | 4 +-- .../invalid_configs/null_trust_store_path.json | 2 +- .../resources/multiple_filter_mapper_config.json | 4 +-- src/test/resources/no_filter_mapper_config.json | 4 +-- src/test/resources/testkeystore.jks | Bin 0 -> 1985 bytes src/test/resources/testkeystore.jks.b64 | 35 --------------------- src/test/resources/valid_mapper_config.json | 4 +-- version.properties | 2 +- 27 files changed, 50 insertions(+), 87 deletions(-) create mode 100644 src/test/resources/testkeystore.jks delete mode 100644 src/test/resources/testkeystore.jks.b64 diff --git a/dpo/blueprints/k8s-pm-mapper.yaml b/dpo/blueprints/k8s-pm-mapper.yaml index c372618..5662e1d 100644 --- a/dpo/blueprints/k8s-pm-mapper.yaml +++ b/dpo/blueprints/k8s-pm-mapper.yaml @@ -1,6 +1,6 @@ # # ============LICENSE_START======================================================= -# Copyright (C) 2019 Nordix Foundation. +# Copyright (C) 2019-2020 Nordix Foundation. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the 'License'); # you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ tosca_definitions_version: cloudify_dsl_1_3 imports: - 'http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml' - - 'https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R5/k8splugin/1.6.0/k8splugin_types.yaml' + - 'https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/k8splugin/1.7.2/k8splugin_types.yaml' - 'https://nexus.onap.org/service/local/repositories/raw/content/org.onap.ccsdk.platform.plugins/type_files/dmaap/dmaap.yaml' inputs: @@ -144,9 +144,9 @@ node_templates: service_component_type: 'dcae-pm-mapper' service_component_name_override: 'dcae-pm-mapper' application_config: - trust_store_path: '/opt/app/pm-mapper/etc/cert/trust.jks.b64' + trust_store_path: '/opt/app/pm-mapper/etc/cert/trust.jks' trust_store_pass_path: '/opt/app/pm-mapper/etc/cert/trust.pass' - key_store_path: '/opt/app/pm-mapper/etc/cert/cert.jks.b64' + key_store_path: '/opt/app/pm-mapper/etc/cert/cert.jks' key_store_pass_path: '/opt/app/pm-mapper/etc/cert/jks.pass' pm-mapper-filter: { get_input: filter } enable_http: { get_input: enable_http } diff --git a/pom.xml b/pom.xml index f085ec2..f42dded 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.onap.dcaegen2.services pm-mapper - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT org.onap.oparent diff --git a/src/main/java/org/onap/dcaegen2/services/pmmapper/ssl/SSLContextFactory.java b/src/main/java/org/onap/dcaegen2/services/pmmapper/ssl/SSLContextFactory.java index 0bfdaa6..2b81c0a 100644 --- a/src/main/java/org/onap/dcaegen2/services/pmmapper/ssl/SSLContextFactory.java +++ b/src/main/java/org/onap/dcaegen2/services/pmmapper/ssl/SSLContextFactory.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * Copyright (C) 2019 Nordix Foundation. + * Copyright (C) 2019-2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -103,15 +103,13 @@ public class SSLContextFactory { private KeyStore loadKeyStore(String path, String passwordPath) throws IOException, NoSuchAlgorithmException { String type = "JKS"; - String encodedKeystore = new String(readAllBytes(Paths.get(path))); String password = getPassword(passwordPath); - - KeyStore keyStore = null; + KeyStore keyStore; try { keyStore = KeyStore.getInstance(type); - byte[] decodedKeystore = Base64.getMimeDecoder().decode(encodedKeystore); - InputStream stream = new ByteArrayInputStream(decodedKeystore); + byte[] keystoreBytes = readAllBytes(Paths.get(path)); + InputStream stream = new ByteArrayInputStream(keystoreBytes); keyStore.load(stream, password.toCharArray()); } catch(KeyStoreException | CertificateException e) { logger.unwrap().error("Failed to load Keystore from given configuration.", e); diff --git a/src/test/resources/invalid_configs/empty_filter_object.json b/src/test/resources/invalid_configs/empty_filter_object.json index 8c72b83..4aed8ef 100644 --- a/src/test/resources/invalid_configs/empty_filter_object.json +++ b/src/test/resources/invalid_configs/empty_filter_object.json @@ -1,8 +1,8 @@ { "pm-mapper-filter": {}, - "key_store_path": "src/test/resources/testkeystore.jks.b64", + "key_store_path": "src/test/resources/testkeystore.jks", "key_store_pass_path": "src/test/resources/password", - "trust_store_path": "src/test/resources/testkeystore.jks.b64", + "trust_store_path": "src/test/resources/testkeystore.jks", "trust_store_pass_path": "src/test/resources/password", "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete", "dmaap_dr_feed_name": "bulk_pm_feed", diff --git a/src/test/resources/invalid_configs/invalid_filter_object.json b/src/test/resources/invalid_configs/invalid_filter_object.json index 1b7b0e3..f36aa81 100644 --- a/src/test/resources/invalid_configs/invalid_filter_object.json +++ b/src/test/resources/invalid_configs/invalid_filter_object.json @@ -6,9 +6,9 @@ } ] }, - "key_store_path": "src/test/resources/testkeystore.jks.b64", + "key_store_path": "src/test/resources/testkeystore.jks", "key_store_pass_path": "src/test/resources/password", - "trust_store_path": "src/test/resources/testkeystore.jks.b64", + "trust_store_path": "src/test/resources/testkeystore.jks", "trust_store_pass_path": "src/test/resources/password", "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete", "dmaap_dr_feed_name": "bulk_pm_feed", diff --git a/src/test/resources/invalid_configs/null_aaf_identity.json b/src/test/resources/invalid_configs/null_aaf_identity.json index 8f9c7ef..f0a6940 100644 --- a/src/test/resources/invalid_configs/null_aaf_identity.json +++ b/src/test/resources/invalid_configs/null_aaf_identity.json @@ -12,9 +12,9 @@ } ] }, - "key_store_path": "src/test/resources/testkeystore.jks.b64", + "key_store_path": "src/test/resources/testkeystore.jks", "key_store_pass_path": "src/test/resources/password", - "trust_store_path": "src/test/resources/testkeystore.jks.b64", + "trust_store_path": "src/test/resources/testkeystore.jks", "trust_store_pass_path": "src/test/resources/password", "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete", "dmaap_dr_feed_name": "bulk_pm_feed", diff --git a/src/test/resources/invalid_configs/null_aaf_password.json b/src/test/resources/invalid_configs/null_aaf_password.json index d54d825..f4fdba9 100644 --- a/src/test/resources/invalid_configs/null_aaf_password.json +++ b/src/test/resources/invalid_configs/null_aaf_password.json @@ -12,9 +12,9 @@ } ] }, - "key_store_path": "src/test/resources/testkeystore.jks.b64", + "key_store_path": "src/test/resources/testkeystore.jks", "key_store_pass_path": "src/test/resources/password", - "trust_store_path": "src/test/resources/testkeystore.jks.b64", + "trust_store_path": "src/test/resources/testkeystore.jks", "trust_store_pass_path": "src/test/resources/password", "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete", "dmaap_dr_feed_name": "bulk_pm_feed", diff --git a/src/test/resources/invalid_configs/null_client_role.json b/src/test/resources/invalid_configs/null_client_role.json index 40471de..ae17a1d 100644 --- a/src/test/resources/invalid_configs/null_client_role.json +++ b/src/test/resources/invalid_configs/null_client_role.json @@ -12,9 +12,9 @@ } ] }, - "key_store_path": "src/test/resources/testkeystore.jks.b64", + "key_store_path": "src/test/resources/testkeystore.jks", "key_store_pass_path": "src/test/resources/password", - "trust_store_path": "src/test/resources/testkeystore.jks.b64", + "trust_store_path": "src/test/resources/testkeystore.jks", "trust_store_pass_path": "src/test/resources/password", "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete", "dmaap_dr_feed_name": "bulk_pm_feed", diff --git a/src/test/resources/invalid_configs/null_dmaap_dr_delete_endpoint.json b/src/test/resources/invalid_configs/null_dmaap_dr_delete_endpoint.json index d86de5e..449cd58 100644 --- a/src/test/resources/invalid_configs/null_dmaap_dr_delete_endpoint.json +++ b/src/test/resources/invalid_configs/null_dmaap_dr_delete_endpoint.json @@ -12,9 +12,9 @@ } ] }, - "key_store_path": "src/test/resources/testkeystore.jks.b64", + "key_store_path": "src/test/resources/testkeystore.jks", "key_store_pass_path": "src/test/resources/password", - "trust_store_path": "src/test/resources/testkeystore.jks.b64", + "trust_store_path": "src/test/resources/testkeystore.jks", "trust_store_pass_path": "src/test/resources/password", "dmaap_dr_delete_endpoint": null, "dmaap_dr_feed_name": "bulk_pm_feed", diff --git a/src/test/resources/invalid_configs/null_dr_location.json b/src/test/resources/invalid_configs/null_dr_location.json index 79bd05d..534ff4e 100644 --- a/src/test/resources/invalid_configs/null_dr_location.json +++ b/src/test/resources/invalid_configs/null_dr_location.json @@ -12,9 +12,9 @@ } ] }, - "key_store_path": "src/test/resources/testkeystore.jks.b64", + "key_store_path": "src/test/resources/testkeystore.jks", "key_store_pass_path": "src/test/resources/password", - "trust_store_path": "src/test/resources/testkeystore.jks.b64", + "trust_store_path": "src/test/resources/testkeystore.jks", "trust_store_pass_path": "src/test/resources/password", "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete", "dmaap_dr_feed_name": "bulk_pm_feed", diff --git a/src/test/resources/invalid_configs/null_dr_password.json b/src/test/resources/invalid_configs/null_dr_password.json index 365b328..e2f0f22 100644 --- a/src/test/resources/invalid_configs/null_dr_password.json +++ b/src/test/resources/invalid_configs/null_dr_password.json @@ -12,9 +12,9 @@ } ] }, - "key_store_path": "src/test/resources/testkeystore.jks.b64", + "key_store_path": "src/test/resources/testkeystore.jks", "key_store_pass_path": "src/test/resources/password", - "trust_store_path": "src/test/resources/testkeystore.jks.b64", + "trust_store_path": "src/test/resources/testkeystore.jks", "trust_store_pass_path": "src/test/resources/password", "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete", "dmaap_dr_feed_name": "bulk_pm_feed", diff --git a/src/test/resources/invalid_configs/null_dr_subscriber_id.json b/src/test/resources/invalid_configs/null_dr_subscriber_id.json index c6c2a45..9d18d87 100644 --- a/src/test/resources/invalid_configs/null_dr_subscriber_id.json +++ b/src/test/resources/invalid_configs/null_dr_subscriber_id.json @@ -12,9 +12,9 @@ } ] }, - "key_store_path": "src/test/resources/testkeystore.jks.b64", + "key_store_path": "src/test/resources/testkeystore.jks", "key_store_pass_path": "src/test/resources/password", - "trust_store_path": "src/test/resources/testkeystore.jks.b64", + "trust_store_path": "src/test/resources/testkeystore.jks", "trust_store_pass_path": "src/test/resources/password", "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete", "dmaap_dr_feed_name": "bulk_pm_feed", diff --git a/src/test/resources/invalid_configs/null_dr_username.json b/src/test/resources/invalid_configs/null_dr_username.json index 511dd35..9f5b384 100644 --- a/src/test/resources/invalid_configs/null_dr_username.json +++ b/src/test/resources/invalid_configs/null_dr_username.json @@ -12,9 +12,9 @@ } ] }, - "key_store_path": "src/test/resources/testkeystore.jks.b64", + "key_store_path": "src/test/resources/testkeystore.jks", "key_store_pass_path": "src/test/resources/password", - "trust_store_path": "src/test/resources/testkeystore.jks.b64", + "trust_store_path": "src/test/resources/testkeystore.jks", "trust_store_pass_path": "src/test/resources/password", "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete", "dmaap_dr_feed_name": "bulk_pm_feed", diff --git a/src/test/resources/invalid_configs/null_filter.json b/src/test/resources/invalid_configs/null_filter.json index 7eb6af0..dfffebf 100644 --- a/src/test/resources/invalid_configs/null_filter.json +++ b/src/test/resources/invalid_configs/null_filter.json @@ -1,8 +1,8 @@ { "pm-mapper-filter": null, - "key_store_path": "src/test/resources/testkeystore.jks.b64", + "key_store_path": "src/test/resources/testkeystore.jks", "key_store_pass_path": "src/test/resources/password", - "trust_store_path": "src/test/resources/testkeystore.jks.b64", + "trust_store_path": "src/test/resources/testkeystore.jks", "trust_store_pass_path": "src/test/resources/password", "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete", "dmaap_dr_feed_name": "bulk_pm_feed", diff --git a/src/test/resources/invalid_configs/null_filter_array.json b/src/test/resources/invalid_configs/null_filter_array.json index 3d2df14..5f780b5 100644 --- a/src/test/resources/invalid_configs/null_filter_array.json +++ b/src/test/resources/invalid_configs/null_filter_array.json @@ -2,9 +2,9 @@ "pm-mapper-filter": { "filters": null }, - "key_store_path": "src/test/resources/testkeystore.jks.b64", + "key_store_path": "src/test/resources/testkeystore.jks", "key_store_pass_path": "src/test/resources/password", - "trust_store_path": "src/test/resources/testkeystore.jks.b64", + "trust_store_path": "src/test/resources/testkeystore.jks", "trust_store_pass_path": "src/test/resources/password", "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete", "dmaap_dr_feed_name": "bulk_pm_feed", diff --git a/src/test/resources/invalid_configs/null_key_store_pass_path.json b/src/test/resources/invalid_configs/null_key_store_pass_path.json index 2145e01..94825f3 100644 --- a/src/test/resources/invalid_configs/null_key_store_pass_path.json +++ b/src/test/resources/invalid_configs/null_key_store_pass_path.json @@ -12,9 +12,9 @@ } ] }, - "key_store_path": "src/test/resources/testkeystore.jks.b64", + "key_store_path": "src/test/resources/testkeystore.jks", "key_store_pass_path": null, - "trust_store_path": "src/test/resources/testkeystore.jks.b64", + "trust_store_path": "src/test/resources/testkeystore.jks", "trust_store_pass_path": "src/test/resources/password", "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete", "dmaap_dr_feed_name": "bulk_pm_feed", diff --git a/src/test/resources/invalid_configs/null_key_store_path.json b/src/test/resources/invalid_configs/null_key_store_path.json index 8f6f831..945ec2a 100644 --- a/src/test/resources/invalid_configs/null_key_store_path.json +++ b/src/test/resources/invalid_configs/null_key_store_path.json @@ -14,7 +14,7 @@ }, "key_store_path": null, "key_store_pass_path": "src/test/resources/password", - "trust_store_path": "src/test/resources/testkeystore.jks.b64", + "trust_store_path": "src/test/resources/testkeystore.jks", "trust_store_pass_path": "src/test/resources/password", "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete", "dmaap_dr_feed_name": "bulk_pm_feed", diff --git a/src/test/resources/invalid_configs/null_location.json b/src/test/resources/invalid_configs/null_location.json index b7d9266..2f31be1 100644 --- a/src/test/resources/invalid_configs/null_location.json +++ b/src/test/resources/invalid_configs/null_location.json @@ -12,9 +12,9 @@ } ] }, - "key_store_path": "src/test/resources/testkeystore.jks.b64", + "key_store_path": "src/test/resources/testkeystore.jks", "key_store_pass_path": "src/test/resources/password", - "trust_store_path": "src/test/resources/testkeystore.jks.b64", + "trust_store_path": "src/test/resources/testkeystore.jks", "trust_store_pass_path": "src/test/resources/password", "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete", "dmaap_dr_feed_name": "bulk_pm_feed", diff --git a/src/test/resources/invalid_configs/null_topic_url.json b/src/test/resources/invalid_configs/null_topic_url.json index faea169..5f1d6f0 100644 --- a/src/test/resources/invalid_configs/null_topic_url.json +++ b/src/test/resources/invalid_configs/null_topic_url.json @@ -12,9 +12,9 @@ } ] }, - "key_store_path": "src/test/resources/testkeystore.jks.b64", + "key_store_path": "src/test/resources/testkeystore.jks", "key_store_pass_path": "src/test/resources/password", - "trust_store_path": "src/test/resources/testkeystore.jks.b64", + "trust_store_path": "src/test/resources/testkeystore.jks", "trust_store_pass_path": "src/test/resources/password", "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete", "dmaap_dr_feed_name": "bulk_pm_feed", diff --git a/src/test/resources/invalid_configs/null_trust_store_pass_path.json b/src/test/resources/invalid_configs/null_trust_store_pass_path.json index c98274e..5ed846a 100644 --- a/src/test/resources/invalid_configs/null_trust_store_pass_path.json +++ b/src/test/resources/invalid_configs/null_trust_store_pass_path.json @@ -12,9 +12,9 @@ } ] }, - "key_store_path": "src/test/resources/testkeystore.jks.b64", + "key_store_path": "src/test/resources/testkeystore.jks", "key_store_pass_path": "src/test/resources/password", - "trust_store_path": "src/test/resources/testkeystore.jks.b64", + "trust_store_path": "src/test/resources/testkeystore.jks", "trust_store_pass_path": null, "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete", "dmaap_dr_feed_name": "bulk_pm_feed", diff --git a/src/test/resources/invalid_configs/null_trust_store_path.json b/src/test/resources/invalid_configs/null_trust_store_path.json index 2673fb9..0c0f825 100644 --- a/src/test/resources/invalid_configs/null_trust_store_path.json +++ b/src/test/resources/invalid_configs/null_trust_store_path.json @@ -12,7 +12,7 @@ } ] }, - "key_store_path": "src/test/resources/testkeystore.jks.b64", + "key_store_path": "src/test/resources/testkeystore.jks", "key_store_pass_path": "src/test/resources/password", "trust_store_path": null, "trust_store_pass_path": "src/test/resources/password", diff --git a/src/test/resources/multiple_filter_mapper_config.json b/src/test/resources/multiple_filter_mapper_config.json index 72aa1f0..188a721 100644 --- a/src/test/resources/multiple_filter_mapper_config.json +++ b/src/test/resources/multiple_filter_mapper_config.json @@ -21,9 +21,9 @@ } ] }, - "key_store_path": "src/test/resources/testkeystore.jks.b64", + "key_store_path": "src/test/resources/testkeystore.jks", "key_store_pass_path": "src/test/resources/password", - "trust_store_path": "src/test/resources/testkeystore.jks.b64", + "trust_store_path": "src/test/resources/testkeystore.jks", "trust_store_pass_path": "src/test/resources/password", "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete", "dmaap_dr_feed_name": "bulk_pm_feed", diff --git a/src/test/resources/no_filter_mapper_config.json b/src/test/resources/no_filter_mapper_config.json index 0f24f90..f6041cd 100644 --- a/src/test/resources/no_filter_mapper_config.json +++ b/src/test/resources/no_filter_mapper_config.json @@ -2,9 +2,9 @@ "pm-mapper-filter": { "filters": [] }, - "key_store_path": "src/test/resources/testkeystore.jks.b64", + "key_store_path": "src/test/resources/testkeystore.jks", "key_store_pass_path": "src/test/resources/password", - "trust_store_path": "src/test/resources/testkeystore.jks.b64", + "trust_store_path": "src/test/resources/testkeystore.jks", "trust_store_pass_path": "src/test/resources/password", "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete", "dmaap_dr_feed_name": "bulk_pm_feed", diff --git a/src/test/resources/testkeystore.jks b/src/test/resources/testkeystore.jks new file mode 100644 index 0000000..d082cb3 Binary files /dev/null and b/src/test/resources/testkeystore.jks differ diff --git a/src/test/resources/testkeystore.jks.b64 b/src/test/resources/testkeystore.jks.b64 deleted file mode 100644 index f466fce..0000000 --- a/src/test/resources/testkeystore.jks.b64 +++ /dev/null @@ -1,35 +0,0 @@ -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 diff --git a/src/test/resources/valid_mapper_config.json b/src/test/resources/valid_mapper_config.json index 07ccdb1..ae7d122 100644 --- a/src/test/resources/valid_mapper_config.json +++ b/src/test/resources/valid_mapper_config.json @@ -1,8 +1,8 @@ { "pm-mapper-filter": "{\"filters\": [{\"pmDefVsn\": \"V9\", \"nfType\": \"NrRadio\", \"vendor\": \"Ericsson\", \"measTypes\": [\"A\", \"B\"]}]}", - "key_store_path": "src/test/resources/testkeystore.jks.b64", + "key_store_path": "src/test/resources/testkeystore.jks", "key_store_pass_path": "src/test/resources/password", - "trust_store_path": "src/test/resources/testkeystore.jks.b64", + "trust_store_path": "src/test/resources/testkeystore.jks", "trust_store_pass_path": "src/test/resources/password", "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete", "dmaap_dr_feed_name": "bulk_pm_feed", diff --git a/version.properties b/version.properties index 88d216c..4562779 100644 --- a/version.properties +++ b/version.properties @@ -1,6 +1,6 @@ major=1 minor=3 -patch=0 +patch=1 base_version=${major}.${minor}.${patch} release_version=${base_version} snapshot_version=${base_version}-SNAPSHOT \ No newline at end of file -- cgit 1.2.3-korg