Release 0.6.0 for cuba 7.1.0 #9

cuba-platform · Sep 3, 2019 · 0a207c7 · 0a207c7
1 parent 82519a5
commit 0a207c7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 32 deletions.
diff --git a/README.md b/README.md
@@ -17,6 +17,7 @@ JavaMelody: monitoring of JavaEE applications
 
 | Add-on        | Platform      |
 |:------------- |:------------- |
+| 0.6.0         | 7.1.0         |
 | 0.5.1         | 7.0.0         |
 | 0.4.0         | 6.10.0        |
 | 0.3.1         | 6.9.0         |
@@ -27,7 +28,7 @@ JavaMelody: monitoring of JavaEE applications
 
 1. Add custom application component to your project (change the version part if needed):
 
-    `com.haulmont.addon.cubajm:cuba-jm-global:0.5.1`
+    `com.haulmont.addon.cubajm:cuba-jm-global:0.6.0`
 
 2. Configure monitoring URLs with the `cubajm.monitoringUrl` application
 property. Default values are `/core-jm/` and `/web-jm/` for middleware

diff --git a/build.gradle b/build.gradle
@@ -16,7 +16,7 @@
  */
 
 buildscript {
-    ext.cubaVersion = '7.0.0'
+    ext.cubaVersion = '7.1.0'
     repositories {
         jcenter()
         maven { url "https://dl.bintray.com/cuba-platform/main" }
@@ -40,7 +40,7 @@ apply(plugin: 'cuba')
 cuba {
     artifact {
         group = 'com.haulmont.addon.cubajm'
-        version = '0.5.0'
+        version = '0.6.0'
         isSnapshot = true
     }
     tomcat {
@@ -75,7 +75,7 @@ dependencies {
     appComponent("com.haulmont.cuba:cuba-global:$cubaVersion")
 }
 
-def hsql = 'org.hsqldb:hsqldb:2.2.9'
+def hsql = 'org.hsqldb:hsqldb:2.4.1'
 
 configure([globalModule, coreModule, webModule, jmModule]) {
     apply(plugin: 'java')
@@ -122,7 +122,6 @@ configure(coreModule) {
     dependencies {
         compile(globalModule)
         compile(jmModule)
-        compileOnly(servletApi)
         jdbc(hsql)
         testRuntime(hsql)
     }
@@ -167,7 +166,6 @@ configure(webModule) {
 
     dependencies {
         compile(globalModule)
-        compileOnly(servletApi)
         compile(jmModule)
     }
 
@@ -212,7 +210,8 @@ configure(webModule) {
 configure(jmModule) {
     dependencies {
         compile(globalModule)
-        compile('net.bull.javamelody:javamelody-core:1.76.0')
+        compile('net.bull.javamelody:javamelody-core:1.79.0')
+        compileOnly(servletApi)
     }
 }
 

diff --git a/modules/web/web/WEB-INF/web.xml b/modules/web/web/WEB-INF/web.xml
@@ -48,11 +48,6 @@
         <servlet-class>com.haulmont.cuba.web.sys.CubaDispatcherServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
-    <servlet>
-        <servlet-name>rest_api</servlet-name>
-        <servlet-class>com.haulmont.restapi.sys.CubaRestApiServlet</servlet-class>
-        <load-on-startup>2</load-on-startup>
-    </servlet>
     <servlet-mapping>
         <servlet-name>dispatcher</servlet-name>
         <url-pattern>/dispatch/*</url-pattern>
@@ -61,10 +56,6 @@
         <servlet-name>app_servlet</servlet-name>
         <url-pattern>/*</url-pattern>
     </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>rest_api</servlet-name>
-        <url-pattern>/rest/*</url-pattern>
-    </servlet-mapping>
     <filter>
         <filter-name>cuba_filter</filter-name>
         <filter-class>com.haulmont.cuba.web.sys.CubaHttpFilter</filter-class>
@@ -74,20 +65,4 @@
         <filter-name>cuba_filter</filter-name>
         <url-pattern>/*</url-pattern>
     </filter-mapping>
-    <filter>
-        <filter-name>restSpringSecurityFilterChain</filter-name>
-        <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
-        <init-param>
-            <param-name>contextAttribute</param-name>
-            <param-value>org.springframework.web.servlet.FrameworkServlet.CONTEXT.rest_api</param-value>
-        </init-param>
-        <init-param>
-            <param-name>targetBeanName</param-name>
-            <param-value>springSecurityFilterChain</param-value>
-        </init-param>
-    </filter>
-    <filter-mapping>
-        <filter-name>restSpringSecurityFilterChain</filter-name>
-        <url-pattern>/rest/*</url-pattern>
-    </filter-mapping>
 </web-app>