This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a commit to branch javaee6-tck in repository https://gitbox.apache.org/repos/asf/tomee-tck.git
commit 22fa502dd39ef45fda6600a35738538871c31c2c Author: Jean-Louis Monteiro <jeano...@gmail.com> AuthorDate: Fri Feb 1 10:45:19 2019 +0100 Fix before creating a branch for Java EE 6 TCK --- .gitignore | 2 + pom.xml | 112 +++++++-------------- runtests | 10 +- .../openejb/tck/commands/CommandSupport.groovy | 33 ++++-- 4 files changed, 66 insertions(+), 91 deletions(-) diff --git a/.gitignore b/.gitignore index 9b38c42..b2c24ce 100644 --- a/.gitignore +++ b/.gitignore @@ -409,3 +409,5 @@ quick.bat /tomee/tomee-plus-webapp/overlays/ /arquillian/arquillian-tomee-remote/temp report.txt + +derbydb/ diff --git a/pom.xml b/pom.xml index 40276e3..2f6029f 100644 --- a/pom.xml +++ b/pom.xml @@ -38,8 +38,8 @@ <properties> <openejb.groupId>org.apache.tomee</openejb.groupId> - <openejb.version>7.0.4-SNAPSHOT</openejb.version> - <tomee.version>7.0.4-SNAPSHOT</tomee.version> + <openejb.version>7.0.4</openejb.version> + <tomee.version>7.0.4</tomee.version> <tomcat.version>8.5.20</tomcat.version> @@ -89,6 +89,9 @@ <maven.test.skip>true</maven.test.skip> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <version.maven-dependency-plugin>2.9</version.maven-dependency-plugin> + <version.activemq>5.15.8</version.activemq> + <version.gmaven-plugin>1.5</version.gmaven-plugin> </properties> <dependencies> @@ -101,7 +104,7 @@ <dependency> <groupId>org.apache.activemq</groupId> <artifactId>activemq-client</artifactId> - <version>5.14.5</version> + <version>${version.activemq}</version> <exclusions> <exclusion> <artifactId>slf4j-api</artifactId> @@ -114,34 +117,40 @@ <groupId>com.sun.javaee.tck</groupId> <artifactId>tsharness</artifactId> <version>${javaee.tck.version}</version> + <scope>system</scope> + <systemPath>${javaee.cts.home}/lib/tsharness.jar</systemPath> </dependency> <dependency> <groupId>com.sun.javaee.tck</groupId> <artifactId>javatest</artifactId> <version>${javaee.tck.version}</version> + <scope>system</scope> + <systemPath>${javaee.cts.home}/lib/javatest.jar</systemPath> </dependency> <dependency> <groupId>com.sun.javaee.tck</groupId> <artifactId>cts</artifactId> <version>${javaee.tck.version}</version> + <scope>system</scope> + <systemPath>${javaee.cts.home}/lib/cts.jar</systemPath> </dependency> <dependency> <groupId>com.sun.javaee.tck</groupId> <artifactId>whitebox</artifactId> <version>${javaee.tck.version}</version> + <scope>system</scope> + <systemPath>${javaee.cts.home}/dist/com/sun/ts/tests/common/connector/whitebox/whitebox.jar</systemPath> </dependency> <dependency> <groupId>com.sun.javaee.tck</groupId> <artifactId>dbprocedures</artifactId> <version>${javaee.tck.version}</version> - <!-- this is for derby which supports BOOLEAN, version we were using was for derby supporting SMALLINT instead - <systemPath>${javaee6.cts.home}/lib/dbprocedures.jar</systemPath> <scope>system</scope> - --> + <systemPath>${javaee.cts.home}/lib/dbprocedures.jar</systemPath> </dependency> <dependency> @@ -297,6 +306,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> + <version>${version.maven-dependency-plugin}</version> <executions> <execution> @@ -773,76 +783,28 @@ <id>copy-dependencies</id> <phase>pre-integration-test</phase> <goals> - <goal>copy</goal> + <goal>copy-dependencies</goal> </goals> <configuration> - <artifactItems> - <artifactItem> - <groupId>${openejb.groupId}</groupId> - <artifactId>openejb-lite</artifactId> - <outputDirectory>${project.build.directory}/lib</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-client</artifactId> - <outputDirectory>${project.build.directory}/lib</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>backport-util-concurrent</groupId> - <artifactId>backport-util-concurrent</artifactId> - <outputDirectory>${project.build.directory}/lib</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>com.sun.javaee.tck</groupId> - <artifactId>tsharness</artifactId> - <outputDirectory>${openejb.home}/lib</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>com.sun.javaee.tck</groupId> - <artifactId>cts</artifactId> - <outputDirectory>${openejb.home}/lib</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>com.sun.javaee.tck</groupId> - <artifactId>whitebox</artifactId> - <outputDirectory>${openejb.home}/lib</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>com.sun.javaee.tck</groupId> - <artifactId>dbprocedures</artifactId> - <outputDirectory>${openejb.home}/lib</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>org.apache.geronimo.modules</groupId> - <artifactId>geronimo-mail</artifactId> - <outputDirectory>${openejb.home}/lib</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>${openejb.groupId}</groupId> - <artifactId>openejb-derbynet</artifactId> - <outputDirectory>${openejb.home}/lib</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>org.apache.derby</groupId> - <artifactId>derby</artifactId> - <outputDirectory>${openejb.home}/lib</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>org.apache.derby</groupId> - <artifactId>derbynet</artifactId> - <outputDirectory>${openejb.home}/lib</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>org.apache.derby</groupId> - <artifactId>derbyclient</artifactId> - <outputDirectory>${openejb.home}/lib</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>${openejb.groupId}</groupId> - <artifactId>webdeployer</artifactId> - <outputDirectory>${openejb.home}/lib</outputDirectory> - </artifactItem> - </artifactItems> + <outputDirectory>${project.build.directory}/lib</outputDirectory> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>true</overWriteSnapshots> + <excludeTransitive>true</excludeTransitive> + <includeArtifactIds>openejb-lite,activemq-client,activemq-client,tsharness,cts,whitebox,dbprocedures,geronimo-mail,openejb-derbynet,derby,derbynet,derbyclient,webdeployer</includeArtifactIds> + </configuration> + </execution> + <execution> + <id>copy-dependencies-tomee-lib</id> + <phase>pre-integration-test</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>${openejb.home}/lib</outputDirectory> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>true</overWriteSnapshots> + <excludeTransitive>true</excludeTransitive> + <includeArtifactIds>openejb-lite,activemq-client,activemq-client,tsharness,cts,whitebox,dbprocedures,geronimo-mail,openejb-derbynet,derby,derbynet,derbyclient,webdeployer</includeArtifactIds> </configuration> </execution> </executions> @@ -880,7 +842,7 @@ <plugin> <groupId>org.codehaus.gmaven</groupId> <artifactId>gmaven-plugin</artifactId> - <version>1.5</version> + <version>${version.gmaven-plugin}</version> <dependencies> <dependency> diff --git a/runtests b/runtests index 79b2245..fb82cb4 100755 --- a/runtests +++ b/runtests @@ -324,13 +324,13 @@ echo "" # just an empty line } [ ! -z $env ] && export -egrep 'javaee6.(ri|cts).home' ~/.m2/settings.xml | perl -pe 's,^ *|<[^>]+>,,g' | while read n; do echo $n; ls -l $n; done -svn info +# printing the content of the 2 main directories +egrep 'javaee.(ri|cts).home' ~/.m2/settings.xml | perl -pe 's,^ *|<[^>]+>,,g' | while read n; do echo $n; ls -l $n; done # Fire up Maven to do the real work if [ -z $nc ]; then -exec mvn $MAVEN_OPTS -U -V --file "$DIRNAME/pom.xml" \ +exec mvn -U -V --file "$DIRNAME/pom.xml" \ --batch-mode \ --errors \ $CONFIG \ @@ -346,12 +346,12 @@ exec mvn $MAVEN_OPTS -U -V --file "$DIRNAME/pom.xml" \ -e "s/\(\[ERROR\].*\)/${BOLD}${TEXT_RED}\1${RESET_FORMATTING}/g" \ -e "s/Tests run: \([^,]*\), Failures: \([^,]*\), Errors: \([^,]*\), Skipped: \([^,]*\)/${BOLD}${TEXT_GREEN}Tests run: \1${RESET_FORMATTING}, Failures: ${BOLD}${TEXT_RED}\2${RESET_FORMATTING}, Errors: ${BOLD}${TEXT_RED}\3${RESET_FORMATTING}, Skipped: ${BOLD}${TEXT_YELLOW}\4${RESET_FORMATTING}/g" else -exec mvn $MAVEN_OPTS -U -V --file "$DIRNAME/pom.xml" \ +exec mvn -U -V --file "$DIRNAME/pom.xml" \ --batch-mode \ --errors \ $CONFIG \ $tomcatVersion \ - $args + $args fi # Make sure formatting is reset diff --git a/src/test/script/openejb/tck/commands/CommandSupport.groovy b/src/test/script/openejb/tck/commands/CommandSupport.groovy index 1bb0d20..6b7ccf3 100644 --- a/src/test/script/openejb/tck/commands/CommandSupport.groovy +++ b/src/test/script/openejb/tck/commands/CommandSupport.groovy @@ -27,8 +27,7 @@ import openejb.tck.util.TestListBuilder * * @version $Revision$ $Date$ */ -abstract class CommandSupport -{ +abstract class CommandSupport { def source def log @@ -63,8 +62,7 @@ abstract class CommandSupport adapter.emacsMode = true if (log.debugEnabled) { adapter.messageOutputLevel = p.MSG_VERBOSE - } - else { + } else { adapter.messageOutputLevel = p.MSG_INFO } p.addBuildListener(adapter) @@ -187,6 +185,9 @@ abstract class CommandSupport builder.directory = "${project.build.directory}" builder.append("openejb-tck-*.jar") builder.directory = openejbLib + + + builder.appendAll("openejb-core-*.jar") builder.directory = "${project.build.directory}/lib" builder.appendAll("*.jar") @@ -206,16 +207,22 @@ abstract class CommandSupport builder.reference("openejb.porting.classes") builder.directory = openejbLib builder.appendAll("commons-logging-*.jar") - builder.appendAll("openjpa-*.jar") + + if (get("webcontainer").equals("tomee-plume")) { + builder.appendAll("eclipselink-*.jar") + } else { + builder.appendAll("openjpa-*.jar") + } + // builder.append("hsqldb-*.jar") - builder.append("derby-*.jar") - builder.append("derbyclient-*.jar") + builder.append("derby-*.jar") + builder.append("derbyclient-*.jar") builder.append("openejb-client*.jar") builder.directory = "${javaeetckHome}/lib" builder.append("javatest.jar") builder.append("tsharness.jar") builder.append("cts.jar") - builder.append("dbprocedures.jar") + builder.append("dbprocedures.jar") builder.append("commons-httpclient*.jar") builder.append("jdom.jar") builder.append("dom4j.jar") @@ -258,8 +265,12 @@ abstract class CommandSupport builder.append("jaxb-impl.jar") builder.append("jaxb-xjc.jar") builder.directory = openejbLib - builder.append("derby-*.jar") - builder.append("derbyclient-*.jar") + builder.append("derby-*.jar") + builder.append("derbyclient-*.jar") + if (get("webcontainer").equals("tomee-plume")) { + builder.appendAll("eclipselink-*.jar") + } + builder.getPath("openejb.embedded.classpath") } @@ -276,7 +287,7 @@ abstract class CommandSupport log.info("TCK pom version: " + require('javaee.tck.version')) log.info("Start - Container libraries") if (lib.exists() && lib.isDirectory()) { - lib.listFiles().grep(~/.*.jar/).sort{ it.name }.each { + lib.listFiles().grep(~/.*.jar/).sort { it.name }.each { log.info(" - $it.name") } }