홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Madan Jampani
cb7ab08e 1 parent 9ee62f52

Pom fixes to correctly shade copycat jars. 

Change-Id: I1ed97b32ad242e1c6d7c06387219308802a1f773
Inline Side-by-side
Showing 4 changed files with 17 additions and 28 deletions
...@@ -48,25 +48,6 @@ ...@@ -48,25 +48,6 @@
48 <groupId>org.onosproject</groupId> 48 <groupId>org.onosproject</groupId>
49 <artifactId>onos-core-common</artifactId> 49 <artifactId>onos-core-common</artifactId>
50 </dependency> 50 </dependency>
51 -<!--
52 - <dependency>
53 - <groupId>net.kuujo.copycat</groupId>
54 - <artifactId>copycat</artifactId>
55 - <version>${copycat.version}</version>
56 - </dependency>
57 -
58 - <dependency>
59 - <groupId>net.kuujo.copycat</groupId>
60 - <artifactId>copycat-chronicle</artifactId>
61 - <version>${copycat.version}</version>
62 - </dependency>
63 -
64 - <dependency>
65 - <groupId>net.kuujo.copycat</groupId>
66 - <artifactId>copycat-tcp</artifactId>
67 - <version>${copycat.version}</version>
68 - </dependency>
69 --->
70 51
71 <dependency> 52 <dependency>
72 <groupId>org.mapdb</groupId> 53 <groupId>org.mapdb</groupId>
......
...@@ -59,6 +59,7 @@ ...@@ -59,6 +59,7 @@
59 <bundle>mvn:org.codehaus.jackson/jackson-core-asl/1.9.13</bundle> 59 <bundle>mvn:org.codehaus.jackson/jackson-core-asl/1.9.13</bundle>
60 <bundle>mvn:org.codehaus.jackson/jackson-mapper-asl/1.9.13</bundle> 60 <bundle>mvn:org.codehaus.jackson/jackson-mapper-asl/1.9.13</bundle>
61 61
62 + <bundle>mvn:com.typesafe/config/1.2.1</bundle>
62 <bundle>mvn:org.onosproject/onlab-thirdparty/@ONOS-VERSION</bundle> 63 <bundle>mvn:org.onosproject/onlab-thirdparty/@ONOS-VERSION</bundle>
63 64
64 <bundle>mvn:org.mapdb/mapdb/1.0.6</bundle> 65 <bundle>mvn:org.mapdb/mapdb/1.0.6</bundle>
......
...@@ -23,6 +23,14 @@ ...@@ -23,6 +23,14 @@
23 <maven>3.0.1</maven> 23 <maven>3.0.1</maven>
24 </prerequisites> 24 </prerequisites>
25 25
26 + <!--- Needed for copycat. Remove before official release -->
27 + <repositories>
28 + <repository>
29 + <id>snapshots</id>
30 + <url>https://oss.sonatype.org/content/repositories/snapshots</url>
31 + </repository>
32 + </repositories>
33 +
26 <parent> 34 <parent>
27 <groupId>org.onosproject</groupId> 35 <groupId>org.onosproject</groupId>
28 <artifactId>onos-base</artifactId> 36 <artifactId>onos-base</artifactId>
......
...@@ -31,14 +31,6 @@ ...@@ -31,14 +31,6 @@
31 31
32 <description>ONLab third-party dependencies</description> 32 <description>ONLab third-party dependencies</description>
33 33
34 - <!-- TODO: Needed for copycat snapshot. Remove before official release -->
35 - <repositories>
36 - <repository>
37 - <id>snapshots</id>
38 - <url>https://oss.sonatype.org/content/repositories/snapshots</url>
39 - </repository>
40 - </repositories>
41 -
42 <dependencies> 34 <dependencies>
43 <dependency> 35 <dependency>
44 <groupId>com.googlecode.concurrent-trees</groupId> 36 <groupId>com.googlecode.concurrent-trees</groupId>
...@@ -62,6 +54,13 @@ ...@@ -62,6 +54,13 @@
62 <dependency> 54 <dependency>
63 <!-- FIXME once fixes get merged to upstream --> 55 <!-- FIXME once fixes get merged to upstream -->
64 <groupId>org.onosproject</groupId> 56 <groupId>org.onosproject</groupId>
57 + <artifactId>copycat-core</artifactId>
58 + <version>${copycat.version}</version>
59 + </dependency>
60 +
61 + <dependency>
62 + <!-- FIXME once fixes get merged to upstream -->
63 + <groupId>org.onosproject</groupId>
65 <artifactId>copycat-netty</artifactId> 64 <artifactId>copycat-netty</artifactId>
66 <version>${copycat.version}</version> 65 <version>${copycat.version}</version>
67 </dependency> 66 </dependency>
...@@ -99,7 +98,7 @@ ...@@ -99,7 +98,7 @@
99 </filter> 98 </filter>
100 99
101 <filter> 100 <filter>
102 - <artifact>net.kuujo.copycat:*</artifact> 101 + <artifact>org.onosproject:copycat*</artifact>
103 <includes> 102 <includes>
104 <include>net/kuujo/copycat/**</include> 103 <include>net/kuujo/copycat/**</include>
105 </includes> 104 </includes>
......