Skip to content

Commit 95bb7d0

Browse files
committed
HHH-19876 build(local plugins): fix input and output between index and jandexAwareTask
1 parent 34a3f8d commit 95bb7d0

File tree

2 files changed

+12
-17
lines changed

2 files changed

+12
-17
lines changed

local-build-plugins/src/main/java/org/hibernate/orm/post/AbstractJandexAwareTask.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public AbstractJandexAwareTask(ObjectFactory objects) {
5050
@Internal
5151
protected abstract Provider<RegularFile> getTaskReportFileReference();
5252

53-
@Nested
53+
@Internal
5454
protected abstract Property<IndexManager> getIndexManager();
5555

5656
@Nested

local-build-plugins/src/main/java/org/hibernate/orm/post/ReportGenerationPlugin.java

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,41 +27,38 @@ public void apply(Project project) {
2727
final var indexManager = project.getExtensions().create( "indexManager", IndexManager.class );
2828
indexManager.getArtifactsToProcess().from( artifactsToProcess );
2929

30+
final var indexerTask = project.getTasks().register(
31+
"buildAggregatedIndex",
32+
IndexerTask.class,
33+
task -> task.getIndexManager().set( indexManager )
34+
);
35+
3036
final var details = project.getExtensions().getByType( OrmBuildDetails.class );
3137
project.getTasks().withType( AbstractJandexAwareTask.class )
3238
.configureEach(task -> {
3339
task.getOrmBuildDetails().set( details );
3440
task.getIndexManager().set( indexManager );
41+
task.dependsOn( indexerTask );
3542
});
3643

37-
final var indexerTask = project.getTasks().register(
38-
"buildAggregatedIndex",
39-
IndexerTask.class,
40-
task -> task.getIndexManager().set( indexManager )
41-
);
42-
4344
final var incubatingTask = project.getTasks().register(
4445
"generateIncubationReport",
45-
IncubationReportTask.class,
46-
(task) -> task.dependsOn( indexerTask )
46+
IncubationReportTask.class
4747
);
4848

4949
final var deprecationTask = project.getTasks().register(
5050
"generateDeprecationReport",
51-
DeprecationReportTask.class,
52-
(task) -> task.dependsOn( indexerTask )
51+
DeprecationReportTask.class
5352
);
5453

5554
final var internalsTask = project.getTasks().register(
5655
"generateInternalsReport",
57-
InternalsReportTask.class,
58-
(task) -> task.dependsOn( indexerTask )
56+
InternalsReportTask.class
5957
);
6058

6159
final var loggingTask = project.getTasks().register(
6260
"generateLoggingReport",
63-
LoggingReportTask.class,
64-
(task) -> task.dependsOn( indexerTask )
61+
LoggingReportTask.class
6562
);
6663

6764
final var dialectConfig = project.getConfigurations()
@@ -71,7 +68,6 @@ public void apply(Project project) {
7168
"generateDialectTableReport",
7269
DialectReportTask.class,
7370
(task) -> {
74-
task.dependsOn( indexerTask );
7571
task.getDialectReportSources().from( dialectConfig );
7672
task.getSourcePackage().set( "org.hibernate.dialect" );
7773
task.getReportFile().set( project.getLayout().getBuildDirectory().file( "orm/generated/dialect/dialect-table.adoc" ) );
@@ -85,7 +81,6 @@ public void apply(Project project) {
8581
"generateCommunityDialectTableReport",
8682
DialectReportTask.class,
8783
(task) -> {
88-
task.dependsOn( indexerTask );
8984
task.getDialectReportSources().from( communityDialectConfig );
9085
task.getSourcePackage().set( "org.hibernate.community.dialect" );
9186
task.getReportFile().set( project.getLayout().getBuildDirectory().file( "orm/generated/dialect/dialect-table-community.adoc" ) );

0 commit comments

Comments
 (0)