This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git
commit d6ef2a14ce21abe19fc9e00038b682b0ddc17758 Author: Jean-Louis Monteiro <[email protected]> AuthorDate: Sun Sep 22 14:00:44 2019 -0700 TOMEE-2687 add CDI TCK Signature Test --- tck/{cdi-standalone => cdi-signature-test}/pom.xml | 21 ++++++++++++--------- tck/pom.xml | 2 +- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/tck/cdi-standalone/pom.xml b/tck/cdi-signature-test/pom.xml similarity index 86% rename from tck/cdi-standalone/pom.xml rename to tck/cdi-signature-test/pom.xml index e3c6fdc..0463179 100644 --- a/tck/cdi-standalone/pom.xml +++ b/tck/cdi-signature-test/pom.xml @@ -23,8 +23,8 @@ </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>cdi-standalone</artifactId> - <name>TomEE :: TCK :: CDI Standalone</name> + <artifactId>cdi-signature-test</artifactId> + <name>TomEE :: TCK :: CDI TCK Signature Tests</name> <dependencies> <dependency> @@ -76,13 +76,14 @@ <build> <plugins> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <version>3.0.0</version> <executions> <execution> - <id>copy-tck-api-signature-file</id> + <id>copy-tck-cdi-api-signature-file</id> <phase>generate-test-sources</phase> <goals> <goal>unpack</goal> @@ -94,13 +95,17 @@ <artifactId>cdi-tck-impl</artifactId> <version>${cdi-tck.version}</version> <type>jar</type> - <overWrite>false</overWrite> + <overWrite>true</overWrite> </artifactItem> </artifactItems> + <!-- We just need the signature file and nothing else --> + <includes>**/*.sig</includes> + <outputDirectory>${project.build.directory}/api-signature</outputDirectory> </configuration> </execution> </executions> </plugin> + <plugin> <groupId>org.netbeans.tools</groupId> <artifactId>sigtest-maven-plugin</artifactId> @@ -113,13 +118,11 @@ </execution> </executions> <configuration> - <packages>javax.validation,javax.validation.bootstrap,javax.validation.constraints, - javax.validation.constraintvalidation,javax.validation.executable,javax.validation.groups, - javax.validation.metadata,javax.validation.spi,javax.validation.valueextraction - </packages> - <sigfile>${project.build.directory}/api-signature/validation-api-java8.sig</sigfile> + <packages>javax.inject,javax.decorator</packages> + <sigfile>${project.build.directory}/api-signature/cdi-api-jdk7.sig</sigfile> </configuration> </plugin> + </plugins> </build> diff --git a/tck/pom.xml b/tck/pom.xml index e8fb9eb..c515c14 100644 --- a/tck/pom.xml +++ b/tck/pom.xml @@ -38,7 +38,7 @@ <module>tck-common</module> <module>cdi-embedded</module> <module>cdi-tomee</module> - <!--<module>cdi-standalone</module>--> + <module>cdi-signature-test</module> <module>bval-embedded</module> <module>bval-tomee</module> <module>bval-signature-test</module>
