Merge pull request #943 from salesforce/release/2.21.0

Release/2.21.3 to master
salesforce · Oct 7, 2018 · ad2c2ef · ad2c2ef
2 parents 92d82dd + 29a2225
commit ad2c2ef
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 18 deletions.
diff --git a/ArgusClient/pom.xml b/ArgusClient/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>argus</artifactId>
         <groupId>com.salesforce.argus</groupId>
-        <version>2.21.1</version>
+        <version>2.21.3</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>argus-client</artifactId>

diff --git a/ArgusCore/pom.xml b/ArgusCore/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>argus</artifactId>
         <groupId>com.salesforce.argus</groupId>
-        <version>2.21.1</version>
+        <version>2.21.3</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>argus-core</artifactId>

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
@@ -445,12 +445,6 @@ public void setSubscriptions(List<String> 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()) {

diff --git a/ArgusSDK/pom.xml b/ArgusSDK/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>argus</artifactId>
         <groupId>com.salesforce.argus</groupId>
-        <version>2.21.1</version>
+        <version>2.21.3</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>argus-sdk</artifactId>

diff --git a/ArgusWeb/pom.xml b/ArgusWeb/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>argus</artifactId>
         <groupId>com.salesforce.argus</groupId>
-        <version>2.21.1</version>
+        <version>2.21.3</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>argus-web</artifactId>

diff --git a/ArgusWebServices/pom.xml b/ArgusWebServices/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>argus</artifactId>
         <groupId>com.salesforce.argus</groupId>
-        <version>2.21.1</version>
+        <version>2.21.3</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>argus-webservices</artifactId>

diff --git a/SPECS/argus-client.spec b/SPECS/argus-client.spec
@@ -3,7 +3,7 @@
 #
 BuildArch:     noarch
 Name:          argusclient
-Version:       4.40
+Version:       4.42
 Release:       1
 License:       BSD-3-Clause
 Group:         Applications/System

diff --git a/SPECS/argus-ui.spec b/SPECS/argus-ui.spec
@@ -3,7 +3,7 @@
 #
 BuildArch:     noarch
 Name:          argusui
-Version:       4.40
+Version:       4.42
 Release:       1
 License:       BSD-3-Clause
 Group:         Applications/System

diff --git a/SPECS/argus-webservices.spec b/SPECS/argus-webservices.spec
@@ -3,7 +3,7 @@
 #
 BuildArch:     noarch
 Name:          argusws
-Version:       4.40
+Version:       4.42
 Release:       1 
 License:       BSD-3-Clause
 Group:         Applications/System

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.salesforce.argus</groupId>
     <artifactId>argus</artifactId>
-    <version>2.21.1</version>
+    <version>2.21.3</version>
     <packaging>pom</packaging>
 
     <name>Argus</name>
@@ -118,7 +118,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
         <dockerImages.base.name>salesforce</dockerImages.base.name>
-        <project.version>2.21.1</project.version>
+        <project.version>2.21.3</project.version>
         <logback.version>1.2.3</logback.version>
         <jackson.version>2.9.5</jackson.version>
         <httpclient.version>4.5.3</httpclient.version>
@@ -438,7 +438,7 @@
         <repository>
             <id>ossrh</id>
             <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-        </repository>        
+        </repository>
     </distributionManagement>
 
 </project>
diff --git a/project.version b/project.version
@@ -1 +1 @@
-export PROJECT_VERSION=2.21.1
+export PROJECT_VERSION=2.21.3