Skip to content

Commit 4f91847

Browse files
committed
[Java] Add java-library support for POM generation with dependencies.
1 parent 1e2266c commit 4f91847

File tree

2 files changed

+14
-11
lines changed

2 files changed

+14
-11
lines changed

build.gradle

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ jar.enabled = false
113113

114114
subprojects {
115115
apply plugin: 'java'
116+
apply plugin: 'java-library'
116117
apply plugin: 'maven'
117118
apply plugin: 'signing'
118119
apply plugin: 'checkstyle'
@@ -126,9 +127,9 @@ subprojects {
126127
dependencies {
127128
checkstyle 'com.puppycrawl.tools:checkstyle:8.14'
128129

129-
testCompile 'junit:junit:4.12'
130-
testCompile 'org.mockito:mockito-core:2.23.0'
131-
testCompile 'org.hamcrest:hamcrest-library:1.3'
130+
testImplementation 'junit:junit:4.12'
131+
testImplementation 'org.mockito:mockito-core:2.23.0'
132+
testImplementation 'org.hamcrest:hamcrest-library:1.3'
132133
}
133134

134135
checkstyle {
@@ -178,8 +179,8 @@ def validationXsdPath = project(':sbe-tool').projectDir.toString() + '/src/main/
178179

179180
project(':sbe-tool') {
180181
dependencies {
181-
compile 'org.agrona:agrona:0.9.26'
182-
testCompile files('build/classes/java/generated')
182+
api 'org.agrona:agrona:0.9.26'
183+
testImplementation files('build/classes/java/generated')
183184
}
184185

185186
jar {
@@ -267,7 +268,7 @@ project(':sbe-all') {
267268
apply plugin: 'com.github.johnrengelman.shadow'
268269

269270
dependencies {
270-
compile project(':sbe-tool')
271+
implementation project(':sbe-tool')
271272
}
272273

273274
task sourcesJar(type: Jar) {
@@ -342,9 +343,9 @@ project(':sbe-all') {
342343

343344
project(':sbe-samples') {
344345
dependencies {
345-
compile project(':sbe-tool')
346+
implementation project(':sbe-tool')
346347

347-
compile files('build/classes/java/generated')
348+
implementation files('build/classes/java/generated')
348349
}
349350

350351
sourceSets {
@@ -434,10 +435,10 @@ project(':sbe-benchmarks') {
434435
apply plugin: 'com.github.johnrengelman.shadow'
435436

436437
dependencies {
437-
compile project(':sbe-tool')
438-
compile 'org.openjdk.jmh:jmh-core:1.21'
438+
implementation project(':sbe-tool')
439+
implementation 'org.openjdk.jmh:jmh-core:1.21'
439440
annotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:1.21'
440-
compile files('build/classes/java/generated')
441+
implementation files('build/classes/java/generated')
441442
}
442443

443444
sourceSets {

settings.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
include 'sbe-tool', 'sbe-samples', 'sbe-benchmarks', 'sbe-all'
22
rootProject.name = 'sbe'
3+
enableFeaturePreview('IMPROVED_POM_SUPPORT')
4+

0 commit comments

Comments
 (0)