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

Revert "Revert optimization removal (#1352)" #1533

Merged
merged 2 commits into from Apr 26, 2021

Conversation

jimma
Copy link
Contributor

@jimma jimma commented Apr 9, 2021

This reverts commit 263e92e.

Copy link
Member

@lukasj lukasj left a comment

Choose a reason for hiding this comment

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

In general, this is a good start.
What needs to be done:

  • the output of the build is supposed to be multi-release jar but the execution to compile versioned sources is being removed, which is wrong
  • there are few other files to be removed in tests and in src/main/java-mr folder

@jimma
Copy link
Contributor Author

jimma commented Apr 13, 2021

@lukasj Thanks for the review. I've fixed these things. Please review this again.

* Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
=======
* Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
>>>>>>> parent of 263e92e (Revert optimization removal (#1352)):jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/FilterTransducer.java
Copy link
Member

Choose a reason for hiding this comment

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

looks like wrong merge here

Copy link
Member

@lukasj lukasj left a comment

Choose a reason for hiding this comment

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

there are also few more things which can be removed - *.bytecode package, AccessorInjector at least

@lukasj
Copy link
Member

lukasj commented Apr 26, 2021

I'll just fix/remove the rest myslef...

@lukasj lukasj merged commit a5cf4bd into eclipse-ee4j:master Apr 26, 2021
@jimma
Copy link
Contributor Author

jimma commented Apr 26, 2021

Thanks @lukasj. Are you going to back port this change to 2.3.x too ?

lukasj pushed a commit to lukasj/jaxb-ri that referenced this pull request Apr 26, 2021
…j#1533)

* Revert "Revert optimization removal (eclipse-ee4j#1352)"

This reverts commit 263e92e.

(cherry picked from commit a5cf4bd)
@lukasj
Copy link
Member

lukasj commented Apr 26, 2021

it's already there, see #1540

@jimma
Copy link
Contributor Author

jimma commented Apr 26, 2021

@lukasj Nice! Thanks.

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.

None yet

2 participants