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

Revive java module related changes #5835

Merged
merged 2 commits into from
Jul 26, 2024
Merged

Revive java module related changes #5835

merged 2 commits into from
Jul 26, 2024

Conversation

ikhoon
Copy link
Contributor

@ikhoon ikhoon commented Jul 26, 2024 •
edited
Loading

Reapply unexpectedly overwritten changes for Java module

Related: line/gradle-scripts#184

git subrepo pull --force gradle/scripts

subrepo:
subdir: "gradle/scripts"
merged: "107037098"
upstream:
origin: "https://github.com/line/gradle-scripts"
branch: "main"
commit: "107037098"
git-subrepo:
version: "0.4.5"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "dbb99be"

@ikhoon
Revive java module related changes
d18437e 
Reapply unexpectedly overwitten changes for Java module
Related: line/gradle-scripts#184

git subrepo pull --force gradle/scripts

subrepo:
  subdir:   "gradle/scripts"
  merged:   "107037098"
upstream:
  origin:   "https://github.com/line/gradle-scripts"
  branch:   "main"
  commit:   "107037098"
git-subrepo:
  version:  "0.4.5"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "dbb99be"
@ikhoon ikhoon added the defect label Jul 26, 2024
@ikhoon ikhoon added this to the 1.29.3 milestone Jul 26, 2024
@ikhoon ikhoon marked this pull request as draft July 26, 2024 05:27
jrhee17
jrhee17 approved these changes Jul 26, 2024
View reviewed changes
Copy link
Contributor

@jrhee17 jrhee17 left a comment

Choose a reason for hiding this comment

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

👍 👍 👍

@ikhoon
git subrepo pull --force gradle/scripts
8750e52 
subrepo:
  subdir:   "gradle/scripts"
  merged:   "1f94acd56"
upstream:
  origin:   "https://github.com/line/gradle-scripts"
  branch:   "main"
  commit:   "1f94acd56"
git-subrepo:
  version:  "0.4.5"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "dbb99be"
@ikhoon ikhoon marked this pull request as ready for review July 26, 2024 05:30
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jul 26, 2024 •
edited
Loading

🔍 Build Scan® (commit: 8750e52)

Job name Status Build Scan®
build-windows-latest-jdk-21 ✅ https://ge.armeria.dev/s/gugq6zay7vuky
build-self-hosted-unsafe-jdk-8 ✅ https://ge.armeria.dev/s/sberejhatyxfs
build-self-hosted-unsafe-jdk-21-snapshot-blockhound ✅ https://ge.armeria.dev/s/x3um236u7gawm
build-self-hosted-unsafe-jdk-17-min-java-17-coverage ✅ https://ge.armeria.dev/s/hcdxba27njekc
build-self-hosted-unsafe-jdk-17-min-java-11 ✅ https://ge.armeria.dev/s/affstkdoqel7u
build-self-hosted-unsafe-jdk-17-leak ✅ https://ge.armeria.dev/s/powzqetrr4zro
build-self-hosted-unsafe-jdk-11 ✅ https://ge.armeria.dev/s/sljyvnjm2xasw
build-macos-12-jdk-21 ✅ https://ge.armeria.dev/s/byphufpsdssos

minwoox
minwoox approved these changes Jul 26, 2024
View reviewed changes
Copy link
Contributor

@minwoox minwoox left a comment

Choose a reason for hiding this comment

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

👍 👍 👍

ikhoon added a commit to ikhoon/armeria that referenced this pull request Jul 26, 2024
@ikhoon
Add line#5835
a77a325
@ikhoon ikhoon mentioned this pull request Jul 26, 2024
Merged
ikhoon added a commit that referenced this pull request Jul 26, 2024
@ikhoon
Update release notes for 1.29.3 (#5834)
42c3180 
New bug fixes are added.

- #5825
- #5824
- #5829
- #5835
@ikhoon ikhoon merged commit 8fb68c4 into line:main Jul 26, 2024
15 checks passed
@ikhoon ikhoon deleted the revive-java-module branch July 26, 2024 06:56
ikhoon added a commit that referenced this pull request Jul 26, 2024
@ikhoon
Revive java module related changes (#5835)
fe30325 
Reapply unexpectedly overwritten changes for Java module

Related: line/gradle-scripts#184

git subrepo pull --force gradle/scripts

subrepo:
  subdir:   "gradle/scripts"
  merged:   "107037098"
upstream:
  origin:   "https://github.com/line/gradle-scripts"
  branch:   "main"
  commit:   "107037098"
git-subrepo:
  version:  "0.4.5"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "dbb99be"
ikhoon added a commit that referenced this pull request Jul 26, 2024
@ikhoon
Update release notes for 1.29.3 (#5834)
a3d1cc8 
New bug fixes are added.

- #5825
- #5824
- #5829
- #5835
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@minwoox minwoox minwoox approved these changes

@jrhee17 jrhee17 jrhee17 approved these changes

@trustin trustin Awaiting requested review from trustin trustin is a code owner

Assignees
No one assigned
Labels
defect
Projects
None yet
Milestone
1.29.3
Development

Successfully merging this pull request may close these issues.
3 participants
@ikhoon @jrhee17 @minwoox