mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-18 10:51:04 +02:00
Code Issues Projects Releases Wiki Activity

Pom fixes to correctly shade copycat jars.

Browse Source 
Change-Id: I1ed97b32ad242e1c6d7c06387219308802a1f773
This commit is contained in:
Madan Jampani 2015-02-06 15:33:03 -08:00
parent 9ee62f52f2
commit cb7ab08e95
4 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/store/dist/pom.xml vendored
View File

@ -48,25 +48,6 @@
<groupId>org.onosproject</groupId> <groupId>org.onosproject</groupId>
<artifactId>onos-core-common</artifactId> <artifactId>onos-core-common</artifactId>
</dependency> </dependency>
<!--
<dependency>
<groupId>net.kuujo.copycat</groupId>
<artifactId>copycat</artifactId>
<version>${copycat.version}</version>
</dependency>
<dependency>
<groupId>net.kuujo.copycat</groupId>
<artifactId>copycat-chronicle</artifactId>
<version>${copycat.version}</version>
</dependency>
<dependency>
<groupId>net.kuujo.copycat</groupId>
<artifactId>copycat-tcp</artifactId>
<version>${copycat.version}</version>
</dependency>
-->
<dependency> <dependency>
<groupId>org.mapdb</groupId> <groupId>org.mapdb</groupId>

1
features/features.xml
View File

@ -59,6 +59,7 @@
<bundle>mvn:org.codehaus.jackson/jackson-core-asl/1.9.13</bundle> <bundle>mvn:org.codehaus.jackson/jackson-core-asl/1.9.13</bundle>
<bundle>mvn:org.codehaus.jackson/jackson-mapper-asl/1.9.13</bundle> <bundle>mvn:org.codehaus.jackson/jackson-mapper-asl/1.9.13</bundle>
<bundle>mvn:com.typesafe/config/1.2.1</bundle>
<bundle>mvn:org.onosproject/onlab-thirdparty/@ONOS-VERSION</bundle> <bundle>mvn:org.onosproject/onlab-thirdparty/@ONOS-VERSION</bundle>
<bundle>mvn:org.mapdb/mapdb/1.0.6</bundle> <bundle>mvn:org.mapdb/mapdb/1.0.6</bundle>

8
pom.xml
View File

@ -23,6 +23,14 @@
<maven>3.0.1</maven> <maven>3.0.1</maven>
</prerequisites> </prerequisites>
<!--- Needed for copycat. Remove before official release -->
<repositories>
<repository>
<id>snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</repository>
</repositories>
<parent> <parent>
<groupId>org.onosproject</groupId> <groupId>org.onosproject</groupId>
<artifactId>onos-base</artifactId> <artifactId>onos-base</artifactId>

17
utils/thirdparty/pom.xml vendored
View File

@ -31,14 +31,6 @@
<description>ONLab third-party dependencies</description> <description>ONLab third-party dependencies</description>
<!-- TODO: Needed for copycat snapshot. Remove before official release -->
<repositories>
<repository>
<id>snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</repository>
</repositories>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.googlecode.concurrent-trees</groupId> <groupId>com.googlecode.concurrent-trees</groupId>
@ -59,6 +51,13 @@
<version>${copycat.version}</version> <version>${copycat.version}</version>
</dependency> </dependency>
<dependency>
<!-- FIXME once fixes get merged to upstream -->
<groupId>org.onosproject</groupId>
<artifactId>copycat-core</artifactId>
<version>${copycat.version}</version>
</dependency>
<dependency> <dependency>
<!-- FIXME once fixes get merged to upstream --> <!-- FIXME once fixes get merged to upstream -->
<groupId>org.onosproject</groupId> <groupId>org.onosproject</groupId>
@ -99,7 +98,7 @@
</filter> </filter>
<filter> <filter>
<artifact>net.kuujo.copycat:*</artifact> <artifact>org.onosproject:copycat*</artifact>
<includes> <includes>
<include>net/kuujo/copycat/**</include> <include>net/kuujo/copycat/**</include>
</includes> </includes>