解决问题 alibaba#5

支持JDK9
duanshuaimin · Dec 3, 2017 · fb72a8b · fb72a8b
1 parent edbb19e
commit fb72a8b
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -132,7 +132,7 @@ Based on this I am through the JDK6 provided Instrumentation-API implementation
 
 
 #### Provides a plug-and-play module management container
-In order to realize the dynamic hot-swapping of the sandbox module, the container client and the sandbox dynamic pluggable container communicate with the HTTP protocol. The bottom layer uses Jetty6 as the HTTP server.
+In order to realize the dynamic hot-swapping of the sandbox module, the container client and the sandbox dynamic pluggable container communicate with the HTTP protocol. The bottom layer uses Jetty8 as the HTTP server.
 
 ### What can the JVM-SANDBOX do？
 

diff --git a/doc/JVM-SANDBOX-ReadMe-Chineies.md b/doc/JVM-SANDBOX-ReadMe-Chineies.md
@@ -29,7 +29,7 @@
 基于此我通过JDK6所提供的Instrumentation-API实现了利用HotSwap技术在不重启JVM的情况下实现对任意方法的AOP增强。而且性能开销还在可以接受的范围之内。
 
 #####2. 动态可插拔容器
-为了实现沙箱模块的动态热插拔，容器客户端和沙箱动态可插拔容器采用HTTP协议进行通讯，底层用Jetty6作为HTTP服务器。
+为了实现沙箱模块的动态热插拔，容器客户端和沙箱动态可插拔容器采用HTTP协议进行通讯，底层用Jetty8作为HTTP服务器。
 
 #### What can the JVM-SANDBOX do？
 

diff --git a/doc/JVM-SANDBOX-ReadMe-English.md b/doc/JVM-SANDBOX-ReadMe-English.md
@@ -38,7 +38,7 @@ Based on this I am through the JDK6 provided Instrumentation-API implementation
 
 
 ##### Provides a plug-and-play module management container
-In order to realize the dynamic hot-swapping of the sandbox module, the container client and the sandbox dynamic pluggable container communicate with the HTTP protocol. The bottom layer uses Jetty6 as the HTTP server.
+In order to realize the dynamic hot-swapping of the sandbox module, the container client and the sandbox dynamic pluggable container communicate with the HTTP protocol. The bottom layer uses Jetty8 as the HTTP server.
 
 #### What can the JVM-SANDBOX do？
 

diff --git a/pom.xml b/pom.xml
@@ -177,17 +177,17 @@
             <dependency>
                 <groupId>org.ow2.asm</groupId>
                 <artifactId>asm</artifactId>
-                <version>5.0.3</version>
+                <version>6.0</version>
             </dependency>
             <dependency>
                 <groupId>org.ow2.asm</groupId>
                 <artifactId>asm-commons</artifactId>
-                <version>5.0.3</version>
+                <version>6.0</version>
             </dependency>
             <dependency>
                 <groupId>org.ow2.asm</groupId>
                 <artifactId>asm-util</artifactId>
-                <version>5.0.3</version>
+                <version>6.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
@@ -202,6 +202,12 @@
                 <version>1.7.0</version>
             </dependency>
 
+            <dependency>
+                <groupId>javax.annotation</groupId>
+                <artifactId>javax.annotation-api</artifactId>
+                <version>1.3.1</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 

diff --git a/sandbox-core/pom.xml b/sandbox-core/pom.xml
@@ -123,5 +123,9 @@
             <groupId>ant</groupId>
             <artifactId>ant</artifactId>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/sandbox-core/src/main/java/com/alibaba/jvm/sandbox/core/classloader/ModuleClassLoader.java b/sandbox-core/src/main/java/com/alibaba/jvm/sandbox/core/classloader/ModuleClassLoader.java
@@ -52,7 +52,8 @@ private ModuleClassLoader(final File moduleJarFile,
                 new Routing(
                         sandboxClassLoader,
                         "^com\\.alibaba\\.jvm\\.sandbox\\.api\\..*",
-                        "^javax\\.servlet\\..*"
+                        "^javax\\.servlet\\..*",
+                        "^javax\\.annotation\\.Resource*$"
                 )
         );
         this.checksumCRC32 = FileUtils.checksumCRC32(moduleJarFile);

diff --git a/sandbox-debug-module/pom.xml b/sandbox-debug-module/pom.xml
@@ -73,6 +73,11 @@
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
         <!-- 这个是DEBUG模块独有的，所以单独配置并指定了版本 -->
         <dependency>

diff --git a/sandbox-mgr-module/pom.xml b/sandbox-mgr-module/pom.xml
@@ -61,6 +61,11 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
 </project>