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

Reconcile 5.0-development and release/5.0.x #1735

Closed
Tracked by #1704
joschi opened this issue Jan 10, 2021 · 6 comments
Closed
Tracked by #1704

Reconcile 5.0-development and release/5.0.x #1735

joschi opened this issue Jan 10, 2021 · 6 comments
Assignees
@arteam
Milestone
5.0.0

Comments

@joschi
Copy link
Member

joschi commented Jan 10, 2021

The 5.0-development and release/5.0.x have diverged and need to be reconciled (by merging 5.0-development into release/5.0.x)

In the future, only the release/5.0.x branch should be used.
@joschi joschi added this to the 5.0.0 milestone Jan 10, 2021
@joschi joschi mentioned this issue Jan 10, 2021
Closed
3 tasks
@hdost
Copy link

hdost commented Feb 25, 2021

Of the two which is considered to be more up to date?

@joschi
Copy link
Member Author

joschi commented Feb 25, 2021

@hdost 5.0-development has more up-to-date commits right now.

joschi added a commit that referenced this issue Feb 28, 2021
@joschi
Merge branch '5.0-development' into release/5.0.x
4b1e128 
Conflicts:
	docs/pom.xml
	metrics-annotation/pom.xml
	metrics-benchmarks/pom.xml
	metrics-bom/pom.xml
	metrics-collectd/pom.xml
	metrics-collectd/src/test/java/io/dropwizard/metrics5/collectd/CollectdReporterTest.java
	metrics-core/pom.xml
	metrics-core/src/main/java/io/dropwizard/metrics5/MetricRegistry.java
	metrics-ehcache/pom.xml
	metrics-graphite/pom.xml
	metrics-healthchecks/pom.xml
	metrics-httpasyncclient/pom.xml
	metrics-httpclient/pom.xml
	metrics-httpclient5/pom.xml
	metrics-httpclient5/src/test/java/io/dropwizard/metrics5/httpclient5/InstrumentedHttpAsyncClientsTest.java
	metrics-httpclient5/src/test/java/io/dropwizard/metrics5/httpclient5/InstrumentedHttpClientsTest.java
	metrics-jcache/pom.xml
	metrics-jcstress/pom.xml
	metrics-jdbi/pom.xml
	metrics-jdbi3/pom.xml
	metrics-jersey2/pom.xml
	metrics-jetty9/pom.xml
	metrics-jetty9/src/main/java/io/dropwizard/metrics5/jetty9/InstrumentedHttpChannelListener.java
	metrics-jetty9/src/test/java/io/dropwizard/metrics5/jetty9/InstrumentedHttpChannelListenerTest.java
	metrics-jmx/pom.xml
	metrics-json/pom.xml
	metrics-jvm/pom.xml
	metrics-log4j2/pom.xml
	metrics-logback/pom.xml
	metrics-servlet/pom.xml
	metrics-servlets/pom.xml
	pom.xml

Refs #1735
@joschi
Copy link
Member Author

joschi commented Feb 28, 2021

I've tried my best to get the changes from 5.0-development into release/5.0.x in 4b1e128.

@arteam Please check if the merge commit contains all relevant changes.

joschi added a commit that referenced this issue Feb 28, 2021
@joschi
Merge branch 'release/4.2.x' into release/5.0.x
88ddc44 
Conflicts:
	metrics-caffeine/pom.xml
	metrics-graphite/pom.xml
	metrics-jersey2/pom.xml
	metrics-jersey3/pom.xml
	metrics-jvm/src/test/java/com/codahale/metrics/jvm/FileDescriptorRatioGaugeTest.java

Refs #1735
@arteam
Copy link
Member

arteam commented Feb 28, 2021

LGTM!

@joschi
Copy link
Member Author

joschi commented Mar 4, 2021

Closed via 4b1e128 and 88ddc44.

@joschi joschi closed this as completed Mar 4, 2021
@hdost
Copy link

hdost commented Mar 4, 2021

Should 5.0-development be deleted?

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

@arteam arteam

Labels
None yet
Projects
None yet
Milestone
5.0.0
Development

No branches or pull requests
3 participants
@joschi @hdost @arteam