HIGUCHI Yuta
Committed by Gerrit Code Review

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
...@@ -35,16 +35,9 @@ ...@@ -35,16 +35,9 @@
35 <dependency> 35 <dependency>
36 <groupId>com.googlecode.concurrent-trees</groupId> 36 <groupId>com.googlecode.concurrent-trees</groupId>
37 <artifactId>concurrent-trees</artifactId> 37 <artifactId>concurrent-trees</artifactId>
38 - <version>2.4.0</version>
39 </dependency> 38 </dependency>
40 39
41 <dependency> 40 <dependency>
42 - <groupId>net.jodah</groupId>
43 - <artifactId>expiringmap</artifactId>
44 - <version>0.3.1</version>
45 - </dependency>
46 -
47 - <dependency>
48 <!-- FIXME once fixes get merged to upstream --> 41 <!-- FIXME once fixes get merged to upstream -->
49 <groupId>org.onosproject</groupId> 42 <groupId>org.onosproject</groupId>
50 <artifactId>copycat-api</artifactId> 43 <artifactId>copycat-api</artifactId>
...@@ -72,8 +65,20 @@ ...@@ -72,8 +65,20 @@
72 <plugin> 65 <plugin>
73 <groupId>org.apache.maven.plugins</groupId> 66 <groupId>org.apache.maven.plugins</groupId>
74 <artifactId>maven-shade-plugin</artifactId> 67 <artifactId>maven-shade-plugin</artifactId>
75 - <version>2.3</version>
76 <configuration> 68 <configuration>
69 + <createSourcesJar>true</createSourcesJar>
70 +
71 + <artifactSet>
72 + <excludes>
73 + <!-- exclude OSGi-ready transitive dependencies -->
74 + <exclude>com.google.guava:guava</exclude>
75 + <exclude>com.esotericsoftware:*</exclude>
76 + <exclude>org.ow2.asm:asm</exclude>
77 + <exclude>org.objenesis:objenesis</exclude>
78 + <exclude>io.netty:*</exclude>
79 + </excludes>
80 + </artifactSet>
81 +
77 <filters> 82 <filters>
78 83
79 <filter> 84 <filter>
...@@ -84,20 +89,6 @@ ...@@ -84,20 +89,6 @@
84 </filter> 89 </filter>
85 90
86 <filter> 91 <filter>
87 - <artifact>com.google.guava:guava</artifact>
88 - <excludes>
89 - <exclude>**</exclude>
90 - </excludes>
91 - </filter>
92 -
93 - <filter>
94 - <artifact>net.jodah.expiringmap:*</artifact>
95 - <includes>
96 - <include>net/jodah/expiringmap/**</include>
97 - </includes>
98 - </filter>
99 -
100 - <filter>
101 <artifact>org.onosproject:copycat*</artifact> 92 <artifact>org.onosproject:copycat*</artifact>
102 <includes> 93 <includes>
103 <include>**</include> 94 <include>**</include>
...@@ -121,7 +112,7 @@ ...@@ -121,7 +112,7 @@
121 <configuration> 112 <configuration>
122 <instructions> 113 <instructions>
123 <Export-Package> 114 <Export-Package>
124 - com.googlecode.concurrenttrees.*;net.kuujo.copycat.*;net.jodah.expiringmap.* 115 + com.googlecode.concurrenttrees.*;net.kuujo.copycat.*
125 </Export-Package> 116 </Export-Package>
126 </instructions> 117 </instructions>
127 </configuration> 118 </configuration>
......