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.

Sign up for GitHub

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

Jump to bottom

Upgrade to Jetty 12 ee8 #341

Closed
wants to merge 18 commits into from
Closed

Upgrade to Jetty 12 ee8 #341

wants to merge 18 commits into from

Conversation

olamy
Copy link
Member

@olamy olamy commented Aug 16, 2023

Signed-off-by: Olivier Lamy olamy@apache.org

@olamy olamy mentioned this pull request Aug 31, 2023
Closed
@oleg-nenashev oleg-nenashev mentioned this pull request Nov 12, 2023
Open
basil
basil requested changes May 6, 2024
View reviewed changes
Copy link
Member

@basil basil left a comment

Choose a reason for hiding this comment

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

Please take a moment and address the merge conflicts of your pull request. Thanks!

olamy added 3 commits May 7, 2024 10:28
@olamy
Upgrade to Jetty 12 ee8
eac813c 
Signed-off-by: Olivier Lamy <olamy@apache.org>
@olamy
minimum is now Java 17 with Jetty 12
452d7af 
Signed-off-by: Olivier Lamy <olamy@apache.org>
@olamy
bump version to 7.x as it is a big change
bd7c683 
Signed-off-by: Olivier Lamy <olamy@apache.org>
@olamy
Copy link
Member Author

olamy commented May 7, 2024

fixed.

basil
basil reviewed May 7, 2024
View reviewed changes
Jenkinsfile Outdated Show resolved Hide resolved
pom.xml Outdated Show resolved Hide resolved
pom.xml Outdated Show resolved Hide resolved
src/main/java/winstone/HostConfiguration.java Show resolved Hide resolved
src/main/java/winstone/HostConfiguration.java Outdated Show resolved Hide resolved
src/main/java/winstone/HostConfiguration.java Outdated Show resolved Hide resolved
src/main/java/winstone/HostConfiguration.java Outdated Show resolved Hide resolved
src/main/java/winstone/HostConfiguration.java Outdated Show resolved Hide resolved
src/main/java/winstone/HostConfiguration.java Outdated Show resolved Hide resolved
src/main/java/winstone/accesslog/SimpleAccessLogger.java Outdated Show resolved Hide resolved
@olamy
Copy link
Member Author

olamy commented May 7, 2024

what about setup spotless for winstone?
Discussing and fixing extra spaces is an absolute waste of time.

@olamy
Copy link
Member Author

olamy commented May 7, 2024 •
edited
Loading

spotless #380

@basil
Copy link
Member

basil commented May 8, 2024

I have merged master into this branch and resolved the five issues related to unnecessary stylistic changes. The other feedback remains.

@olamy
Copy link
Member Author

olamy commented May 8, 2024

I have merged master into this branch and resolved the five issues related to unnecessary stylistic changes. The other feedback remains.

thanks for that!

a bit busy. So I will try to look at other comments, but probably not before the end of the week.

@basil
Copy link
Member

basil commented May 8, 2024

Thanks @olamy! In the absence of an update next week, I will assume you are no longer interested in contributing to this project, either through code or through feedback.

olamy and others added 3 commits May 9, 2024 07:38
@olamy @basil
Update Jenkinsfile
9dd6e1a 
Co-authored-by: Basil Crow <me@basilcrow.com>
@olamy
after review changes
df6cfee 
Signed-off-by: Olivier Lamy <olamy@apache.org>
@basil
Merge branch 'master' into jetty-12
56288e4
basil
basil requested changes May 9, 2024
View reviewed changes
pom.xml Show resolved Hide resolved
pom.xml Outdated Show resolved Hide resolved
pom.xml Outdated Show resolved Hide resolved
pom.xml Outdated Show resolved Hide resolved
src/main/java/winstone/accesslog/SimpleAccessLogger.java Outdated Show resolved Hide resolved
src/main/java/winstone/accesslog/SimpleAccessLogger.java Show resolved Hide resolved
src/main/java/winstone/HostConfiguration.java Outdated Show resolved Hide resolved
olamy and others added 3 commits May 10, 2024 06:55
@olamy
fix my bad merge
cf2a6ad 
Signed-off-by: Olivier Lamy <olamy@apache.org>
@olamy
very important fix
4128588 
Signed-off-by: Olivier Lamy <olamy@apache.org>
@olamy @basil
Update pom.xml
f5bc197 
Co-authored-by: Basil Crow <me@basilcrow.com>
@olamy
Copy link
Member Author

olamy commented May 9, 2024

my bad merge should be fixed. sorry for that.

basil
basil reviewed May 15, 2024
View reviewed changes
Copy link
Member

@basil basil left a comment

Choose a reason for hiding this comment

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

This is looking really close to finished! Very nice!

pom.xml Show resolved Hide resolved
pom.xml Show resolved Hide resolved
src/main/java/winstone/HostConfiguration.java Outdated Show resolved Hide resolved
src/main/java/winstone/HostConfiguration.java Outdated Show resolved Hide resolved
src/main/java/winstone/HostConfiguration.java Show resolved Hide resolved
src/main/java/winstone/accesslog/SimpleAccessLogger.java Show resolved Hide resolved
src/main/java/winstone/accesslog/SimpleAccessLogger.java Show resolved Hide resolved
olamy added 7 commits May 29, 2024 06:38
@olamy
Merge branch 'master' into jetty-12
c03f19d
@olamy
Jetty 12 in README
bb9a621 
Signed-off-by: Olivier Lamy <olamy@apache.org>
@olamy
add comment
4dce06e 
Signed-off-by: Olivier Lamy <olamy@apache.org>
@olamy
non used parameter
ab220a5 
Signed-off-by: Olivier Lamy <olamy@apache.org>
@olamy
fix compilation, committing suggestion is a pain as always generate e…
b1be31a 
…rror

Signed-off-by: Olivier Lamy <olamy@apache.org>
@olamy
no comment
0fb6a2d 
Signed-off-by: Olivier Lamy <olamy@apache.org>
@olamy
NPE free
50acc0a 
Signed-off-by: Olivier Lamy <olamy@apache.org>
@olamy olamy marked this pull request as ready for review May 29, 2024 05:35
@olamy
Copy link
Member Author

olamy commented May 30, 2024

After few weeks of answering comments, I consider this PR as ready except real technical issue.
It's time to move forward.

basil
basil requested changes May 30, 2024
View reviewed changes
Copy link
Member

@basil basil left a comment

Choose a reason for hiding this comment

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

Blocking until my comments are addressed not only in this PR, but also in jenkinsci/jenkins#8380.

@olamy
Copy link
Member Author

olamy commented May 30, 2024

fair enough. I gave my opinion you do not consider it.
So I'm closing this PR and don't want to have to deal with anymore. I'm sick and tired of wasting my time.

@olamy olamy closed this May 30, 2024
@olamy olamy mentioned this pull request May 30, 2024
Closed
@olamy olamy deleted the jetty-12 branch June 26, 2024 02:20
@olamy
Copy link
Member Author

olamy commented Jun 26, 2024

I have deleted the branch in this repo as it looks the code from this PR have copied without any friendly attribution over another PR #383
backup is available here https://github.com/olamy/winstone/tree/jetty-12

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

@basil basil basil requested changes

Assignees
No one assigned
Labels
enhancement work-in-progress
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@olamy @basil