Pom fixes to correctly shade copycat jars.

Change-Id: I1ed97b32ad242e1c6d7c06387219308802a1f773
diff --git a/utils/thirdparty/pom.xml b/utils/thirdparty/pom.xml
index eb77eca..61adc1a 100644
--- a/utils/thirdparty/pom.xml
+++ b/utils/thirdparty/pom.xml
@@ -31,14 +31,6 @@
 
   <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>
     <dependency>
       <groupId>com.googlecode.concurrent-trees</groupId>
@@ -62,6 +54,13 @@
         <dependency>
           <!-- FIXME once fixes get merged to upstream -->
           <groupId>org.onosproject</groupId>
+            <artifactId>copycat-core</artifactId>
+            <version>${copycat.version}</version>
+        </dependency>
+
+        <dependency>
+          <!-- FIXME once fixes get merged to upstream -->
+          <groupId>org.onosproject</groupId>
             <artifactId>copycat-netty</artifactId>
             <version>${copycat.version}</version>
         </dependency>
@@ -99,7 +98,7 @@
             </filter>
 
             <filter>
-              <artifact>net.kuujo.copycat:*</artifact>
+              <artifact>org.onosproject:copycat*</artifact>
               <includes>
                 <include>net/kuujo/copycat/**</include>
               </includes>