updated to 7.2.0

Author: mariodavid

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [0.7.0] - 2020-03-04
+
+### Dependencies
+- CUBA 7.2
+
 ## [0.6.0] - 2019-09-20
 
 ### Dependencies

README.md

@@ -1,7 +1,6 @@
 [ ![Download](https://api.bintray.com/packages/mariodavid/cuba-components/cuba-component-entity-soft-reference/images/download.svg) ](https://bintray.com/mariodavid/cuba-components/cuba-component-entity-soft-reference/_latestVersion)
 [![license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0)
 [![Build Status](https://travis-ci.org/mariodavid/cuba-component-entity-soft-reference.svg?branch=master)](https://travis-ci.org/mariodavid/cuba-component-entity-soft-reference)
-[![Coverage Status](https://coveralls.io/repos/github/mariodavid/cuba-component-entity-soft-reference/badge.svg)](https://coveralls.io/github/mariodavid/cuba-component-entity-soft-reference)
 
 # CUBA Platform Component - Soft References for Entities
 
@@ -17,7 +16,7 @@ Instead it is just a "weak" or "soft" reference to another entity.
 
 #### Example: Customer - Order
 
-Let's take the Customer <>--> Order example. A customer can have mutiple orders. We model that as an composition in CUBA.
+Let's take the Customer <>--> Order example. A customer can have multiple orders. We model that as an composition in CUBA.
 This means, that there will be a column "customer_id" in the Order table, which stores the primary key of the customer in
 the Order Table. For every Order, there is a Customer associated to it.
 
@@ -29,7 +28,7 @@ there will be no foreign key association on the database. Instead the following
 ### Foreign keys are valuable, why would someone not want to have them?
 
 Correct. For pretty much every case, there is no need to use soft references. Since it misses all the cool features of
-referencial integrity, there are a lot of downsides. Why do we still need them? Here is an example:
+referential integrity, there are a lot of downsides. Why do we still need them? Here is an example:
 
 #### Example: Customer - Order - Comment
 
@@ -115,5 +114,4 @@ private SoftReferenceFormFieldGenerator softReferenceFormFieldGenerator;
 protected void onInit(InitEvent event) {
     softReferenceFormFieldGenerator.initSoftReferenceFormField(form, myFormInstanceContainer, "mySoftReferenceProperty");
 }
-```
-
+```

build.gradle

@@ -1,6 +1,6 @@
 
 buildscript {
-    ext.cubaVersion = '7.1.0'
+    ext.cubaVersion = '7.2.0'
     repositories {
 
         maven {
@@ -190,9 +190,21 @@ configure([globalModule, coreModule, guiModule, webModule]) {
     test.finalizedBy(project.tasks.coberturaCheck)
 
     sourceSets {
-        main { groovy { srcDirs = ["src"] } }
-        test { groovy { srcDirs = ["test"] } }
+        main {
+            groovy { srcDirs = ["src"] }
+            // new config
+            java.outputDir = new File(project.buildDir, "classes/main")
+            groovy.outputDir = new File(project.buildDir, "classes/main")
+        }
+        test {
+            groovy { srcDirs = ["test"] }
+            // new config
+            java.outputDir = new File(project.buildDir, "classes/test")
+            groovy.outputDir = new File(project.buildDir, "classes/test")
+        }
     }
+            sourceSets.main.output.classesDirs.setFrom(new File(project.buildDir, "classes/main"))
+            sourceSets.test.output.classesDirs.setFrom(new File(project.buildDir, "classes/test"))
 }
 
 configure(globalModule) {
@@ -234,15 +246,8 @@ configure(coreModule) {
         testRuntime(hsql)
     }
 
-    task cleanConf(description: 'Cleans up conf directory') {
-        doLast {
-            def dir = new File(cuba.tomcat.dir, "/conf/${modulePrefix}-core")
-            if (dir.isDirectory()) {
-                ant.delete(includeemptydirs: true) {
-                    fileset(dir: dir, includes: '**/*', excludes: 'local.app.properties')
-                }
-            }
-        }
+    task cleanConf(description: 'Cleans up conf directory', type: Delete) {
+        delete "$cuba.appHome/${modulePrefix}-core/conf"
     }
 
     task deploy(dependsOn: [assemble, cleanConf], type: CubaDeployment) {
@@ -309,7 +314,7 @@ configure(guiModule) {
     task deployConf(type: Copy) {
         from file('src')
         include "de/diedavids/cuba/entitysoftreference/**"
-        into "$cuba.tomcat.dir/conf/${modulePrefix}"
+        into "$cuba.appHome/${modulePrefix}/conf"
     }
 }
 
@@ -337,23 +342,16 @@ configure(webModule) {
     task deployConf(type: Copy) {
         from file('src')
         include "de/diedavids/cuba/entitysoftreference/**"
-        into "$cuba.tomcat.dir/conf/${modulePrefix}"
+        into "$cuba.appHome/${modulePrefix}/conf"
     }
 
     task clearMessagesCache(type: CubaClearMessagesCache) {
         appName = "${modulePrefix}"
     }
     deployConf.dependsOn clearMessagesCache
 
-    task cleanConf(description: 'Cleans up conf directory') {
-        doLast {
-            def dir = new File(cuba.tomcat.dir, "/conf/${modulePrefix}")
-            if (dir.isDirectory()) {
-                ant.delete(includeemptydirs: true) {
-                    fileset(dir: dir, includes: '**/*', excludes: 'local.app.properties')
-                }
-            }
-        }
+    task cleanConf(description: 'Cleans up conf directory', type: Delete) {
+        delete "$cuba.appHome/${modulePrefix}/conf"
     }
 
     task deploy(dependsOn: [assemble, cleanConf], type: CubaDeployment) {
@@ -375,9 +373,9 @@ task restart(dependsOn: ['stop', ":${modulePrefix}-core:deploy", ":${modulePrefi
                 socket(server: 'localhost', port: '8787')
             }
         }
-        start.execute()
     }
 }
+restart.finalizedBy start
 
 
 apply from: 'extra.gradle'

gradle.properties

@@ -1 +1 @@
-version=0.6.6-SNAPSHOT
+version=0.7.0-SNAPSHOT

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip

modules/core/src/de/diedavids/cuba/entitysoftreference/app.properties

@@ -27,3 +27,6 @@ cuba.availableLocales = English|en
 cuba.localeSelectVisible = false
 cuba.restApiUrl = http://localhost:8080/entity-soft-reference-portal/api
 cuba.webAppUrl = http://localhost:8080/entity-soft-reference
+cuba.security.rolesPolicyVersion=1
+cuba.security.defaultPermissionValuesConfigEnabled=true
+cuba.security.minimalRoleIsDefault=false

modules/web/src/de/diedavids/cuba/entitysoftreference/web-app.properties

@@ -39,3 +39,4 @@ cuba.availableLocales = English|en
 cuba.localeSelectVisible = false
 cuba.restApiUrl = http://localhost:8080/entity-soft-reference-portal/api
 cuba.webAppUrl = http://localhost:8080/entity-soft-reference
+cuba.rest.securityScope=GENERIC_UI

studio-intellij.xml

@@ -4,5 +4,6 @@
     <option name="isOneToOneIndex" value="false" />
     <option name="isNewFkConstraintNaming" value="false" />
     <option name="isJoinedInheritanceDeleteCascade" value="false" />
+    <option name="stateVersion" value="1" />
   </component>
 </project>