Repository: incubator-edgent Updated Branches: refs/heads/develop f585f01fa -> 1e51ff2d9
[Edgent-442] j7 connectors/websocket-jetty jar lacks LICENSE,... Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/625d5198 Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/625d5198 Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/625d5198 Branch: refs/heads/develop Commit: 625d5198e9a51ef4b0e5fdee081c7b996dd4276b Parents: decca00 Author: Dale LaBossiere <dlab...@us.ibm.com> Authored: Wed Dec 13 12:05:16 2017 -0500 Committer: Dale LaBossiere <dlab...@us.ibm.com> Committed: Wed Dec 13 12:05:16 2017 -0500 ---------------------------------------------------------------------- .../java7/connectors/websocket-jetty/pom.xml | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/625d5198/platforms/java7/connectors/websocket-jetty/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/java7/connectors/websocket-jetty/pom.xml b/platforms/java7/connectors/websocket-jetty/pom.xml index 1f95bf5..70ba1d5 100644 --- a/platforms/java7/connectors/websocket-jetty/pom.xml +++ b/platforms/java7/connectors/websocket-jetty/pom.xml @@ -53,7 +53,14 @@ <artifactId>${project.artifactId}</artifactId> <version>${project.version}</version> <outputDirectory>${project.build.directory}/classes</outputDirectory> - <excludes>META-INF/*,META-INF/maven/**</excludes> + <!-- + We can't use the typical <excludes>META-INF/**</excludes>, + that avoids getting other inappropriate metadata like + the pom info and DEPENDENCIES, + because we need to get the "service" metadata and impl + from the j8 jar. + --> + <includes>META-INF/services/**,**/*.class</includes> </artifactItem> </artifactItems> </configuration> @@ -79,16 +86,6 @@ </execution> </executions> </plugin> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <classesDirectory>${project.build.directory}/classes</classesDirectory> - <includes> - <include>META-INF/services/**</include> - <include>org/apache/edgent/javax/websocket/impl/*.class</include> - </includes> - </configuration> - </plugin> </plugins> </build>
