Skip to content

Commit 63692ed

Browse files
committed
LDAP-251: Some additional tweaks to the gradle build
- Made sure Main-Class is specified in odm jar - Fixed source inclusions/exclusions for idea and eclipse plugins - Made sure idea and eclipse plugins depend on javacc task - Removed pom files from build.
1 parent 1f51dae commit 63692ed

File tree

30 files changed

+17
-2821
lines changed

30 files changed

+17
-2821
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ build
1010
*.ipr
1111
.idea
1212
*.iws
13+
pom.xml

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ext.JAVA_MODULE_SCRIPT = "${GRADLE_SCRIPT_DIR}/java-module.gradle"
1616
ext.MAVEN_DEPLOYMENT_SCRIPT = "${GRADLE_SCRIPT_DIR}/maven-deployment.gradle"
1717
ext.JAVA_SCRIPT = "${GRADLE_SCRIPT_DIR}/java.gradle"
1818

19-
ext.coreModules = subprojects.findAll { p-> (!p.name.contains("test") && !p.name.contains("sample")) || p.name == "spring-ldap-test" }
19+
ext.coreModules = subprojects.findAll { p-> (!p.name.contains("test") && !p.name.contains("sample") && !p.name.contains("sandbox")) || p.name == "spring-ldap-test" }
2020

2121
configure(allprojects) {
2222
apply plugin: 'propdeps'

core-tiger/pom.xml

-49
This file was deleted.

core/build.gradle

+8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@ targetCompatibility = '1.4'
33

44
apply from: 'javacc.gradle'
55

6+
idea.module.excludeDirs = [
7+
file('.gradle'),
8+
file('build/javacc'),
9+
file('build/classes'),
10+
file('build/tmp'),
11+
file('build/dependency-cache'),
12+
file('build/libs')]
13+
614
dependencies {
715
compile "commons-logging:commons-logging:$commonsLoggingVersion",
816
"commons-lang:commons-lang:$commonsLangVersion",

core/javacc.gradle

+3-1
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,6 @@ sourcesJar {
6060
}
6161

6262
sourcesJar.dependsOn javacc
63-
compileJava.dependsOn javacc
63+
compileJava.dependsOn javacc
64+
ideaModule.dependsOn javacc
65+
eclipseClasspath.dependsOn javacc

core/pom.xml

-105
This file was deleted.

gradle/java-module.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jar {
1919
manifest.attributes["Implementation-Title"] = project.name
2020
manifest.attributes["Implementation-Version"] = project.version
2121

22-
from("${rootProject.projectDir}/src/dist") {
22+
from("${rootProject.projectDir}") {
2323
include "license.txt"
2424
include "notice.txt"
2525
into "META-INF"

ldif/ldif-batch/pom.xml

-45
This file was deleted.

ldif/ldif-core/pom.xml

-39
This file was deleted.

ldif/pom.xml

-19
This file was deleted.

odm/build.gradle

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
jar {
2+
manifest.attributes["Main-Class"] = "org.springframework.ldap.odm.tools.SchemaToJava"
3+
}
14

25
dependencies {
36
compile project(":spring-ldap-core"),

0 commit comments

Comments
 (0)