Clean up shaded thirdparty bundle
- Exclude artifacts, which is already an OSGi bundles
- Create source jar for ease of debugging.
- Remove expiringmap, which we no longer use
- Derive artifact version from dependencyManagement
Change-Id: I053f08a1880109a7c74fa451afccbbe2d2adbe3c
diff --git a/utils/thirdparty/pom.xml b/utils/thirdparty/pom.xml
index 54f26f4..af70760 100644
--- a/utils/thirdparty/pom.xml
+++ b/utils/thirdparty/pom.xml
@@ -35,16 +35,9 @@
<dependency>
<groupId>com.googlecode.concurrent-trees</groupId>
<artifactId>concurrent-trees</artifactId>
- <version>2.4.0</version>
</dependency>
<dependency>
- <groupId>net.jodah</groupId>
- <artifactId>expiringmap</artifactId>
- <version>0.3.1</version>
- </dependency>
-
- <dependency>
<!-- FIXME once fixes get merged to upstream -->
<groupId>org.onosproject</groupId>
<artifactId>copycat-api</artifactId>
@@ -72,8 +65,20 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>2.3</version>
<configuration>
+ <createSourcesJar>true</createSourcesJar>
+
+ <artifactSet>
+ <excludes>
+ <!-- exclude OSGi-ready transitive dependencies -->
+ <exclude>com.google.guava:guava</exclude>
+ <exclude>com.esotericsoftware:*</exclude>
+ <exclude>org.ow2.asm:asm</exclude>
+ <exclude>org.objenesis:objenesis</exclude>
+ <exclude>io.netty:*</exclude>
+ </excludes>
+ </artifactSet>
+
<filters>
<filter>
@@ -84,20 +89,6 @@
</filter>
<filter>
- <artifact>com.google.guava:guava</artifact>
- <excludes>
- <exclude>**</exclude>
- </excludes>
- </filter>
-
- <filter>
- <artifact>net.jodah.expiringmap:*</artifact>
- <includes>
- <include>net/jodah/expiringmap/**</include>
- </includes>
- </filter>
-
- <filter>
<artifact>org.onosproject:copycat*</artifact>
<includes>
<include>**</include>
@@ -121,7 +112,7 @@
<configuration>
<instructions>
<Export-Package>
- com.googlecode.concurrenttrees.*;net.kuujo.copycat.*;net.jodah.expiringmap.*
+ com.googlecode.concurrenttrees.*;net.kuujo.copycat.*
</Export-Package>
</instructions>
</configuration>