Merge pull request #354 from aol/CyclopsAndCyclopsReactUpdate

Updating versions
aol · Jun 21, 2017 · 3d74793 · 3d74793
2 parents 3979e76 + 7d1859e
commit 3d74793
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 5 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,10 +1,10 @@
-version=0.91.1
+version=0.91.3
 springVersion=4.3.3.RELEASE
 springBootVersion=1.4.1.RELEASE
 jerseyVersion=2.24
 grizzlyVersion=2.3.28
-cyclopsReactVersion=2.0.0-MI7
-cyclopsVersion=9.0.0-MI2
+cyclopsReactVersion=2.0.0-RC8
+cyclopsVersion=9.0.0-MI4
 hamcrestVersion=1.3
 hibernateVersion=5.1.0.Final
 hibernateValidator=5.2.4.Final

diff --git a/...tion-register/src/main/java/com/aol/micro/server/application/registry/ManifestLoader.java b/...tion-register/src/main/java/com/aol/micro/server/application/registry/ManifestLoader.java
@@ -37,7 +37,7 @@ private Map<String, String> manifest() {
                                               .getClassLoader()
                                               .getResourceAsStream(url))
                               .map(this::getManifest)
-                              .singleOptional()
+                              .single()
                               .orElse(null);
         } catch (Exception e) {
             logger.warn("Warning : can't load manifest due to exception {}", e.getMessage());

diff --git a/micro-events/src/main/java/com/aol/micro/server/events/JobName.java b/micro-events/src/main/java/com/aol/micro/server/events/JobName.java
@@ -54,7 +54,7 @@ public String getType(Class c) {
                         .stream()
                         .flatMap(Stream::of)
                         .takeRight(1)
-                        .singleOptional()
+                        .single()
                         .map(i -> i + ".")
                         .orElse("")
                     + c.getSimpleName();

diff --git a/micro-slack/build.gradle b/micro-slack/build.gradle
@@ -8,4 +8,46 @@ dependencies {
     testCompile  'org.springframework.boot:spring-boot-starter-test:1.1.5.RELEASE'
     testCompile 'com.jayway.restassured:rest-assured:2.8.0'
 
+}
+
+modifyPom {
+    project {
+        name 'Microserver micro-slack'
+        description 'Opinionated rest microservices'
+        url 'https://github.com/aol/micro-server'
+        inceptionYear '2015'
+
+        groupId 'com.aol.microservices'
+        artifactId 'micro-slack'
+        version "$version"
+
+
+        scm {
+            url 'scm:[email protected]:aol/micro-server.git'
+            connection 'scm:[email protected]:aol/micro-server.git'
+            developerConnection 'scm:[email protected]:aol/micro-server.git'
+        }
+
+        licenses {
+            license {
+                name 'The Apache Software License, Version 2.0'
+                url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                distribution 'repo'
+            }
+        }
+
+        developers {
+            developer {
+                id 'johnmcclean-aol'
+                name 'John McClean'
+                email '[email protected]'
+            }
+            developer {
+                id 'davidartplus'
+                name 'David Guzman'
+                email '[email protected]'
+            }
+        }
+
+    }
 }