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

Rename groupId, maven artifactId to org.jvnet.jaxb / jaxb-maven-plugin #263

Merged
merged 1 commit into from
Jun 10, 2023

Conversation

laurentschoelens
Copy link
Collaborator

Fix for GH-262
Renaming to new groupId / artifactId / packages to ignore any future changes of maven / jaxb versions (preparing the v3 jakarta migration).

As pointed in the other PR, I think starting from 2.X version, this repo should be renamed to jaxb-tools and get merged with jaxb_basics and jaxb_annotate (and any other "plugins" that are commonly used by users of this jaxb-maven-plugin).
Also jaxb_basics has some PR waiting (dependencies updates for security fixes) that could be merged in before merged in this new mainstream repo.

@mattrpav
Copy link
Collaborator

@laurentschoelens go ahead and rebase this one now, i just released 0.15.3

@laurentschoelens
Copy link
Collaborator Author

laurentschoelens commented May 13, 2023

Not an expert on rebase but I guess my new commit will do the job 😄
Found also that not all projects are updated when project is released (some of them where still in 0.15.3-SNAPSHOT). Guess the release is not done with all mvn profile)

@laurentschoelens
Copy link
Collaborator Author

@mattrpav : done highsource/jaxb2-basics#167 to jaxb2-basics to fix one issue. Guess we should do the renaming part too there (like org.jvnet.jaxb.commons package, org.jvnet.jaxb.commons groupid ?) by removing jaxb2 ref ?

@mattrpav
Copy link
Collaborator

@laurentschoelens ready for the version bump and rename change for 2.x

Be sure you have a remote tracking branch linked to your fork

$ git remove -v

Should show something like this:

origin	https://github.com/mattrpav/maven-jaxb2-plugin.git (fetch)
origin	https://github.com/mattrpav/maven-jaxb2-plugin.git (push)
upstream	https://github.com/highsource/maven-jaxb2-plugin.git (fetch)
upstream	https://github.com/highsource/maven-jaxb2-plugin.git (push)

With 'origin' as your forked repo. Do this git flow to rebase

#1 $ git checkout $branchName
#2 $ git rebase -i upstream/main
#3 (in git editor - aka vi) .. set 'p' for pick first commit
#4 .. set 's' for squash for rest of commits
#5 .. work through changes / conflicts
#6 $ git rebase --continue
#7 $ git push origin $branchName -f

Moving forward, let's name branches for the issue like this:

Example branch for issue #267

$ git checkout -b mjp-267

@laurentschoelens
Copy link
Collaborator Author

@laurentschoelens ready for the version bump and rename change for 2.x

Be sure you have a remote tracking branch linked to your fork

$ git remove -v

Should show something like this:

origin	https://github.com/mattrpav/maven-jaxb2-plugin.git (fetch)
origin	https://github.com/mattrpav/maven-jaxb2-plugin.git (push)
upstream	https://github.com/highsource/maven-jaxb2-plugin.git (fetch)
upstream	https://github.com/highsource/maven-jaxb2-plugin.git (push)

With 'origin' as your forked repo. Do this git flow to rebase

#1 $ git checkout $branchName
#2 $ git rebase -i upstream/main
#3 (in git editor - aka vi) .. set 'p' for pick first commit
#4 .. set 's' for squash for rest of commits
#5 .. work through changes / conflicts
#6 $ git rebase --continue
#7 $ git push origin $branchName -f

Moving forward, let's name branches for the issue like this:

Example branch for issue #267

$ git checkout -b mjp-267

Without the interactive rebase, that's what I did
Redoing it soon with your last commit
Ok for future branch naming

@laurentschoelens
Copy link
Collaborator Author

@laurentschoelens ready for the version bump and rename change for 2.x

Be sure you have a remote tracking branch linked to your fork

$ git remove -v

Should show something like this:

origin	https://github.com/mattrpav/maven-jaxb2-plugin.git (fetch)
origin	https://github.com/mattrpav/maven-jaxb2-plugin.git (push)
upstream	https://github.com/highsource/maven-jaxb2-plugin.git (fetch)
upstream	https://github.com/highsource/maven-jaxb2-plugin.git (push)

With 'origin' as your forked repo. Do this git flow to rebase

#1 $ git checkout $branchName
#2 $ git rebase -i upstream/main
#3 (in git editor - aka vi) .. set 'p' for pick first commit
#4 .. set 's' for squash for rest of commits
#5 .. work through changes / conflicts
#6 $ git rebase --continue
#7 $ git push origin $branchName -f

Moving forward, let's name branches for the issue like this:

Example branch for issue #267

$ git checkout -b mjp-267

Rebase done and forced push to my repository. PR updated according to latest changes.
Tested OK on JDK8 / JDK11
Next step ? Updating jaxb-basics and jaxb-annotate before merging here ?
If so, should we name jaxb-basics and jaxb-annotate with groupId like org.jvnet.jaxb.basics / org.jvnet.jaxb.annotate to avoid artifactId collision with plugin artifacts ?


import org.apache.maven.plugin.MojoExecutionException;

public interface OptionsFactory<O> {
public interface IOptionsFactory<O> {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Why rename to IOptionsFactory?

Copy link
Collaborator

@mattrpav mattrpav left a comment

Choose a reason for hiding this comment

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

LGTM

@mattrpav mattrpav merged commit 441012f into highsource:master Jun 10, 2023
@laurentschoelens laurentschoelens deleted the renaming branch September 12, 2023 07:12
froque added a commit to froque/oga-maven-plugin that referenced this pull request Nov 7, 2023
passiondev2024 pushed a commit to passiondev2024/oga-maven-plugin that referenced this pull request Apr 12, 2024
vovamushak added a commit to vovamushak/oga-maven-plugin that referenced this pull request Sep 9, 2024
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