You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by st...@apache.org on 2014/02/05 15:23:16 UTC
svn commit: r1564785 - /sling/trunk/bundles/extensions/discovery/impl/pom.xml
Author: stefanegli
Date: Wed Feb 5 14:23:16 2014
New Revision: 1564785
URL: http://svn.apache.org/r1564785
Log:
SLING-3001 : SubnetUtils of commons-net embedded with discovery.impl
Modified:
sling/trunk/bundles/extensions/discovery/impl/pom.xml
Modified: sling/trunk/bundles/extensions/discovery/impl/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/impl/pom.xml?rev=1564785&r1=1564784&r2=1564785&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/discovery/impl/pom.xml (original)
+++ sling/trunk/bundles/extensions/discovery/impl/pom.xml Wed Feb 5 14:23:16 2014
@@ -57,6 +57,13 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Embed-Dependency>
+ commons-net;inline=org/apache/commons/net/util/SubnetUtils*
+ </Embed-Dependency>
+ </instructions>
+ </configuration>
</plugin>
</plugins>
</build>
@@ -163,6 +170,12 @@
<version>2.4</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>3.3</version>
+ <scope>provided</scope>
+ </dependency>
<!-- Testing -->
<dependency>
<groupId>junit</groupId>
@@ -179,6 +192,12 @@
<artifactId>jmock-junit4</artifactId>
</dependency>
<dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>1.9.5</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.testing</artifactId>
<version>2.0.14</version>