logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rpo...@apache.org
Subject svn commit: r1564289 - in /logging/log4j/log4j2/trunk: log4j-osgi/core-osgi-legacy-api/ log4j-osgi/core-osgi-legacy-api/pom.xml log4j-osgi/pom.xml src/changes/changes.xml
Date Tue, 04 Feb 2014 13:26:36 GMT
Author: rpopma
Date: Tue Feb  4 13:26:36 2014
New Revision: 1564289

URL: http://svn.apache.org/r1564289
Log:
LOG4J2-345 logging.log4j-1.2-api doesn't export the log4j API 1.2. Dependent bundles can not
be resolved.

Added:
    logging/log4j/log4j2/trunk/log4j-osgi/core-osgi-legacy-api/
    logging/log4j/log4j2/trunk/log4j-osgi/core-osgi-legacy-api/pom.xml   (with props)
Modified:
    logging/log4j/log4j2/trunk/log4j-osgi/pom.xml
    logging/log4j/log4j2/trunk/src/changes/changes.xml

Added: logging/log4j/log4j2/trunk/log4j-osgi/core-osgi-legacy-api/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-osgi/core-osgi-legacy-api/pom.xml?rev=1564289&view=auto
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-osgi/core-osgi-legacy-api/pom.xml (added)
+++ logging/log4j/log4j2/trunk/log4j-osgi/core-osgi-legacy-api/pom.xml Tue Feb  4 13:26:36
2014
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES 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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.logging.log4j</groupId>
+    <artifactId>log4j</artifactId>
+    <version>2.0RC1-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
+  </parent>
+  <groupId>org.apache.logging.log4j.osgi</groupId>
+  <artifactId>log4j-1.2-osgi-api</artifactId>
+  <packaging>bundle</packaging>
+  <name>Apache Log4J 1.x Compatibility Bundle</name>
+  <description>Apache Log4J 1.x compatibility API bundle.</description>
+  <url>${project.parent.url}log4j-1.2-api/</url>
+  <properties>
+    <log4jParentDir>${basedir}/../..</log4jParentDir>
+    <docLabel>Log4j 1.2 Bridge</docLabel>
+    <osgi.export>
+      org.apache.log4j*;version=${project.version}
+    </osgi.export>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-1.2-api</artifactId>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>generate-sources</id>
+            <phase>generate-sources</phase>
+            <configuration>
+              <tasks>
+                <mkdir dir="target/classes" />
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <!--
+            dummy entry to stop bundle plugin from picking up jar config and reporting
+            WARNING: Duplicate name in Manifest
+            See http://markmail.org/message/mpkl24wk3jrjhhjg
+          -->
+          <archive>
+            <forced>true</forced>
+          </archive>
+          <excludeDependencies>false</excludeDependencies>
+          <instructions>
+            <!-- stops the "uses" clauses being added to "Export-Package" manifest entry
-->
+            <_nouses>true</_nouses>
+            <!-- Stop the JAVA_1_n_HOME variables from being treated as headers by Bnd
-->
+            <_removeheaders>JAVA_1_3_HOME,JAVA_1_4_HOME,JAVA_1_5_HOME,JAVA_1_6_HOME,JAVA_1_7_HOME</_removeheaders>
+            <Bundle-SymbolicName>${osgi.symbolicName}</Bundle-SymbolicName>
+            <Export-Package>${osgi.export}</Export-Package>
+            <Private-Package>${osgi.private}</Private-Package>
+            <Import-Package>${osgi.import}</Import-Package>
+            <DynamicImport-Package>${osgi.dynamicImport}</DynamicImport-Package>
+            <Bundle-DocURL>${project.url}</Bundle-DocURL>
+            <Fragment-Host>org.apache.logging.log4j-api;bundle-version=${project.version.osgi}</Fragment-Host>
+          </instructions>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>cleanVersions</goal>
+            </goals>
+            <configuration>
+              <versions>
+                <project.version.osgi>${project.version}</project.version.osgi>
+              </versions>
+            </configuration>
+          </execution>
+          <execution>
+            <id>bundle-manifest</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Propchange: logging/log4j/log4j2/trunk/log4j-osgi/core-osgi-legacy-api/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: logging/log4j/log4j2/trunk/log4j-osgi/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-osgi/pom.xml?rev=1564289&r1=1564288&r2=1564289&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-osgi/pom.xml (original)
+++ logging/log4j/log4j2/trunk/log4j-osgi/pom.xml Tue Feb  4 13:26:36 2014
@@ -1,51 +1,52 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES 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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.logging.log4j</groupId>
-    <artifactId>log4j</artifactId>
-    <version>2.0RC1-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <groupId>org.apache.logging.log4j.osgi</groupId>
-  <artifactId>log4j-osgi</artifactId>
-  <packaging>pom</packaging>
-  <name>Apache Log4J Core OSGi Bundles</name>
-  <description>Apache Log4J OSGi Bundles</description>
-  <properties>
-    <log4jParentDir>${basedir}/..</log4jParentDir>
-    <docLabel>Core Documentation</docLabel>
-    <projectDir>/core</projectDir>
-  </properties>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-core</artifactId>
-    </dependency>
-  </dependencies>
-  <modules>
-    <module>core-osgi-async</module>
-    <module>core-osgi-jpa</module>
-    <module>core-osgi-net</module>
-    <module>core-osgi-nosql-couch</module>
-    <module>core-osgi-nosql-mongo</module>
-    <module>core-osgi-reduced</module>
-  </modules>
-</project>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES 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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.logging.log4j</groupId>
+    <artifactId>log4j</artifactId>
+    <version>2.0RC1-SNAPSHOT</version>
+    <relativePath>../</relativePath>
+  </parent>
+  <groupId>org.apache.logging.log4j.osgi</groupId>
+  <artifactId>log4j-osgi</artifactId>
+  <packaging>pom</packaging>
+  <name>Apache Log4J Core OSGi Bundles</name>
+  <description>Apache Log4J OSGi Bundles</description>
+  <properties>
+    <log4jParentDir>${basedir}/..</log4jParentDir>
+    <docLabel>Core Documentation</docLabel>
+    <projectDir>/core</projectDir>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core</artifactId>
+    </dependency>
+  </dependencies>
+  <modules>
+    <module>core-osgi-async</module>
+    <module>core-osgi-jpa</module>
+    <module>core-osgi-legacy-api</module>
+    <module>core-osgi-net</module>
+    <module>core-osgi-nosql-couch</module>
+    <module>core-osgi-nosql-mongo</module>
+    <module>core-osgi-reduced</module>
+  </modules>
+</project>
+

Modified: logging/log4j/log4j2/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/changes/changes.xml?rev=1564289&r1=1564288&r2=1564289&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/changes/changes.xml (original)
+++ logging/log4j/log4j2/trunk/src/changes/changes.xml Tue Feb  4 13:26:36 2014
@@ -21,6 +21,9 @@
   </properties>
   <body>
     <release version="2.0-RC1" date="2014-MM-DD" description="Bug fixes and enhancements">
+      <action issue="LOG4J2-345" dev="rpopma" type="fix" due-to="Roland Weiglhofer, Matt
Sicker">
+        (OSGi) logging.log4j-1.2-api doesn't export the log4j API 1.2. Dependent bundles
can not be resolved.
+      </action>
       <action issue="LOG4J2-523" dev="ggregory" type="fix">
         LocalizedMessage serialization is broken.
       </action>



Mime
View raw message