Merge branch 'release-2.x' of https://git-wip-us.apache.org/repos/asf/logging-log4j2 into release-2.x
diff --git a/log4j-1.2-api/pom.xml b/log4j-1.2-api/pom.xml
index 512fc79..72c5c83 100644
--- a/log4j-1.2-api/pom.xml
+++ b/log4j-1.2-api/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.11.0-SNAPSHOT</version>
+ <version>2.11.0</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-1.2-api</artifactId>
diff --git a/log4j-api-java9/pom.xml b/log4j-api-java9/pom.xml
index 3c1cb25..518c6f3 100644
--- a/log4j-api-java9/pom.xml
+++ b/log4j-api-java9/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.11.0-SNAPSHOT</version>
+ <version>2.11.0</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-api-java9</artifactId>
diff --git a/log4j-api/pom.xml b/log4j-api/pom.xml
index 4d50984..b25cff6 100644
--- a/log4j-api/pom.xml
+++ b/log4j-api/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.11.0-SNAPSHOT</version>
+ <version>2.11.0</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-api</artifactId>
diff --git a/log4j-appserver/pom.xml b/log4j-appserver/pom.xml
index 2bd759e..6b7951e 100644
--- a/log4j-appserver/pom.xml
+++ b/log4j-appserver/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>log4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
- <version>2.11.0-SNAPSHOT</version>
+ <version>2.11.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/log4j-bom/pom.xml b/log4j-bom/pom.xml
index 5ca72c6..b41f64c 100644
--- a/log4j-bom/pom.xml
+++ b/log4j-bom/pom.xml
@@ -26,7 +26,7 @@
<description>Apache Log4j Bill of Materials</description>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-bom</artifactId>
- <version>2.11.0-SNAPSHOT</version>
+ <version>2.11.0</version>
<packaging>pom</packaging>
<dependencyManagement>
<dependencies>
@@ -161,4 +161,8 @@
</plugin>
</plugins>
</build>
+
+ <scm>
+ <tag>log4j-2.11.0-rc1</tag>
+ </scm>
</project>
diff --git a/log4j-cassandra/pom.xml b/log4j-cassandra/pom.xml
index 4030018..ae673ba 100644
--- a/log4j-cassandra/pom.xml
+++ b/log4j-cassandra/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.11.0-SNAPSHOT</version>
+ <version>2.11.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/log4j-core-its/pom.xml b/log4j-core-its/pom.xml
index ff66dda..456aefa 100644
--- a/log4j-core-its/pom.xml
+++ b/log4j-core-its/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.11.0-SNAPSHOT</version>
+ <version>2.11.0</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-core-its</artifactId>
diff --git a/log4j-core-java9/pom.xml b/log4j-core-java9/pom.xml
index 9e57995..cebab64 100644
--- a/log4j-core-java9/pom.xml
+++ b/log4j-core-java9/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.11.0-SNAPSHOT</version>
+ <version>2.11.0</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-core-java9</artifactId>
diff --git a/log4j-core/pom.xml b/log4j-core/pom.xml
index 6a84408..bc21706 100644
--- a/log4j-core/pom.xml
+++ b/log4j-core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.11.0-SNAPSHOT</version>
+ <version>2.11.0</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-core</artifactId>
diff --git a/log4j-couchdb/pom.xml b/log4j-couchdb/pom.xml
index a55610e..43a200c 100644
--- a/log4j-couchdb/pom.xml
+++ b/log4j-couchdb/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.11.0-SNAPSHOT</version>
+ <version>2.11.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/log4j-distribution/pom.xml b/log4j-distribution/pom.xml
index a39bc6d..9a1afad 100644
--- a/log4j-distribution/pom.xml
+++ b/log4j-distribution/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.11.0-SNAPSHOT</version>
+ <version>2.11.0</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-distribution</artifactId>
diff --git a/log4j-flume-ng/pom.xml b/log4j-flume-ng/pom.xml
index fce40b1..fe2e2ec 100644
--- a/log4j-flume-ng/pom.xml
+++ b/log4j-flume-ng/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.11.0-SNAPSHOT</version>
+ <version>2.11.0</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-flume-ng</artifactId>
diff --git a/log4j-iostreams/pom.xml b/log4j-iostreams/pom.xml
index f8886f1..5e432ca 100644
--- a/log4j-iostreams/pom.xml
+++ b/log4j-iostreams/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.11.0-SNAPSHOT</version>
+ <version>2.11.0</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-iostreams</artifactId>
diff --git a/log4j-jcl/pom.xml b/log4j-jcl/pom.xml
index c287a31..72bec89 100644
--- a/log4j-jcl/pom.xml
+++ b/log4j-jcl/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.11.0-SNAPSHOT</version>
+ <version>2.11.0</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-jcl</artifactId>
diff --git a/log4j-jdbc-dbcp2/pom.xml b/log4j-jdbc-dbcp2/pom.xml
index 182bd6c..a990e3a 100644
--- a/log4j-jdbc-dbcp2/pom.xml
+++ b/log4j-jdbc-dbcp2/pom.xml
@@ -7,12 +7,11 @@
OR CONDITIONS OF ANY KIND, either express or implied. ~ 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.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.11.0-SNAPSHOT</version>
+ <version>2.11.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/log4j-jmx-gui/pom.xml b/log4j-jmx-gui/pom.xml
index a313e25..e03f303 100644
--- a/log4j-jmx-gui/pom.xml
+++ b/log4j-jmx-gui/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.11.0-SNAPSHOT</version>
+ <version>2.11.0</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-jmx-gui</artifactId>
diff --git a/log4j-jpa/pom.xml b/log4j-jpa/pom.xml
index 0858a3f..16d9463 100644
--- a/log4j-jpa/pom.xml
+++ b/log4j-jpa/pom.xml
@@ -7,12 +7,11 @@
OR CONDITIONS OF ANY KIND, either express or implied. ~ 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.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.11.0-SNAPSHOT</version>
+ <version>2.11.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/log4j-jul/pom.xml b/log4j-jul/pom.xml
index a56c240..72f1e9f 100644
--- a/log4j-jul/pom.xml
+++ b/log4j-jul/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>log4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
- <version>2.11.0-SNAPSHOT</version>
+ <version>2.11.0</version>
<relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/log4j-liquibase/pom.xml b/log4j-liquibase/pom.xml
index b30999b..63c8f83 100644
--- a/log4j-liquibase/pom.xml
+++ b/log4j-liquibase/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.11.0-SNAPSHOT</version>
+ <version>2.11.0</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-liquibase</artifactId>
diff --git a/log4j-mongodb2/pom.xml b/log4j-mongodb2/pom.xml
index 32b2aa9..99132f2 100644
--- a/log4j-mongodb2/pom.xml
+++ b/log4j-mongodb2/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.11.0-SNAPSHOT</version>
+ <version>2.11.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/log4j-mongodb3/pom.xml b/log4j-mongodb3/pom.xml
index e6e0ecb..fdcc0fd 100644
--- a/log4j-mongodb3/pom.xml
+++ b/log4j-mongodb3/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.11.0-SNAPSHOT</version>
+ <version>2.11.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/log4j-osgi/pom.xml b/log4j-osgi/pom.xml
index 731e12f..da94ef8 100644
--- a/log4j-osgi/pom.xml
+++ b/log4j-osgi/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.11.0-SNAPSHOT</version>
+ <version>2.11.0</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-osgi</artifactId>
diff --git a/log4j-perf/pom.xml b/log4j-perf/pom.xml
index 9d6cc8d..319de00 100644
--- a/log4j-perf/pom.xml
+++ b/log4j-perf/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>log4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
- <version>2.11.0-SNAPSHOT</version>
+ <version>2.11.0</version>
<relativePath>../</relativePath>
</parent>
@@ -66,7 +66,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jpa</artifactId>
- <version>2.11.0-SNAPSHOT</version>
+ <version>2.11.0</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/log4j-samples/log4j-samples-configuration/pom.xml b/log4j-samples/log4j-samples-configuration/pom.xml
index a0f083e..2efaff2 100644
--- a/log4j-samples/log4j-samples-configuration/pom.xml
+++ b/log4j-samples/log4j-samples-configuration/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>log4j-samples</artifactId>
<groupId>org.apache.logging.log4j.samples</groupId>
- <version>2.11.0-SNAPSHOT</version>
+ <version>2.11.0</version>
</parent>
<artifactId>log4j-samples-configuration</artifactId>
<packaging>jar</packaging>
diff --git a/log4j-samples/log4j-samples-flume-common/pom.xml b/log4j-samples/log4j-samples-flume-common/pom.xml
index f88d4a6..448eb0c 100644
--- a/log4j-samples/log4j-samples-flume-common/pom.xml
+++ b/log4j-samples/log4j-samples-flume-common/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>log4j-samples</artifactId>
<groupId>org.apache.logging.log4j.samples</groupId>
- <version>2.11.0-SNAPSHOT</version>
+ <version>2.11.0</version>
</parent>
<artifactId>log4j-samples-flume-common</artifactId>
<packaging>jar</packaging>
diff --git a/log4j-samples/log4j-samples-flume-embedded/pom.xml b/log4j-samples/log4j-samples-flume-embedded/pom.xml
index 8f6cd6d..482dc8b 100644
--- a/log4j-samples/log4j-samples-flume-embedded/pom.xml
+++ b/log4j-samples/log4j-samples-flume-embedded/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>log4j-samples</artifactId>
<groupId>org.apache.logging.log4j.samples</groupId>
- <version>2.11.0-SNAPSHOT</version>
+ <version>2.11.0</version>
</parent>
<artifactId>log4j-samples-flume-embedded</artifactId>
<packaging>war</packaging>
diff --git a/log4j-samples/log4j-samples-flume-remote/pom.xml b/log4j-samples/log4j-samples-flume-remote/pom.xml
index 1a9db7c..bdd071f 100644
--- a/log4j-samples/log4j-samples-flume-remote/pom.xml
+++ b/log4j-samples/log4j-samples-flume-remote/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>log4j-samples</artifactId>
<groupId>org.apache.logging.log4j.samples</groupId>
- <version>2.11.0-SNAPSHOT</version>
+ <version>2.11.0</version>
</parent>
<artifactId>log4j-samples-flume-remote</artifactId>
<packaging>war</packaging>
diff --git a/log4j-samples/log4j-samples-loggerProperties/pom.xml b/log4j-samples/log4j-samples-loggerProperties/pom.xml
index 904a697..aae86a1 100644
--- a/log4j-samples/log4j-samples-loggerProperties/pom.xml
+++ b/log4j-samples/log4j-samples-loggerProperties/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>log4j-samples</artifactId>
<groupId>org.apache.logging.log4j.samples</groupId>
- <version>2.11.0-SNAPSHOT</version>
+ <version>2.11.0</version>
</parent>
<artifactId>log4j-samples-loggerProperties</artifactId>
<packaging>jar</packaging>
diff --git a/log4j-samples/pom.xml b/log4j-samples/pom.xml
index 0fa44be..de75318 100644
--- a/log4j-samples/pom.xml
+++ b/log4j-samples/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.11.0-SNAPSHOT</version>
+ <version>2.11.0</version>
<relativePath>../</relativePath>
</parent>
<groupId>org.apache.logging.log4j.samples</groupId>
diff --git a/log4j-slf4j-impl/pom.xml b/log4j-slf4j-impl/pom.xml
index efac8fc..cab5c7e 100644
--- a/log4j-slf4j-impl/pom.xml
+++ b/log4j-slf4j-impl/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.11.0-SNAPSHOT</version>
+ <version>2.11.0</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-slf4j-impl</artifactId>
diff --git a/log4j-taglib/pom.xml b/log4j-taglib/pom.xml
index 1cc50a5..c3bcb9f 100644
--- a/log4j-taglib/pom.xml
+++ b/log4j-taglib/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.11.0-SNAPSHOT</version>
+ <version>2.11.0</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-taglib</artifactId>
diff --git a/log4j-to-slf4j/pom.xml b/log4j-to-slf4j/pom.xml
index b188232..e9b5050 100644
--- a/log4j-to-slf4j/pom.xml
+++ b/log4j-to-slf4j/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <version>2.11.0-SNAPSHOT</version>
+ <version>2.11.0</version>
<relativePath>../</relativePath>
</parent>
<artifactId>log4j-to-slf4j</artifactId>
diff --git a/log4j-web/pom.xml b/log4j-web/pom.xml
index 5ea3647..867d632 100644
--- a/log4j-web/pom.xml
+++ b/log4j-web/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>log4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
- <version>2.11.0-SNAPSHOT</version>
+ <version>2.11.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index a63ddff..4ec792e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
<artifactId>log4j</artifactId>
<packaging>pom</packaging>
<name>Apache Log4j 2</name>
- <version>2.11.0-SNAPSHOT</version>
+ <version>2.11.0</version>
<parent>
<groupId>org.apache.logging</groupId>
<artifactId>logging-parent</artifactId>
@@ -167,7 +167,7 @@
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/logging-log4j2.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/logging-log4j2.git</developerConnection>
<url>https://git-wip-us.apache.org/repos/asf?p=logging-log4j2.git;a=summary</url>
- <tag>log4j-${Log4jReleaseVersion}</tag>
+ <tag>log4j-2.11.0-rc1</tag>
</scm>
<properties>
<!-- make sure to update these for each release! -->
