File tree Expand file tree Collapse file tree 2 files changed +8
-17
lines changed
plugins/edc-build/src/main/java/org/eclipse/edc/plugins/edcbuild Expand file tree Collapse file tree 2 files changed +8
-17
lines changed Original file line number Diff line number Diff line change 1919import org .gradle .api .Plugin ;
2020import org .gradle .api .Project ;
2121import org .gradle .api .publish .maven .tasks .AbstractPublishToMaven ;
22- import org .gradle .api .tasks .TaskCollection ;
2322import org .gradle .plugins .signing .Sign ;
2423
2524import static java .util .List .of ;
@@ -51,12 +50,6 @@ public void apply(Project target) {
5150 // apply all plugins
5251 target .getPlugins ().apply (EdcBuildBasePlugin .class );
5352
54- // add task dependency to permit publication
55- var publish = target .getTasks ().findByName ("publishMavenJavaPublicationToMavenCentralRepository" );
56- if (publish != null ) {
57- publish .dependsOn ("signMavenPublication" );
58- }
59-
6053 target .getTasks ().withType (AbstractPublishToMaven .class ).configureEach (task -> {
6154 var signTasks = target .getTasks ().withType (Sign .class );
6255 task .mustRunAfter (signTasks );
Original file line number Diff line number Diff line change @@ -48,23 +48,21 @@ public void apply(Project target) {
4848
4949 var buildExt = requireExtension (target , BuildExtension .class );
5050 var shouldPublish = buildExt .getPublish ().getOrElse (DEFAULT_SHOULD_PUBLISH );
51+ var publishExtension = requireExtension (target , PublishingExtension .class );
5152
5253 if (shouldPublish ) {
53- var pe = requireExtension (target , PublishingExtension .class );
5454
55- if (pe .getPublications ().findByName (target .getName ()) == null ) {
56- pe .publications (publications -> publications .create (target .getName (), MavenPublication .class ,
57- mavenPublication -> {
58- mavenPublication .from (target .getComponents ().getByName ("java" ));
59- mavenPublication .setGroupId (buildExt .getPom ().getGroupId ());
60- mavenPublication .suppressPomMetadataWarningsFor ("testFixturesApiElements" );
61- mavenPublication .suppressPomMetadataWarningsFor ("testFixturesRuntimeElements" );
62- }));
63- }
55+ publishExtension .getPublications ().getByName ("maven" , publication -> {
56+ if (publication instanceof MavenPublication mavenPublication ) {
57+ mavenPublication .setGroupId (buildExt .getPom ().getGroupId ());
58+ }
59+ });
6460
6561 target .getExtensions ().configure (MavenPublishBaseExtension .class , extension -> {
6662 extension .publishToMavenCentral (true );
6763 });
64+ } else {
65+ publishExtension .getPublications ().clear ();
6866 }
6967 }
7068
You can’t perform that action at this time.
0 commit comments