You are viewing a plain text version of this content. The canonical link for it is here.
Posted to npanday-commits@incubator.apache.org by br...@apache.org on 2012/01/13 12:52:30 UTC
svn commit: r1231037 - in /incubator/npanday/trunk/dist:
dotnet-repository-builder/pom.xml npanday-installer/pom.xml
Author: brett
Date: Fri Jan 13 12:52:29 2012
New Revision: 1231037
URL: http://svn.apache.org/viewvc?rev=1231037&view=rev
Log:
[NPANDAY-532] fix log4net references in distribution modules
Modified:
incubator/npanday/trunk/dist/dotnet-repository-builder/pom.xml
incubator/npanday/trunk/dist/npanday-installer/pom.xml
Modified: incubator/npanday/trunk/dist/dotnet-repository-builder/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dist/dotnet-repository-builder/pom.xml?rev=1231037&r1=1231036&r2=1231037&view=diff
==============================================================================
--- incubator/npanday/trunk/dist/dotnet-repository-builder/pom.xml (original)
+++ incubator/npanday/trunk/dist/dotnet-repository-builder/pom.xml Fri Jan 13 12:52:29 2012
@@ -36,10 +36,11 @@
<type>dotnet-library</type>
</dependency>
<dependency>
- <groupId>org.apache.npanday</groupId>
- <artifactId>NPanday.Logging</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.logging</groupId>
+ <artifactId>log4net</artifactId>
+ <version>1.2.11</version>
<type>dotnet-library</type>
+ <classifier>net-2.0</classifier>
</dependency>
<dependency>
<groupId>org.apache.npanday</groupId>
Modified: incubator/npanday/trunk/dist/npanday-installer/pom.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dist/npanday-installer/pom.xml?rev=1231037&r1=1231036&r2=1231037&view=diff
==============================================================================
--- incubator/npanday/trunk/dist/npanday-installer/pom.xml (original)
+++ incubator/npanday/trunk/dist/npanday-installer/pom.xml Fri Jan 13 12:52:29 2012
@@ -102,11 +102,33 @@
<outputDirectory>${project.build.directory}/addin</outputDirectory>
<includeTypes>dotnet-library</includeTypes>
<stripVersion>true</stripVersion>
+ <!-- no way to strip this from the filename, so do it manually next -->
+ <!-- TODO: make copy-dependencies support a pattern for filename: {artifactId}.{extension} -->
+ <excludeClassifiers>net-2.0</excludeClassifiers>
</configuration>
<goals>
<goal>copy-dependencies</goal>
</goals>
</execution>
+ <execution>
+ <id>log4net</id>
+ <phase>generate-resources</phase>
+ <configuration>
+ <outputDirectory>${project.build.directory}/addin</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.logging</groupId>
+ <artifactId>log4net</artifactId>
+ <version>1.2.11</version>
+ <classifier>net-2.0</classifier>
+ <destFileName>log4net.dll</destFileName>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ </execution>
</executions>
</plugin>
<plugin>