Skip to content

Flatten repositories from JEP-229 plugins#802

Merged
Vlatombe merged 5 commits into
jenkinsci:masterfrom
Vlatombe:flatten-repositories
Jul 6, 2023
Merged

Flatten repositories from JEP-229 plugins#802
Vlatombe merged 5 commits into
jenkinsci:masterfrom
Vlatombe:flatten-repositories

Conversation

@Vlatombe

@Vlatombe Vlatombe commented Jul 6, 2023

Copy link
Copy Markdown
Member

This workarounds mojohaus/flatten-maven-plugin#362

and strips <repositories> from deployed pom for plugins using JEP-229.

Testing done

### Submitter checklist
- [X] Make sure you are opening from a **topic/feature/bugfix branch** (right side) and not your main branch!
- [X] Ensure that the pull request title represents the desired changelog entry
- [X] Please describe what you did
- [ ] Link to relevant issues in GitHub or Jira
- [ ] Link to relevant pull requests, esp. upstream and downstream changes
- [ ] Ensure you have provided tests - that demonstrates feature works or fixes the issue

This workarounds mojohaus/flatten-maven-plugin#362

and strips <repositories> from deployed pom for plugins using JEP-229
@Vlatombe
Vlatombe requested a review from jglick July 6, 2023 11:56

@jglick jglick left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would also be great to have an IT covering the basic build cycle of a JEP-229-based plugin unlike

-Pconsume-incrementals
-Pmight-produce-incrementals
and the validation script could do some stuff like assert that the top-level POM elements are only those in a specified list.

Comment thread pom.xml
@Vlatombe

Vlatombe commented Jul 6, 2023

Copy link
Copy Markdown
Member Author

IT covering the basic build cycle of a JEP-229-based plugin

I'll see what I can do

@Vlatombe
Vlatombe requested a review from jglick July 6, 2023 12:54
@Vlatombe Vlatombe added the bug label Jul 6, 2023

@jglick jglick left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

Comment thread src/it/cd-plugin/src/main/java/test/SampleRootAction.java Outdated
Comment thread src/it/cd-plugin/src/test/java/test/SampleRootActionTest.java Outdated
Comment thread src/it/cd-plugin/src/test/resources/test/expected.txt Outdated
assert installedPom.text.contains("<scm>")
assert !installedPom.text.contains("<properties>")
assert !installedPom.text.contains("<dependencyManagement>")
assert !installedPom.text.contains("<repositories>")

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(the point of the PR, FTR)

Comment thread src/it/cd-plugin/invoker.properties Outdated
@Vlatombe
Vlatombe merged commit 4f81ec1 into jenkinsci:master Jul 6, 2023
@Vlatombe
Vlatombe deleted the flatten-repositories branch July 6, 2023 15:21
@basil

basil commented Jul 11, 2023

Copy link
Copy Markdown
Member

@Vlatombe

Copy link
Copy Markdown
Member Author

Good point, jenkinsci/pom#464

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants