Author: tn
Date: Fri Feb 22 20:38:59 2013
New Revision: 1449206
URL: http://svn.apache.org/r1449206
Log:
Fix jar deploy, add osgi bundle metadata.
Modified:
commons/proper/logging/trunk/pom.xml
Modified: commons/proper/logging/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/logging/trunk/pom.xml?rev=1449206&r1=1449205&r2=1449206&view=diff
==============================================================================
--- commons/proper/logging/trunk/pom.xml (original)
+++ commons/proper/logging/trunk/pom.xml Fri Feb 22 20:38:59 2013
@@ -189,11 +189,6 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>src/conf/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
<executions>
<execution>
<!--
@@ -253,6 +248,21 @@ under the License.
</excludes>
</configuration>
</execution>
+
+ <!--
+ - Define the full jar last, the deploy/install plugin seems to be
broken
+ - and takes the last definition from here.
+ -->
+ <execution>
+ <id>fulljar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <jarName>${project.artifactId}-${project.version}</jarName>
+ </configuration>
+ </execution>
</executions>
</plugin>
@@ -544,7 +554,14 @@ under the License.
<commons.binary.suffix>-bin</commons.binary.suffix>
<commons.jira.id>LOGGING</commons.jira.id>
<commons.jira.pid>12310484</commons.jira.pid>
- <commons.surefire.version>2.12</commons.surefire.version>
+ <commons.surefire.version>2.12</commons.surefire.version>
<skipSurefireReport>true</skipSurefireReport>
+
+ <commons.osgi.import>
+ javax.servlet;version="[2.1.0, 3.0.0)";resolution:=optional,
+ org.apache.avalon.framework.logger;version="[4.1.3,
4.1.5]";resolution:=optional,
+ org.apache.log;version="[1.0.1, 1.0.1]";resolution:=optional,
+ org.apache.log4j;version="[1.2.15, 2.0.0)";resolution:=optional
+ </commons.osgi.import>
</properties>
</project>
