Skip to content

Commit ebc68eb

Browse files
author
tomerc
committed
rename project names to conform to pom consistency
1 parent ad40395 commit ebc68eb

File tree

2 files changed

+17
-29
lines changed

2 files changed

+17
-29
lines changed

Diff for: build.gradle

+11-18
Original file line numberDiff line numberDiff line change
@@ -129,32 +129,32 @@ configure(extractorProjects()) {
129129
}
130130
}
131131

132-
project('api') {
132+
project('build-info-api') {
133133
description = 'JFrog Build-Info API'
134134
}
135135

136-
project('client') {
136+
project('build-info-client') {
137137
description = 'JFrog Build-Info Client'
138138
dependencies {
139-
compile project(':api')
139+
compile project(':build-info-api')
140140
compile "org.apache.httpcomponents:httpclient:4.0"
141141
compile "org.codehaus.jackson:jackson-mapper-asl:1.5.1"
142142
}
143143
}
144144

145-
project('extractor') {
145+
project('build-info-extractor') {
146146
description = 'JFrog Build-Info Extractor'
147147
dependencies {
148-
compile project(':client')
148+
compile project(':build-info-client')
149149
testCompile "org.easymock:easymockclassextension:2.5.2"
150150
}
151151
}
152152

153-
project('extractor-ivy') {
153+
project('build-info-extractor-ivy') {
154154
version = new Version(project)
155155
description = 'JFrog Build-Info Ivy Extractor'
156156
dependencies {
157-
uberJar project(':extractor')
157+
uberJar project(':build-info-extractor')
158158
uberJar "org.slf4j:slf4j-api:1.5.8"
159159
uberJar "org.aspectj:aspectjweaver:1.6.9"
160160
compile("com.google.code.findbugs:jsr305:1.3.9") {
@@ -169,21 +169,14 @@ project('extractor-ivy') {
169169
}
170170
}
171171

172-
project('extractor-gradle') {
172+
project('build-info-extractor-gradle') {
173173
apply plugin: 'groovy'
174-
repositories {
175-
add(new org.apache.ivy.plugins.resolver.IvyRepResolver()) {
176-
name = "ivyrepo"
177-
artroot = 'http://192.168.1.152:8081/artifactory/repo'
178-
ivyroot = 'http://192.168.1.152:8081/artifactory/repo'
179-
}
180-
}
181174
version = new Version(project)
182175
description = 'JFrog Build-Info Gradle Extractor'
183176

184177
dependencies {
185178
compile gradleApi()
186-
uberJar project(':extractor')
179+
uberJar project(':build-info-extractor')
187180
compile("org.codehaus.plexus:plexus-component-annotations:1.5.4") {
188181
provided: true
189182
}
@@ -205,12 +198,12 @@ project('extractor-gradle') {
205198
}
206199
}
207200

208-
project('extractor-maven3') {
201+
project('build-info-extractor-maven3') {
209202
version = new Version(project)
210203
description = 'JFrog Build-Info Maven 3 Extractor'
211204

212205
dependencies {
213-
uberJar project(':extractor')
206+
uberJar project(':build-info-extractor')
214207
compile("org.codehaus.plexus:plexus-component-annotations:1.5.4") {
215208
provided: true
216209
}

Diff for: settings.gradle

+6-11
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,11 @@
1414
* limitations under the License.
1515
*/
1616

17-
include 'api'
18-
include 'client'
19-
include 'extractor'
20-
include 'extractor-gradle'
21-
include 'extractor-ivy'
22-
include 'extractor-maven3'
17+
include 'build-info-api'
18+
include 'build-info-client'
19+
include 'build-info-extractor'
20+
include 'build-info-extractor-gradle'
21+
include 'build-info-extractor-ivy'
22+
include 'build-info-extractor-maven3'
2323

2424
rootProject.name = 'build-info'
25-
26-
rootProject.children.each {project ->
27-
project.projectDir = new File(settingsDir, "build-info-${project.name}")
28-
assert project.projectDir.isDirectory()
29-
}

0 commit comments

Comments
 (0)