Skip to content

Commit

Permalink
update CUBA version to 7.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
zaharchenko committed Mar 3, 2019
2 parents c643878 + 81fff2b commit 7e9807e
Show file tree
Hide file tree
Showing 26 changed files with 90 additions and 583 deletions.
49 changes: 9 additions & 40 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

buildscript {
ext.cubaVersion = '6.10.2'
ext.cubaVersion = '7.0.1'
repositories {
mavenLocal()

Expand All @@ -15,6 +15,7 @@ buildscript {
}
dependencies {
classpath "com.haulmont.gradle:cuba-plugin:$cubaVersion"
classpath "com.haulmont.gradle:addon-gradle-plugin:1.0.4"
}
}

Expand All @@ -28,13 +29,12 @@ def webModule = project(":${modulePrefix}-web" )
def servletApi = 'javax.servlet:javax.servlet-api:3.1.0'


apply(plugin: 'idea')
apply(plugin: 'cuba')

cuba {
artifact {
group = 'com.haulmont.addon.search'
version = "1.3"
version = "1.4"
isSnapshot = true
}
tomcat {
Expand All @@ -48,17 +48,10 @@ dependencies {
}

def hsql = 'org.hsqldb:hsqldb:2.4.0'
allprojects {
ext {
vaadinVersion = '7.7.11.cuba.1'
}
}


configure([globalModule, coreModule, guiModule, webModule]) {
apply(plugin: 'java')
apply(plugin: 'maven')
apply(plugin: 'idea')
apply(plugin: 'cuba')
apply(plugin: 'checkstyle')

Expand All @@ -74,24 +67,6 @@ configure([globalModule, coreModule, guiModule, webModule]) {
artifacts {
archives sourceJar
}

String checkstyleConfigDir = "${rootProject.projectDir}/config/checkstyle"
checkstyle {
toolVersion = "6.2"
configFile = new File("${checkstyleConfigDir}/checkstyle.xml".toString())
configProperties = [
'checkstyleConfigDir': checkstyleConfigDir
]
reportsDir = new File("${buildDir}/checkstyle".toString())
ignoreFailures = false
}

checkstyleMain << {
def checkstyleDir = "${project.buildDir}/checkstyle".toString()
ant.xslt('in': "$checkstyleDir/main.xml",
out: "$checkstyleDir/$project.name-checkstyle.html",
style: "$checkstyleConfigDir/checkstyle.xsl")
}
}

configure(globalModule) {
Expand All @@ -118,15 +93,15 @@ configure(coreModule) {

dependencies {
compile(globalModule)
provided(servletApi)
compileOnly(servletApi)
jdbc(hsql)
testRuntime(hsql)

}

task cleanConf(description: 'Cleans up conf directory') {
doLast {
def dir = new File(cuba.tomcat.dir, "/conf/${modulePrefix}-core" )
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')
Expand All @@ -142,15 +117,15 @@ configure(coreModule) {

task createDb(dependsOn: assembleDbScripts, description: 'Creates local database', type: CubaDbCreation) {
dbms = 'hsql'
host = 'localhost'
host = 'localhost:9010'
dbName = 'search'
dbUser = 'sa'
dbPassword = ''
}

task updateDb(dependsOn: assembleDbScripts, description: 'Updates local database', type: CubaDbUpdate) {
dbms = 'hsql'
host = 'localhost'
host = 'localhost:9010'
dbName = 'search'
dbUser = 'sa'
dbPassword = ''
Expand All @@ -160,9 +135,6 @@ configure(coreModule) {
configure([guiModule, webModule]) {
dependencies {
compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.7'
compile (group: 'com.vaadin', name: 'vaadin-server', version: project.vaadinVersion) {
exclude(group: 'com.vaadin', module: 'vaadin-sass-compiler')
}
}
}

Expand All @@ -185,7 +157,7 @@ configure(webModule) {
}

dependencies {
provided(servletApi)
compileOnly(servletApi)
compile(guiModule)

}
Expand Down Expand Up @@ -213,7 +185,7 @@ configure(webModule) {

task cleanConf(description: 'Cleans up conf directory') {
doLast {
def dir = new File(cuba.tomcat.dir, "/conf/${modulePrefix}" )
def dir = new File(cuba.tomcat.dir, '/conf/${modulePrefix}')
if (dir.isDirectory()) {
ant.delete(includeemptydirs: true) {
fileset(dir: dir, includes: '**/*', excludes: 'local.app.properties')
Expand Down Expand Up @@ -246,8 +218,5 @@ task restart(dependsOn: ['stop', ":${modulePrefix}-core:deploy" , ":${modulePref
}
}

task wrapper(type: Wrapper) {
gradleVersion = '4.3.1'
}


8 changes: 0 additions & 8 deletions config/checkstyle/checkstyle-ignore.xml

This file was deleted.

193 changes: 0 additions & 193 deletions config/checkstyle/checkstyle.xml

This file was deleted.

Loading

0 comments on commit 7e9807e

Please sign in to comment.