summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2018-07-10 12:46:04 +0000
committerGerrit Code Review <gerrit@onap.org>2018-07-10 12:46:04 +0000
commit4920980d7a90a5b66094d7c8ee34dc0d93d1ee4c (patch)
tree702a37205773bb2385c4b3d4ada63fc09fd3c0fb
parentda923d791ae2e3ca67dd9711e7c3f173b500abce (diff)
parent5906f30661e9d7697549b41951d6473ba25f866a (diff)
Merge "Change JRuby and Websocket version"
-rw-r--r--core/core-infrastructure/pom.xml4
-rw-r--r--packages/apex-pdp-package-full/pom.xml2
-rw-r--r--plugins/plugins-executor/plugins-executor-jruby/pom.xml2
3 files changed, 4 insertions, 4 deletions
diff --git a/core/core-infrastructure/pom.xml b/core/core-infrastructure/pom.xml
index 84548c7e2..e314052b3 100644
--- a/core/core-infrastructure/pom.xml
+++ b/core/core-infrastructure/pom.xml
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.java-websocket</groupId>
<artifactId>Java-WebSocket</artifactId>
- <version>1.3.4</version>
+ <version>1.3.8</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
@@ -45,4 +45,4 @@
<artifactId>gson</artifactId>
</dependency>
</dependencies>
-</project> \ No newline at end of file
+</project>
diff --git a/packages/apex-pdp-package-full/pom.xml b/packages/apex-pdp-package-full/pom.xml
index ef8766117..890f9f55e 100644
--- a/packages/apex-pdp-package-full/pom.xml
+++ b/packages/apex-pdp-package-full/pom.xml
@@ -500,4 +500,4 @@
</build>
</profile>
</profiles>
-</project> \ No newline at end of file
+</project>
diff --git a/plugins/plugins-executor/plugins-executor-jruby/pom.xml b/plugins/plugins-executor/plugins-executor-jruby/pom.xml
index c9f72fc07..fbe924aaa 100644
--- a/plugins/plugins-executor/plugins-executor-jruby/pom.xml
+++ b/plugins/plugins-executor/plugins-executor-jruby/pom.xml
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby</artifactId>
- <version>9.2.0.0</version>
+ <version>9.1.2.0</version>
<exclusions>
<exclusion>
<groupId>org.jruby.extras</groupId>