Skip to content

Commit

Permalink
Format code
Browse files Browse the repository at this point in the history
  • Loading branch information
admin committed Aug 21, 2018
1 parent b91cf67 commit 72b5bf2
Show file tree
Hide file tree
Showing 591 changed files with 82,230 additions and 83,506 deletions.
6 changes: 3 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@

* Add support for domain filter blacklist pattern

```
domain.blacklist.pattern = (\\(\\s*SELECT\\s+)|some_function
```
```
domain.blacklist.pattern = (\\(\\s*SELECT\\s+)|some_function
```

The old `domain.allow.sub-select` settings is removed in favor of this one.

Expand Down
48 changes: 24 additions & 24 deletions MIGRATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,46 +21,46 @@ The application build script now looks like this:

```gradle
buildscript {
ext.repos = {
jcenter()
mavenCentral()
mavenLocal()
maven { url 'https://plugins.gradle.org/m2/' }
maven { url 'https://repository.axelor.com/nexus/public/' }
}
repositories repos
dependencies {
classpath "com.axelor:axelor-gradle:5.0.0-SNAPSHOT"
}
ext.repos = {
jcenter()
mavenCentral()
mavenLocal()
maven { url 'https://plugins.gradle.org/m2/' }
maven { url 'https://repository.axelor.com/nexus/public/' }
}
repositories repos
dependencies {
classpath "com.axelor:axelor-gradle:5.0.0-SNAPSHOT"
}
}
allprojects {
repositories repos
repositories repos
}
apply plugin: 'idea'
apply plugin: 'eclipse'
apply plugin: "com.axelor.app"
axelor {
title = "My App"
title = "My App"
}
allprojects {
apply plugin: 'idea'
apply plugin: 'eclipse'
apply plugin: 'idea'
apply plugin: 'eclipse'
group = "com.axelor"
version = "1.0.0"
group = "com.axelor"
version = "1.0.0"
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = 1.8
targetCompatibility = 1.8
}
dependencies {
// add module dependencies
compile project(":modules:my-module-1")
compile project(":modules:my-module-2")
// add module dependencies
compile project(":modules:my-module-1")
compile project(":modules:my-module-2")
}
```

Expand All @@ -85,11 +85,11 @@ The module build scripts now looks like this:
apply plugin: 'com.axelor.app-module'
axelor {
title = "My Module 1"
title = "My Module 1"
}
dependencies {
compile project(":modules:my-module-2")
compile project(":modules:my-module-2")
}
```

Expand Down
36 changes: 18 additions & 18 deletions axelor-common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,35 @@ apply plugin: 'java'

dependencies {

testCompile libs.junit
testCompile libs.junit

compile libs.guava
compile libs.axelor_asm
compile libs.guava
compile libs.axelor_asm
}

configurations {
runtime.exclude module: 'jsr305'
runtime.exclude module: 'jsr305'
}

task updateVersion() {
def versionFile = file("${projectDir}/src/main/resources/axelor-version.txt")
onlyIf { versionFile.text.trim() != project.version }
doLast { versionFile.text = project.version + "\n" }
def versionFile = file("${projectDir}/src/main/resources/axelor-version.txt")
onlyIf { versionFile.text.trim() != project.version }
doLast { versionFile.text = project.version + "\n" }
}

afterEvaluate {
tasks.withType(JavaCompile)*.dependsOn updateVersion
tasks.withType(JavaCompile)*.dependsOn updateVersion
}

jar {
manifest {
attributes('Implementation-Title': project.name,
'Implementation-Version': project.version,
'Implementation-Vendor': 'Axelor',
'Implementation-Vendor-Id': 'com.axelor',
'Implementation-Vendor-Url': 'http://axelor.com',
'Specification-Title': project.name,
'Specification-Version': project.version,
'Specification-Vendor': 'Axelor')
}
manifest {
attributes('Implementation-Title': project.name,
'Implementation-Version': project.version,
'Implementation-Vendor': 'Axelor',
'Implementation-Vendor-Id': 'com.axelor',
'Implementation-Vendor-Url': 'http://axelor.com',
'Specification-Title': project.name,
'Specification-Version': project.version,
'Specification-Vendor': 'Axelor')
}
}
Loading

0 comments on commit 72b5bf2

Please sign in to comment.