diff --git a/saaj-ri/pom.xml b/saaj-ri/pom.xml
index 019bd15..9cebe5c 100644
--- a/saaj-ri/pom.xml
+++ b/saaj-ri/pom.xml
@@ -251,6 +251,7 @@
                 </plugins>
             </build>
         </profile>
+
         <profile>
             <id>jdk9-setup</id>
             <activation>
@@ -258,11 +259,59 @@
             </activation>
             <build>
                 <plugins>
-                    <plugin>
+                   <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>prepare-endorsed</id>
+                                <phase>validate</phase>
+                                <goals>
+                                    <goal>copy-dependencies</goal>
+                                </goals>
+                                <configuration>
+                                    <skip>${maven.endorsed.skip}</skip>
+                                    <outputDirectory>${endorsed.dir}</outputDirectory>
+                                    <silent>false</silent>
+                                    <includeArtifactIds>stax-ex,mimepull,javax.xml.soap-api</includeArtifactIds>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                   <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-compiler-plugin</artifactId>
-                        <configuration>
-                            <release>7</release>
-                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>default-compile</id>
+                                <configuration>
+                                    <jdkToolchain>
+                                        <version>9</version>
+                                    </jdkToolchain>
+                                    <source>9</source>
+                                    <target>9</target>
+                                    <includes>
+                                        <include>module-info.java</include>
+                                    </includes>
+                                </configuration>
+                            </execution>
+                             <execution>
+                                <id>base-compile</id>
+                                <goals>
+                                    <goal>compile</goal>
+                                </goals>
+                                <configuration>
+                                    <source>1.7</source>
+                                    <target>1.7</target>
+                                    <jdkToolchain>
+                                        <version>1.7</version>
+                                    </jdkToolchain>
+                                    <excludes>
+                                        <exclude>module-info.java</exclude>
+                                    </excludes>
+                                </configuration>
+                            </execution>
+                       </executions>
                     </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
@@ -442,12 +491,12 @@
             <dependency>
                 <groupId>org.jvnet.mimepull</groupId>
                 <artifactId>mimepull</artifactId>
-                <version>1.9.7</version>
+                <version>1.9.8-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.jvnet.staxex</groupId>
                 <artifactId>stax-ex</artifactId>
-                <version>1.7.8</version>
+                <version>1.7.9</version>
             </dependency>
             <dependency>
                 <groupId>junit</groupId>
diff --git a/saaj-ri/src/java/module-info.java b/saaj-ri/src/java/module-info.java
new file mode 100644
index 0000000..3edffee
--- /dev/null
+++ b/saaj-ri/src/java/module-info.java
@@ -0,0 +1,66 @@
+/* 
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ * 
+ * Copyright (c) 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
+ * and Distribution License("CDDL") (collectively, the "License").  You
+ * may not use this file except in compliance with the License.  You can
+ * obtain a copy of the License at
+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or LICENSE.txt.  See the License for the specific
+ * language governing permissions and limitations under the License.
+ * 
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at LICENSE.txt.
+ * 
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ * 
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ * 
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license."  If you don't indicate a single choice of license, a 
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above.  However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+*/
+
+/*
+ * Open source Reference Implementation of JSR-67: SOAP with Attachments API for Java (SAAJ MR: 1.4)
+ */
+module com.sun.xml.messaging.saaj {
+    requires java.desktop;
+    requires java.logging;
+    requires org.jvnet.mimepull;
+    requires java.xml.bind;
+    requires java.xml.soap;
+    requires org.jvnet.staxex;
+
+    exports com.sun.xml.messaging.saaj;
+    exports com.sun.xml.messaging.saaj.client.p2p;
+    exports com.sun.xml.messaging.saaj.packaging.mime;
+    exports com.sun.xml.messaging.saaj.packaging.mime.internet;
+    exports com.sun.xml.messaging.saaj.packaging.mime.util;
+    exports com.sun.xml.messaging.saaj.soap;
+    exports com.sun.xml.messaging.saaj.soap.dynamic;
+    exports com.sun.xml.messaging.saaj.soap.impl;
+    exports com.sun.xml.messaging.saaj.soap.name;
+    exports com.sun.xml.messaging.saaj.soap.ver1_1;
+    exports com.sun.xml.messaging.saaj.soap.ver1_2;
+    exports com.sun.xml.messaging.saaj.util;
+    exports com.sun.xml.messaging.saaj.util.stax;
+    exports com.sun.xml.messaging.saaj.util.transform;
+}