From 41e1a2f75804ccad3d25678a1db12f8b63cd1942 Mon Sep 17 00:00:00 2001 From: Naveen Reddy Karri Date: Tue, 2 Oct 2018 14:26:35 -0700 Subject: [PATCH 1/9] Update spec version --- SPECS/argus-client.spec | 2 +- SPECS/argus-ui.spec | 2 +- SPECS/argus-webservices.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SPECS/argus-client.spec b/SPECS/argus-client.spec index 97783243f..d66ef3444 100755 --- a/SPECS/argus-client.spec +++ b/SPECS/argus-client.spec @@ -3,7 +3,7 @@ # BuildArch: noarch Name: argusclient -Version: 4.40 +Version: 4.41 Release: 1 License: BSD-3-Clause Group: Applications/System diff --git a/SPECS/argus-ui.spec b/SPECS/argus-ui.spec index 502f88e96..44b4f0dc1 100755 --- a/SPECS/argus-ui.spec +++ b/SPECS/argus-ui.spec @@ -3,7 +3,7 @@ # BuildArch: noarch Name: argusui -Version: 4.40 +Version: 4.41 Release: 1 License: BSD-3-Clause Group: Applications/System diff --git a/SPECS/argus-webservices.spec b/SPECS/argus-webservices.spec index e66463308..ebc7417df 100755 --- a/SPECS/argus-webservices.spec +++ b/SPECS/argus-webservices.spec @@ -3,7 +3,7 @@ # BuildArch: noarch Name: argusws -Version: 4.40 +Version: 4.41 Release: 1 License: BSD-3-Clause Group: Applications/System From 7fb6dbba93871d720b8f5372cb24a811a10aea99 Mon Sep 17 00:00:00 2001 From: Naveen Reddy Karri Date: Tue, 2 Oct 2018 14:36:05 -0700 Subject: [PATCH 2/9] Add strata.yml --- .strata.yml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .strata.yml diff --git a/.strata.yml b/.strata.yml new file mode 100644 index 000000000..645a02f2a --- /dev/null +++ b/.strata.yml @@ -0,0 +1,32 @@ +pipeline_template: rpm/Jenkinsfile-dva-yumrepo +email_reply_to: argus-admin@salesforce.com +time_out_mins: 180 +number_of_artifacts_to_keep: 3 +compliance_required: false +docker_test_images: +- dva/sfdc_rhel6_jdk8_mvn3.3.3 +unit_tests_command: |- + #mvn -DskipITs -DskipDockerBuild install + #mvn jacoco:report + #touch target/jacoco.exec + #cat $(find ./ -name "jacoco.exec" -mindepth 3 -type f) >target/jacoco.exec + mvn -DskipTests=true install -DskipDockerBuild +pipeline_initial_build_number: 84 +docker_package_images: +- sfdc_rhel6_jdk8_rpmbuild +package_generation_command: "echo \"Creating users inside container...\"\nFILE=/tmp/project/SPECS/argus-webservices.spec\n\ + ORIG_USER=argus\nCUR_USER=`stat -c \"%U\" ${FILE}`\nCUR_UID=`stat -c \"%u\" ${FILE}`\n\ + CUR_GRP=`stat -c \"%G\" ${FILE}`\nCUR_GID=`stat -c \"%g\" ${FILE}`\necho \"Creating\ + \ users inside container...${CUR_USER} ${CUR_GRP} ${CUR_UID} ${CUR_GID}\"\n# In\ + \ some cases, there is user on the container that has a different name, but same\ + \ uid. \nif [[ ${CUR_GRP} == \"UNKNOWN\" ]]; then\n echo \"Adding missing group...${ORIG_USER}\"\ + \n groupadd --gid ${CUR_GID} ${ORIG_USER}\nfi\nif [[ ${CUR_USER} == \"UNKNOWN\"\ + \ ]]; then \n echo \"Adding missing user...${ORIG_USER}\"\n useradd --uid\ + \ ${CUR_UID} --gid ${CUR_GID} ${ORIG_USER}\n CUR_USER=${ORIG_USER}\nfi\nif [[\ + \ ${CUR_USER} != ${ORIG_USER} ]]; then\n uniq_uid=$((1 + $(cat /etc/passwd |\ + \ grep -v nobody | cut -f 3 -d: | sort -n | tail -n 1)))\n usermod -l ${ORIG_USER}\ + \ ${CUR_USER}\nfi\nmake package" +package_repository: mandm +integration_tests_command: echo docker override +docker_image_name: argus2 +publish_jar: true From 6a86af8fdf3c8a1e13aa5f91f6050d3a4474bfd8 Mon Sep 17 00:00:00 2001 From: Naveen Reddy Karri Date: Tue, 2 Oct 2018 14:40:06 -0700 Subject: [PATCH 3/9] Undo pom.xml --- pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 85660be4e..cdfb37b7c 100644 --- a/pom.xml +++ b/pom.xml @@ -431,14 +431,14 @@ + + nexus + https://nexus.soma.salesforce.com/nexus/content/repositories/releases/ + - ossrh - https://oss.sonatype.org/content/repositories/snapshots + nexus + https://nexus.soma.salesforce.com/nexus/content/repositories/snapshots/ - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - From 38f57dbd5abdd165f5d47cd0fdb5b1cde3bed423 Mon Sep 17 00:00:00 2001 From: Naveen Reddy Karri Date: Tue, 2 Oct 2018 15:11:58 -0700 Subject: [PATCH 4/9] Update Argus Version --- ArgusClient/pom.xml | 2 +- ArgusCore/pom.xml | 2 +- ArgusSDK/pom.xml | 2 +- ArgusWeb/pom.xml | 2 +- ArgusWebServices/pom.xml | 2 +- pom.xml | 4 ++-- project.version | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ArgusClient/pom.xml b/ArgusClient/pom.xml index 92ee08b84..dba46cbd7 100644 --- a/ArgusClient/pom.xml +++ b/ArgusClient/pom.xml @@ -4,7 +4,7 @@ argus com.salesforce.argus - 2.21.1 + 2.21.2 .. argus-client diff --git a/ArgusCore/pom.xml b/ArgusCore/pom.xml index 9ecd06d0f..f3febfbfc 100644 --- a/ArgusCore/pom.xml +++ b/ArgusCore/pom.xml @@ -5,7 +5,7 @@ argus com.salesforce.argus - 2.21.1 + 2.21.2 .. argus-core diff --git a/ArgusSDK/pom.xml b/ArgusSDK/pom.xml index 8d0aa91ef..ab77bc4aa 100644 --- a/ArgusSDK/pom.xml +++ b/ArgusSDK/pom.xml @@ -4,7 +4,7 @@ argus com.salesforce.argus - 2.21.1 + 2.21.2 .. argus-sdk diff --git a/ArgusWeb/pom.xml b/ArgusWeb/pom.xml index d61a18193..4d0bbb2d1 100644 --- a/ArgusWeb/pom.xml +++ b/ArgusWeb/pom.xml @@ -4,7 +4,7 @@ argus com.salesforce.argus - 2.21.1 + 2.21.2 .. argus-web diff --git a/ArgusWebServices/pom.xml b/ArgusWebServices/pom.xml index d879e6170..e918da656 100644 --- a/ArgusWebServices/pom.xml +++ b/ArgusWebServices/pom.xml @@ -3,7 +3,7 @@ argus com.salesforce.argus - 2.21.1 + 2.21.2 .. argus-webservices diff --git a/pom.xml b/pom.xml index cdfb37b7c..6f9fbd55c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.salesforce.argus argus - 2.21.1 + 2.21.2 pom Argus @@ -118,7 +118,7 @@ UTF-8 yyyy-MM-dd HH:mm salesforce - 2.21.1 + 2.21.2 1.2.3 2.9.5 4.5.3 diff --git a/project.version b/project.version index ca2890bd2..f4d1f6d8e 100755 --- a/project.version +++ b/project.version @@ -1 +1 @@ -export PROJECT_VERSION=2.21.1 +export PROJECT_VERSION=2.21.2 From 80910142f7fa7f11787a3018140d54ebfd16d40b Mon Sep 17 00:00:00 2001 From: Sudhanshu Bahety Date: Thu, 4 Oct 2018 17:22:43 -0700 Subject: [PATCH 5/9] removing email validation --- .../salesforce/dva/argus/entity/Notification.java | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/ArgusCore/src/main/java/com/salesforce/dva/argus/entity/Notification.java b/ArgusCore/src/main/java/com/salesforce/dva/argus/entity/Notification.java index af5384b84..47f17af14 100644 --- a/ArgusCore/src/main/java/com/salesforce/dva/argus/entity/Notification.java +++ b/ArgusCore/src/main/java/com/salesforce/dva/argus/entity/Notification.java @@ -440,19 +440,6 @@ public List getSubscriptions() { */ public void setSubscriptions(List subscriptions) { this.subscriptions.clear(); - if(subscriptions == null) return; - for(String currentSubscription: subscriptions) { - if (this.getNotifierName().equals(AlertService.SupportedNotifier.GUS.getName())) { - if (currentSubscription.length() < 10) - throw new IllegalArgumentException("GUS subjectId is incorrect."); - } else if (this.getNotifierName().equals(AlertService.SupportedNotifier.EMAIL.getName())) { - if (!currentSubscription.matches(EMAILREGEX)) { - String errorMessage = MessageFormat.format("Email Address {0} is not allowed according to Regex {1}.", - currentSubscription, EMAILREGEX); - throw new IllegalArgumentException(errorMessage); - } - } - } if (subscriptions != null && !subscriptions.isEmpty()) { this.subscriptions.addAll(subscriptions); } From 7c1e94feed034a97ca3d078a9998fbfe37d1598a Mon Sep 17 00:00:00 2001 From: Sudhanshu Bahety Date: Thu, 4 Oct 2018 17:25:24 -0700 Subject: [PATCH 6/9] removing email validation, keeping gus validation --- .../java/com/salesforce/dva/argus/entity/Notification.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ArgusCore/src/main/java/com/salesforce/dva/argus/entity/Notification.java b/ArgusCore/src/main/java/com/salesforce/dva/argus/entity/Notification.java index 47f17af14..b8fa0f318 100644 --- a/ArgusCore/src/main/java/com/salesforce/dva/argus/entity/Notification.java +++ b/ArgusCore/src/main/java/com/salesforce/dva/argus/entity/Notification.java @@ -440,6 +440,13 @@ public List getSubscriptions() { */ public void setSubscriptions(List subscriptions) { this.subscriptions.clear(); + if(subscriptions == null) return; + for(String currentSubscription: subscriptions) { + if (this.getNotifierName().equals(AlertService.SupportedNotifier.GUS.getName())) { + if (currentSubscription.length() < 10) + throw new IllegalArgumentException("GUS subjectId is incorrect."); + } + } if (subscriptions != null && !subscriptions.isEmpty()) { this.subscriptions.addAll(subscriptions); } From 5c9543c5f1429ef787778154fac2773aaf354930 Mon Sep 17 00:00:00 2001 From: Naveen Reddy Karri Date: Thu, 4 Oct 2018 17:58:07 -0700 Subject: [PATCH 7/9] Update Version to 2.21.3 --- ArgusClient/pom.xml | 2 +- ArgusCore/pom.xml | 2 +- ArgusSDK/pom.xml | 2 +- ArgusWeb/pom.xml | 2 +- ArgusWebServices/pom.xml | 2 +- pom.xml | 4 ++-- project.version | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ArgusClient/pom.xml b/ArgusClient/pom.xml index dba46cbd7..c9803cd55 100644 --- a/ArgusClient/pom.xml +++ b/ArgusClient/pom.xml @@ -4,7 +4,7 @@ argus com.salesforce.argus - 2.21.2 + 2.21.3 .. argus-client diff --git a/ArgusCore/pom.xml b/ArgusCore/pom.xml index f3febfbfc..c70224ceb 100644 --- a/ArgusCore/pom.xml +++ b/ArgusCore/pom.xml @@ -5,7 +5,7 @@ argus com.salesforce.argus - 2.21.2 + 2.21.3 .. argus-core diff --git a/ArgusSDK/pom.xml b/ArgusSDK/pom.xml index ab77bc4aa..ea80ebe6d 100644 --- a/ArgusSDK/pom.xml +++ b/ArgusSDK/pom.xml @@ -4,7 +4,7 @@ argus com.salesforce.argus - 2.21.2 + 2.21.3 .. argus-sdk diff --git a/ArgusWeb/pom.xml b/ArgusWeb/pom.xml index 4d0bbb2d1..20f5ceb70 100644 --- a/ArgusWeb/pom.xml +++ b/ArgusWeb/pom.xml @@ -4,7 +4,7 @@ argus com.salesforce.argus - 2.21.2 + 2.21.3 .. argus-web diff --git a/ArgusWebServices/pom.xml b/ArgusWebServices/pom.xml index e918da656..63eb9666b 100644 --- a/ArgusWebServices/pom.xml +++ b/ArgusWebServices/pom.xml @@ -3,7 +3,7 @@ argus com.salesforce.argus - 2.21.2 + 2.21.3 .. argus-webservices diff --git a/pom.xml b/pom.xml index 6f9fbd55c..b6c9e0073 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.salesforce.argus argus - 2.21.2 + 2.21.3 pom Argus @@ -118,7 +118,7 @@ UTF-8 yyyy-MM-dd HH:mm salesforce - 2.21.2 + 2.21.3 1.2.3 2.9.5 4.5.3 diff --git a/project.version b/project.version index f4d1f6d8e..c19f6fb45 100755 --- a/project.version +++ b/project.version @@ -1 +1 @@ -export PROJECT_VERSION=2.21.2 +export PROJECT_VERSION=2.21.3 From 811eae3f6948e0153aae1618f84fb47bdbb4956b Mon Sep 17 00:00:00 2001 From: Naveen Reddy Karri Date: Thu, 4 Oct 2018 18:00:22 -0700 Subject: [PATCH 8/9] Update Spec Version --- SPECS/argus-client.spec | 2 +- SPECS/argus-ui.spec | 2 +- SPECS/argus-webservices.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SPECS/argus-client.spec b/SPECS/argus-client.spec index d66ef3444..cdbdae814 100755 --- a/SPECS/argus-client.spec +++ b/SPECS/argus-client.spec @@ -3,7 +3,7 @@ # BuildArch: noarch Name: argusclient -Version: 4.41 +Version: 4.42 Release: 1 License: BSD-3-Clause Group: Applications/System diff --git a/SPECS/argus-ui.spec b/SPECS/argus-ui.spec index 44b4f0dc1..2489145ea 100755 --- a/SPECS/argus-ui.spec +++ b/SPECS/argus-ui.spec @@ -3,7 +3,7 @@ # BuildArch: noarch Name: argusui -Version: 4.41 +Version: 4.42 Release: 1 License: BSD-3-Clause Group: Applications/System diff --git a/SPECS/argus-webservices.spec b/SPECS/argus-webservices.spec index ebc7417df..48cef68b4 100755 --- a/SPECS/argus-webservices.spec +++ b/SPECS/argus-webservices.spec @@ -3,7 +3,7 @@ # BuildArch: noarch Name: argusws -Version: 4.41 +Version: 4.42 Release: 1 License: BSD-3-Clause Group: Applications/System From 29a22259ca33f61db75408e1fc0a61b7be254b06 Mon Sep 17 00:00:00 2001 From: Naveen Reddy Karri Date: Fri, 5 Oct 2018 14:44:52 -0700 Subject: [PATCH 9/9] GitHub Undo Pom/Strata --- .strata.yml | 32 -------------------------------- pom.xml | 12 ++++++------ 2 files changed, 6 insertions(+), 38 deletions(-) delete mode 100644 .strata.yml diff --git a/.strata.yml b/.strata.yml deleted file mode 100644 index 645a02f2a..000000000 --- a/.strata.yml +++ /dev/null @@ -1,32 +0,0 @@ -pipeline_template: rpm/Jenkinsfile-dva-yumrepo -email_reply_to: argus-admin@salesforce.com -time_out_mins: 180 -number_of_artifacts_to_keep: 3 -compliance_required: false -docker_test_images: -- dva/sfdc_rhel6_jdk8_mvn3.3.3 -unit_tests_command: |- - #mvn -DskipITs -DskipDockerBuild install - #mvn jacoco:report - #touch target/jacoco.exec - #cat $(find ./ -name "jacoco.exec" -mindepth 3 -type f) >target/jacoco.exec - mvn -DskipTests=true install -DskipDockerBuild -pipeline_initial_build_number: 84 -docker_package_images: -- sfdc_rhel6_jdk8_rpmbuild -package_generation_command: "echo \"Creating users inside container...\"\nFILE=/tmp/project/SPECS/argus-webservices.spec\n\ - ORIG_USER=argus\nCUR_USER=`stat -c \"%U\" ${FILE}`\nCUR_UID=`stat -c \"%u\" ${FILE}`\n\ - CUR_GRP=`stat -c \"%G\" ${FILE}`\nCUR_GID=`stat -c \"%g\" ${FILE}`\necho \"Creating\ - \ users inside container...${CUR_USER} ${CUR_GRP} ${CUR_UID} ${CUR_GID}\"\n# In\ - \ some cases, there is user on the container that has a different name, but same\ - \ uid. \nif [[ ${CUR_GRP} == \"UNKNOWN\" ]]; then\n echo \"Adding missing group...${ORIG_USER}\"\ - \n groupadd --gid ${CUR_GID} ${ORIG_USER}\nfi\nif [[ ${CUR_USER} == \"UNKNOWN\"\ - \ ]]; then \n echo \"Adding missing user...${ORIG_USER}\"\n useradd --uid\ - \ ${CUR_UID} --gid ${CUR_GID} ${ORIG_USER}\n CUR_USER=${ORIG_USER}\nfi\nif [[\ - \ ${CUR_USER} != ${ORIG_USER} ]]; then\n uniq_uid=$((1 + $(cat /etc/passwd |\ - \ grep -v nobody | cut -f 3 -d: | sort -n | tail -n 1)))\n usermod -l ${ORIG_USER}\ - \ ${CUR_USER}\nfi\nmake package" -package_repository: mandm -integration_tests_command: echo docker override -docker_image_name: argus2 -publish_jar: true diff --git a/pom.xml b/pom.xml index b6c9e0073..879710aa7 100644 --- a/pom.xml +++ b/pom.xml @@ -431,14 +431,14 @@ - - nexus - https://nexus.soma.salesforce.com/nexus/content/repositories/releases/ - - nexus - https://nexus.soma.salesforce.com/nexus/content/repositories/snapshots/ + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ +