Skip to content

Commit 72b5bf2

Browse files
author
admin
committed
Format code
1 parent b91cf67 commit 72b5bf2

File tree

591 files changed

+82230
-83506
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

591 files changed

+82230
-83506
lines changed

CHANGELOG.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717

1818
* Add support for domain filter blacklist pattern
1919

20-
```
21-
domain.blacklist.pattern = (\\(\\s*SELECT\\s+)|some_function
22-
```
20+
```
21+
domain.blacklist.pattern = (\\(\\s*SELECT\\s+)|some_function
22+
```
2323

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

MIGRATION.md

+24-24
Original file line numberDiff line numberDiff line change
@@ -21,46 +21,46 @@ The application build script now looks like this:
2121

2222
```gradle
2323
buildscript {
24-
ext.repos = {
25-
jcenter()
26-
mavenCentral()
27-
mavenLocal()
28-
maven { url 'https://plugins.gradle.org/m2/' }
29-
maven { url 'https://repository.axelor.com/nexus/public/' }
30-
}
31-
repositories repos
32-
dependencies {
33-
classpath "com.axelor:axelor-gradle:5.0.0-SNAPSHOT"
34-
}
24+
ext.repos = {
25+
jcenter()
26+
mavenCentral()
27+
mavenLocal()
28+
maven { url 'https://plugins.gradle.org/m2/' }
29+
maven { url 'https://repository.axelor.com/nexus/public/' }
30+
}
31+
repositories repos
32+
dependencies {
33+
classpath "com.axelor:axelor-gradle:5.0.0-SNAPSHOT"
34+
}
3535
}
3636
3737
allprojects {
38-
repositories repos
38+
repositories repos
3939
}
4040
4141
apply plugin: 'idea'
4242
apply plugin: 'eclipse'
4343
apply plugin: "com.axelor.app"
4444
4545
axelor {
46-
title = "My App"
46+
title = "My App"
4747
}
4848
4949
allprojects {
50-
apply plugin: 'idea'
51-
apply plugin: 'eclipse'
50+
apply plugin: 'idea'
51+
apply plugin: 'eclipse'
5252
53-
group = "com.axelor"
54-
version = "1.0.0"
53+
group = "com.axelor"
54+
version = "1.0.0"
5555
56-
sourceCompatibility = 1.8
57-
targetCompatibility = 1.8
56+
sourceCompatibility = 1.8
57+
targetCompatibility = 1.8
5858
}
5959
6060
dependencies {
61-
// add module dependencies
62-
compile project(":modules:my-module-1")
63-
compile project(":modules:my-module-2")
61+
// add module dependencies
62+
compile project(":modules:my-module-1")
63+
compile project(":modules:my-module-2")
6464
}
6565
```
6666

@@ -85,11 +85,11 @@ The module build scripts now looks like this:
8585
apply plugin: 'com.axelor.app-module'
8686
8787
axelor {
88-
title = "My Module 1"
88+
title = "My Module 1"
8989
}
9090
9191
dependencies {
92-
compile project(":modules:my-module-2")
92+
compile project(":modules:my-module-2")
9393
}
9494
```
9595

axelor-common/build.gradle

+18-18
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,35 @@ apply plugin: 'java'
22

33
dependencies {
44

5-
testCompile libs.junit
5+
testCompile libs.junit
66

7-
compile libs.guava
8-
compile libs.axelor_asm
7+
compile libs.guava
8+
compile libs.axelor_asm
99
}
1010

1111
configurations {
12-
runtime.exclude module: 'jsr305'
12+
runtime.exclude module: 'jsr305'
1313
}
1414

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

2121
afterEvaluate {
22-
tasks.withType(JavaCompile)*.dependsOn updateVersion
22+
tasks.withType(JavaCompile)*.dependsOn updateVersion
2323
}
2424

2525
jar {
26-
manifest {
27-
attributes('Implementation-Title': project.name,
28-
'Implementation-Version': project.version,
29-
'Implementation-Vendor': 'Axelor',
30-
'Implementation-Vendor-Id': 'com.axelor',
31-
'Implementation-Vendor-Url': 'http://axelor.com',
32-
'Specification-Title': project.name,
33-
'Specification-Version': project.version,
34-
'Specification-Vendor': 'Axelor')
35-
}
26+
manifest {
27+
attributes('Implementation-Title': project.name,
28+
'Implementation-Version': project.version,
29+
'Implementation-Vendor': 'Axelor',
30+
'Implementation-Vendor-Id': 'com.axelor',
31+
'Implementation-Vendor-Url': 'http://axelor.com',
32+
'Specification-Title': project.name,
33+
'Specification-Version': project.version,
34+
'Specification-Vendor': 'Axelor')
35+
}
3636
}

0 commit comments

Comments
 (0)