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
Showing
1 changed file
with
14 additions
and
23 deletions
| ... | @@ -35,13 +35,6 @@ | ... | @@ -35,13 +35,6 @@ |
| 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> | ||
| 40 | - | ||
| 41 | - <dependency> | ||
| 42 | - <groupId>net.jodah</groupId> | ||
| 43 | - <artifactId>expiringmap</artifactId> | ||
| 44 | - <version>0.3.1</version> | ||
| 45 | </dependency> | 38 | </dependency> |
| 46 | 39 | ||
| 47 | <dependency> | 40 | <dependency> |
| ... | @@ -72,28 +65,26 @@ | ... | @@ -72,28 +65,26 @@ |
| 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> |
| 77 | - <filters> | 69 | + <createSourcesJar>true</createSourcesJar> |
| 78 | 70 | ||
| 79 | - <filter> | 71 | + <artifactSet> |
| 80 | - <artifact>com.googlecode.concurrent-trees:concurrent-trees</artifact> | ||
| 81 | - <includes> | ||
| 82 | - <include>com/googlecode/**</include> | ||
| 83 | - </includes> | ||
| 84 | - </filter> | ||
| 85 | - | ||
| 86 | - <filter> | ||
| 87 | - <artifact>com.google.guava:guava</artifact> | ||
| 88 | <excludes> | 72 | <excludes> |
| 89 | - <exclude>**</exclude> | 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> | ||
| 90 | </excludes> | 79 | </excludes> |
| 91 | - </filter> | 80 | + </artifactSet> |
| 81 | + | ||
| 82 | + <filters> | ||
| 92 | 83 | ||
| 93 | <filter> | 84 | <filter> |
| 94 | - <artifact>net.jodah.expiringmap:*</artifact> | 85 | + <artifact>com.googlecode.concurrent-trees:concurrent-trees</artifact> |
| 95 | <includes> | 86 | <includes> |
| 96 | - <include>net/jodah/expiringmap/**</include> | 87 | + <include>com/googlecode/**</include> |
| 97 | </includes> | 88 | </includes> |
| 98 | </filter> | 89 | </filter> |
| 99 | 90 | ||
| ... | @@ -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> | ... | ... |
-
Please register or login to post a comment