Merge branch 'logging-parent'
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c8c6438d Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c8c6438d Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c8c6438d Branch: refs/heads/master Commit: c8c6438daffa24583756cb0912f9af8e4605e73f Parents: 1fe46b1 c3c0acf Author: Matt Sicker <boa...@gmail.com> Authored: Sat Jan 28 11:03:00 2017 -0600 Committer: Matt Sicker <boa...@gmail.com> Committed: Sat Jan 28 11:03:00 2017 -0600 ---------------------------------------------------------------------- log4j-1.2-api/pom.xml | 2 +- log4j-api-scala_2.10/pom.xml | 2 +- log4j-api-scala_2.11/pom.xml | 2 +- log4j-api/pom.xml | 2 +- log4j-bom/pom.xml | 6 ++--- log4j-core/pom.xml | 2 +- log4j-flume-ng/pom.xml | 2 +- log4j-iostreams/pom.xml | 2 +- log4j-jcl/pom.xml | 2 +- log4j-jmx-gui/pom.xml | 2 +- log4j-jul/pom.xml | 2 +- log4j-liquibase/pom.xml | 2 +- log4j-nosql/pom.xml | 2 +- log4j-osgi/pom.xml | 2 +- log4j-slf4j-impl/pom.xml | 2 +- log4j-taglib/pom.xml | 2 +- log4j-to-slf4j/pom.xml | 2 +- log4j-web/pom.xml | 2 +- pom.xml | 53 +++++++-------------------------------- 19 files changed, 29 insertions(+), 64 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c8c6438d/log4j-1.2-api/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c8c6438d/log4j-api-scala_2.10/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c8c6438d/log4j-api-scala_2.11/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c8c6438d/log4j-api/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c8c6438d/log4j-bom/pom.xml ---------------------------------------------------------------------- diff --cc log4j-bom/pom.xml index 2c47d4b,9336483..44fde2e --- a/log4j-bom/pom.xml +++ b/log4j-bom/pom.xml @@@ -15,11 -15,13 +15,11 @@@ See the license for the specific language governing permissions and limitations under the license. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> - <groupId>org.apache</groupId> - <artifactId>apache</artifactId> - <version>9</version> + <groupId>org.apache.logging</groupId> + <artifactId>logging-parent</artifactId> + <version>1</version> </parent> <modelVersion>4.0.0</modelVersion> <name>Apache Log4j BOM</name> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c8c6438d/log4j-core/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c8c6438d/log4j-flume-ng/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c8c6438d/log4j-iostreams/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c8c6438d/log4j-jcl/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c8c6438d/log4j-jmx-gui/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c8c6438d/log4j-jul/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c8c6438d/log4j-liquibase/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c8c6438d/log4j-nosql/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c8c6438d/log4j-osgi/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c8c6438d/log4j-slf4j-impl/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c8c6438d/log4j-taglib/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c8c6438d/log4j-to-slf4j/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c8c6438d/log4j-web/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c8c6438d/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 345f72e,d043b81..23f6fe8 --- a/pom.xml +++ b/pom.xml @@@ -21,11 -23,11 +21,11 @@@ <artifactId>log4j</artifactId> <packaging>pom</packaging> <name>Apache Log4j 2</name> - <version>2.7.1-SNAPSHOT</version> + <version>2.8.1-SNAPSHOT</version> <parent> - <groupId>org.apache</groupId> - <artifactId>apache</artifactId> - <version>9</version> + <groupId>org.apache.logging</groupId> + <artifactId>logging-parent</artifactId> + <version>1</version> </parent> <description>Apache Log4j 2</description> <url>https://logging.apache.org/log4j/2.x/</url>
