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

Papyrus Issue #471 #480

Merged
merged 202 commits into from
Feb 7, 2024
Merged

Papyrus Issue #471 #480

merged 202 commits into from
Feb 7, 2024

Conversation

eposse
Copy link
Collaborator

@eposse eposse commented Sep 27, 2023

This PR includes both the upgrade to Papyrus 6.5 and the patch to all dependencies to upgrade log4j1 to log4j2.

Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
Reorganize the patch folder to accommodate patching many features and
plugins, by matching the directory structure in the Papyrus source git
repo.

Furthermore, we define separate folders for other things that may need
patching, like Xtext and EMF Compare

Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
... to update Log4j version

Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
o.e.xtext.ide

Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
xtext.buildship

Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
(part 2)

Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
@eposse
Copy link
Collaborator Author

eposse commented Nov 23, 2023

An update:

I got the GitHub build working. I haven't yet tested the resulting artifacts, but you might start your own tests. You can get the RPM and ZIP files here.

I expect there will be a few issues. I will be testing myself in the next few days.

Let me know of any issues that you run into.

eposselumenix and others added 20 commits November 27, 2023 17:15
Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
bug

Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
branch

Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
@eposse eposse mentioned this pull request Jan 30, 2024
GEF p2 repo changed

Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
Signed-off-by: Ernesto Posse <ernesto.posse@lumenix.com>
@eposse eposse changed the base branch from papyrus to papyruscx-3 February 7, 2024 21:29
@eposse
Copy link
Collaborator Author

eposse commented Feb 7, 2024

Changed the base branch to the new papyruscx-3 branch which is meant for version 3.X.

@eposse
Copy link
Collaborator Author

eposse commented Feb 7, 2024

As discussed in #490, the changes of this PR which contain the upgrade to Papyrus 6.5 as well as the replacement of Log4j 1 with Log4J 2 in Papyrus and all its dependencies, will be merged onto the new papyruscx-3 branch, meant for version 3.X of Papyrus CX.

@eposse eposse merged commit 2303a4c into papyruscx-3 Feb 7, 2024
1 check passed
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