> On Jan 30, 2018, at 23:10, rpo...@apache.org wrote: > > Repository: logging-log4j2 > Updated Branches: > refs/heads/master b5d4655d3 -> 136dbf5b5 > > > LOG4J2-2236 Removed unnecessary dependency on jcommander since Log4j uses > embedded picocli since 2.9. > > (cherry picked from commit 4da4243f50ba2af3ad69f69f56c37ff7d6eac250)
@Gary, port to master is done. > > # Conflicts: > # log4j-core/pom.xml > # src/changes/changes.xml > > > Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo > Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ded84569 > Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ded84569 > Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ded84569 > > Branch: refs/heads/master > Commit: ded845696bcd0b96f3eb4b647feeecc149f0f72c > Parents: 14d0150 > Author: rpopma <rpo...@apache.org> > Authored: Tue Jan 30 23:08:29 2018 +0900 > Committer: rpopma <rpo...@apache.org> > Committed: Tue Jan 30 23:08:29 2018 +0900 > > ---------------------------------------------------------------------- > log4j-core/pom.xml | 6 ------ > pom.xml | 5 ----- > src/changes/changes.xml | 18 +++--------------- > 3 files changed, 3 insertions(+), 26 deletions(-) > ---------------------------------------------------------------------- > > > http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ded84569/log4j-core/pom.xml > ---------------------------------------------------------------------- > diff --git a/log4j-core/pom.xml b/log4j-core/pom.xml > index dab3328..dc1694e 100644 > --- a/log4j-core/pom.xml > +++ b/log4j-core/pom.xml > @@ -113,12 +113,6 @@ > <artifactId>commons-compress</artifactId> > <optional>true</optional> > </dependency> > - <!-- Command line for TCP and UDP servers --> > - <dependency> > - <groupId>com.beust</groupId> > - <artifactId>jcommander</artifactId> > - <optional>true</optional> > - </dependency> > > <!-- TEST DEPENDENCIES --> > > > http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ded84569/pom.xml > ---------------------------------------------------------------------- > diff --git a/pom.xml b/pom.xml > index 1ae7f77..ea37eed 100644 > --- a/pom.xml > +++ b/pom.xml > @@ -297,11 +297,6 @@ > <version>3.7</version> > </dependency> > <dependency> > - <groupId>com.beust</groupId> > - <artifactId>jcommander</artifactId> > - <version>1.48</version> > - </dependency> > - <dependency> > <groupId>ch.qos.logback</groupId> > <artifactId>logback-classic</artifactId> > <version>${logbackVersion}</version> > > http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ded84569/src/changes/changes.xml > ---------------------------------------------------------------------- > diff --git a/src/changes/changes.xml b/src/changes/changes.xml > index 95801c0..c683d69 100644 > --- a/src/changes/changes.xml > +++ b/src/changes/changes.xml > @@ -37,6 +37,9 @@ > <action issue="LOG4J2-2225" dev="rpopma" type="update"> > Moved time-related classes from core.util to core.time. Classes > considered private moved to core.time.internal. > </action> > + <action issue="LOG4J2-2236" dev="rpopma" type="update"> > + Removed unnecessary dependency on jcommander since Log4j uses > embedded picocli since 2.9. > + </action> > <action issue="LOG4J2-1883" dev="rpopma" type="add" due-to="Anthony > Maire"> > Added support for precise (micro and nanosecond) timestamps when > running on Java 9. A limited number of precise %d date formats are supported > with PatternLayout. POTENTIAL BREAKING CHANGE: The XML, JSON and YAML formats > have changed: they no longer have the "timeMillis" attribute and instead have > an "Instant" element with "epochSecond" and "nanoOfSecond" attributes. > </action> > @@ -170,21 +173,6 @@ > <action issue="LOG4J2-2229" dev="ggregory" type="update" due-to="Gary > Gregory"> > Update Jackson from 2.9.3 to 2.9.4. > </action> > - <action issue="LOG4J2-2228" dev="ggregory" type="update" due-to="Gary > Gregory"> > - Split off ZeroMq/JeroMq support into a new module log4j-jeromq. > - </action> > - <action issue="LOG4J2-2227" dev="ggregory" type="update" due-to="Gary > Gregory"> > - Split off Kafka support into a new module log4j-kafka. > - </action> > - <action issue="LOG4J2-2230" dev="ggregory" type="update" due-to="Gary > Gregory"> > - Split off SMTP support into a new module log4j-smtp. > - </action> > - <action issue="LOG4J2-2231" dev="ggregory" type="update" due-to="Gary > Gregory"> > - Move CSV layout from log4j-core to a new module log4j-csv. > - </action> > - <action issue="LOG4J2-2232" dev="ggregory" type="update" due-to="Gary > Gregory"> > - Move JMS code to a new module log4j-jms. > - </action> > </release> > <release version="2.10.0" date="2017-11-18" description="GA Release > 2.10.0"> > <action issue="LOG4J2-2120" dev="mikes" type="add" due-to="Carter > Douglas Kozak"> >
