Skip to content

Conversation

vy
Copy link
Member

@vy vy commented Dec 28, 2022

This PR has certain requirements:

  • .asf.yaml in master needs to be updated
  • These changes are based on the work delivered in Simplify site generation #1166 simplifying the site generation. Hence, that PR needs to be merged first!

vy added 30 commits December 27, 2022 13:13
@ppkarwasz
Copy link
Contributor

@vy,

Can you merge #1166 first? It is hard to find the actual PR if there are 2000 files changed.

@vy
Copy link
Member Author

vy commented Dec 28, 2022

Can you merge #1166 first? It is hard to find the actual PR if there are 2000 files changed.

I would love to! I am waiting for INFRA-23996 to merge #1145, #1166, and this one in order.

That said, PR is indeed not in a reviewable state – I will nudge PMC once it is.

@rgoers
Copy link
Member

rgoers commented Dec 28, 2022

Why is anything from infra required to do the merges? We don't require automation. If we need to do a release we can still do it manually. #1145 should be able to be merged now. I did not add a changes entry for my last commit because I am waiting for it to be merged so please merge it asap.

@vy vy force-pushed the switch-from-jira-to-github-issues branch from d263640 to c243832 Compare December 30, 2022 10:47
@vy vy changed the base branch from release-2.x to mvn-site-simplified January 9, 2023 08:08
@jvz
Copy link
Member

jvz commented Jan 13, 2023

I've enabled GitHub issues. You can merge this down whenever you're ready.

@jvz jvz added the build Affects the build system or other automation label Jan 14, 2023
@jvz jvz added this to the 2.20.0 milestone Jan 14, 2023
Base automatically changed from mvn-site-simplified to release-2.x January 16, 2023 18:37
vy added 5 commits January 16, 2023 19:49
…ra-to-github-issues

# Conflicts:
#	BUILDING.md
#	CHANGELOG.adoc
#	README.md
#	log4j-samples/pom.xml
#	pom.xml
#	src/changelog/.2.x.x/LOG4J2-2678_Add_LogEvent_timestamp_to_ProducerRecord_in_KafkaAppender.xml
#	src/changelog/.2.x.x/LOG4J2-3631_Fix_Configurator_setLevel_for_internal_classes.xml
#	src/changelog/.2.x.x/LOG4J2-3634_Fix_level_propagation_in_Log4jBridgeHandler.xml
#	src/changelog/.changelog-entries.adoc.ftl
#	src/site/markdown/support.md
#	src/site/site.xml
@vy vy merged commit bb3c7c1 into release-2.x Jan 16, 2023
@vy vy deleted the switch-from-jira-to-github-issues branch January 16, 2023 18:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build Affects the build system or other automation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants