You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2014/06/22 00:13:48 UTC
svn commit: r1604476 - in /logging/log4j/log4j2/trunk: .travis.yml
log4j-distribution/pom.xml log4j-distribution/src/assembly/src.xml pom.xml
src/site/site.xml
Author: rgoers
Date: Sat Jun 21 22:13:47 2014
New Revision: 1604476
URL: http://svn.apache.org/r1604476
Log:
Remove non-existent osgi jars from distribution. Add new web and nosql modules to distribution and the web site.
Removed:
logging/log4j/log4j2/trunk/.travis.yml
Modified:
logging/log4j/log4j2/trunk/log4j-distribution/pom.xml
logging/log4j/log4j2/trunk/log4j-distribution/src/assembly/src.xml
logging/log4j/log4j2/trunk/pom.xml
logging/log4j/log4j2/trunk/src/site/site.xml
Modified: logging/log4j/log4j2/trunk/log4j-distribution/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-distribution/pom.xml?rev=1604476&r1=1604475&r2=1604476&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-distribution/pom.xml (original)
+++ logging/log4j/log4j2/trunk/log4j-distribution/pom.xml Sat Jun 21 22:13:47 2014
@@ -188,34 +188,38 @@
<classifier>javadoc</classifier>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.osgi</groupId>
- <artifactId>log4j-core-osgi-async</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-web</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.osgi</groupId>
- <artifactId>log4j-core-osgi-jpa</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-web</artifactId>
<version>${project.version}</version>
+ <classifier>sources</classifier>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.osgi</groupId>
- <artifactId>log4j-core-osgi-net</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-web</artifactId>
<version>${project.version}</version>
+ <classifier>javadoc</classifier>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.osgi</groupId>
- <artifactId>log4j-core-osgi-nosql-couchdb</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-nosql</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.osgi</groupId>
- <artifactId>log4j-core-osgi-nosql-mongodb</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-nosql</artifactId>
<version>${project.version}</version>
+ <classifier>sources</classifier>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.osgi</groupId>
- <artifactId>log4j-core-osgi-reduced</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-nosql</artifactId>
<version>${project.version}</version>
+ <classifier>javadoc</classifier>
</dependency>
</dependencies>
<build>
@@ -256,7 +260,7 @@
</goals>
<phase>package</phase>
</execution>
- <execution>
+ <!-- <execution>
<id>osgi-binary</id>
<configuration>
<finalName>apache-log4j-${project.version}</finalName>
@@ -269,7 +273,7 @@
<goal>single</goal>
</goals>
<phase>package</phase>
- </execution>
+ </execution> -->
</executions>
</plugin>
<plugin>
Modified: logging/log4j/log4j2/trunk/log4j-distribution/src/assembly/src.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-distribution/src/assembly/src.xml?rev=1604476&r1=1604475&r2=1604476&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-distribution/src/assembly/src.xml (original)
+++ logging/log4j/log4j2/trunk/log4j-distribution/src/assembly/src.xml Sat Jun 21 22:13:47 2014
@@ -57,6 +57,7 @@
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iml]</exclude>
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.idea(/.*)?]</exclude>
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.settings(/.*)?]</exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?Vagrantfile(/.*)?]</exclude>
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.externalToolBuilders(/.*)?]</exclude>
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.deployables(/.*)?]</exclude>
<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.wtpmodules(/.*)?]</exclude>
Modified: logging/log4j/log4j2/trunk/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/pom.xml?rev=1604476&r1=1604475&r2=1604476&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/pom.xml (original)
+++ logging/log4j/log4j2/trunk/pom.xml Sat Jun 21 22:13:47 2014
@@ -153,7 +153,7 @@
<slf4j.version>1.7.7</slf4j.version>
<logback.version>1.0.13</logback.version>
<log4jParentDir>${basedir}</log4jParentDir>
- <Log4jReleaseVersion>2.0-rc1</Log4jReleaseVersion>
+ <Log4jReleaseVersion>2.0-rc2</Log4jReleaseVersion>
<Log4jReleaseCount>eleventh</Log4jReleaseCount>
<jackson1.version>1.9.13</jackson1.version>
<jackson2.version>2.3.3</jackson2.version>
Modified: logging/log4j/log4j2/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/site.xml?rev=1604476&r1=1604475&r2=1604476&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/site.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/site.xml Sat Jun 21 22:13:47 2014
@@ -178,6 +178,8 @@
<item name="Apache Flume NG Appender" href="log4j-flume-ng/index.html"/>
<item name="Log4j Tag Library" href="log4j-taglib/index.html"/>
<item name="Log4j JMX GUI" href="log4j-jmx-gui/index.html"/>
+ <item name="Log4j Web Application Support" href="log4j-web/index.html"/>
+ <item name="Log4j NoSQL support" href="log4j-nosql/index.html"/>
</menu>
<menu name="Project Information" img="icon-info-sign">