also simplify the j7 appservice-applications pom simplify pom, and include LICENSE, etc in the jar, using lessons learned in j7 connectors/websocket-jetty pom.
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/90dee3fa Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/90dee3fa Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/90dee3fa Branch: refs/heads/develop Commit: 90dee3fa6276dd332bdcd0c03f9f8f00942c752f Parents: 625d519 Author: Dale LaBossiere <dlab...@us.ibm.com> Authored: Wed Dec 13 12:52:46 2017 -0500 Committer: Dale LaBossiere <dlab...@us.ibm.com> Committed: Wed Dec 13 12:52:46 2017 -0500 ---------------------------------------------------------------------- .../java7/test/appservice-applications/pom.xml | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/90dee3fa/platforms/java7/test/appservice-applications/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/java7/test/appservice-applications/pom.xml b/platforms/java7/test/appservice-applications/pom.xml index d4d2fab..93ec217 100644 --- a/platforms/java7/test/appservice-applications/pom.xml +++ b/platforms/java7/test/appservice-applications/pom.xml @@ -49,7 +49,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> @@ -75,16 +82,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/test/topology/services/*.class</include> - </includes> - </configuration> - </plugin> <!-- We don't want to deploy this project to Maven --> <plugin> <groupId>org.apache.maven.plugins</groupId>
