update versions of dependencies

Author: amykang2020

mq/README

@@ -16,9 +16,7 @@ Message Queue Build Instructions
    If you are not behind a firewall, you will not need to set up a proxy.
 
 <settings>
-  <!-- Set up proxies, if needed here (commented out for now) 
-       Uncomment this section and add your proxy if you need to proxy to maven-central -->
-  <!--
+  <!-- Example proxies setup. Use your proxy setting if you need to proxy to maven-central -->
   <proxies>
      <proxy>
       <active>true</active>
@@ -27,7 +25,6 @@ Message Queue Build Instructions
         <port>80</port>
      </proxy>
   </proxies>
-  -->
 </settings>
 
 2. Unzip the source bundle and set JAVA_HOME
@@ -42,15 +39,6 @@ Message Queue Build Instructions
    set MAVEN_OPTS to "-Xmx512m -Xms256m -XX:MaxPermSize=512m".
 
 
-Message Queue Build Instructions for C Client Library
------------------------------------------------------
-1. Fill in necessary info for your platform in
-   $TOP/src/buildant/default.properties
-
-2. cd $TOP/main/packager-opensource
-   ant builddclient
-
-
 Message Queue Build Output
 --------------------------
 
@@ -105,6 +93,15 @@ Troubleshooting the Build
 
 Documentation
 -------------
-The latest documentation for Message Queue can be found on the GlassFish documentation page:
-http://glassfish.java.net/docs/index.html
+The latest documentation for Message Queue can be found at
+https://javaee.github.io/openmq/
+
+
+Appendix: Message Queue Build Instructions for C-API Client Library
+-------------------------------------------------------------------
+1. Fill in necessary info for your platform in
+   $TOP/src/buildant/default.properties
+
+2. cd $TOP/main/packager-opensource
+   ant builddclient
 

mq/main/pom.xml

@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2012-2016 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012-2017 Oracle and/or its affiliates. All rights reserved.
 
     The contents of this file are subject to the terms of either the GNU
     General Public License Version 2 only ("GPL") or the Common Development
@@ -67,7 +67,7 @@
 
     <properties>
 	<!-- Change these for each build -->
-	<build.number>5</build.number>
+	<build.number>6</build.number>
         <build.letter>a</build.letter>
 
 	<!-- Product-specific -->
@@ -85,27 +85,27 @@
 	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
 	<!-- Versions of dependencies -->
-        <hk2.version>2.5.0-b36</hk2.version>
-        <hk2.plugin.version>2.5.0-b33</hk2.plugin.version>
+        <hk2.version>2.5.0-b42</hk2.version>
+        <hk2.plugin.version>2.5.0-b42</hk2.plugin.version>
         <glassfishbuild.version>3.2.4</glassfishbuild.version>
         <glassfish.version>4.1.2</glassfish.version>
-        <grizzly.version>2.4.0-beta9</grizzly.version>
+        <grizzly.version>2.4.1</grizzly.version>
 
 	<!-- begin of websocket dependencies -->
 	<json.version>1.1</json.version>
         <tyrus.version>1.13.1</tyrus.version>
 	<!-- end of websocket dependencies -->
 
-        <servlet-api.version>4.0.0-b07</servlet-api.version>
+        <servlet-api.version>4.0.0</servlet-api.version>
         <jsp-api.version>2.3.2-b02</jsp-api.version>
         <javax.resource-api.version>1.7</javax.resource-api.version>
         <javahelp.version>2.0.06</javahelp.version>
 
         <jaf.version>1.1.1</jaf.version>
-        <javamail.version>1.6.0-rc2</javamail.version>
+        <javamail.version>1.6.0</javamail.version>
         <javax.xml.soap-api.version>1.4.0-b01</javax.xml.soap-api.version>
         <saaj-impl.version>1.4.0-b03</saaj-impl.version>
-        <junit.version>4.10</junit.version>
+        <junit.version>4.12</junit.version>
         <findbugs.skip>false</findbugs.skip>
         <findbugs.threshold>High</findbugs.threshold>
         <findbugs.exclude />

mq/src/buildcfg/version.gmk

@@ -1,7 +1,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 #
-# Copyright (c) 2010-2014 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010-2017 Oracle and/or its affiliates. All rights reserved.
 #
 # The contents of this file are subject to the terms of either the GNU
 # General Public License Version 2 only ("GPL") or the Common Development
@@ -59,7 +59,7 @@
 VERSION_NUM = 1
 
 # general version info
-JMQ_BUILD_NUMBER= 5
+JMQ_BUILD_NUMBER= 6
 JMQ_BUILD_LETTER= a
 
 #

mq/src/share/etc/com.sun.cmm.mq.xml

@@ -123,7 +123,7 @@
        The InstalledProduct's Build Number.
        --> 
        <param-name>BuildNumber</param-name>   
-       <param-value>5</param-value> 
+       <param-value>6</param-value> 
     </parameter>
 
     <parameter> 

mq/src/share/etc/template/com.sun.cmm.mq.xml

@@ -123,7 +123,7 @@
        The InstalledProduct's Build Number.
        --> 
        <param-name>BuildNumber</param-name>   
-       <param-value>5</param-value> 
+       <param-value>6</param-value> 
     </parameter>
 
     <parameter>