Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#314] Merge jaxb-annotate to jaxb-tools #315

Merged
merged 1 commit into from
Aug 18, 2023
Merged

[#314] Merge jaxb-annotate to jaxb-tools #315

merged 1 commit into from
Aug 18, 2023

Conversation

mattrpav
Copy link
Collaborator

No description provided.

@mattrpav mattrpav added this to the 2.0.5 milestone Aug 18, 2023
@@ -1,3 +1,4 @@
<<<<<<< HEAD
Copy link
Collaborator

Choose a reason for hiding this comment

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

Remove <<< merges flags please

<parent>
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-annotate-plugin-tests</artifactId>
<version>1.1.1-SNAPSHOT</version>
Copy link
Collaborator

Choose a reason for hiding this comment

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

wrong version that will be fixed in another commit

@@ -41,6 +41,7 @@
</developers>
<modules>
<module>jaxb-bom-parent</module>
<module>jaxb-annotate-parent</module>
Copy link
Collaborator

Choose a reason for hiding this comment

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

annotate depends on basics and mvn plugin
should be places after them

@laurentschoelens laurentschoelens merged commit 5fd7b33 into master Aug 18, 2023
@laurentschoelens
Copy link
Collaborator

Merging as is to finish merging job
Will br followed up by cleanup commits

@mattrpav mattrpav deleted the jt-314 branch August 29, 2023 00:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants