Merge branch 'master' of https://gitbox.apache.org/repos/asf/tomee-tck
diff --git a/README.adoc b/README.adoc
index 00ec265..d6ce764 100644
--- a/README.adoc
+++ b/README.adoc
@@ -177,6 +177,34 @@
 
    ./runtests --web tomee-plume com/sun/ts/tests/ejb30/lite/stateful/concurrency/accesstimeout/annotated/Client#beanClassLevel_from_ejbembed
 
+## TEST DEBUG
+
+The following are the flags the scrip `runtests` accept for debuggin purposes:
+
+
+    -d,--debug              Enable Server and TCK appclient debug options (5005 and 5003)
+    -de,--debug-embedded    Enable TCK embedded ejb debug options (port 5001)
+    -dh,--debug-harness     Enable TCK harness debug options (port 5002)
+    -da,--debug-appclient   Enable TCK appclient debug options (port 5003)
+    -dj,--debug-javatest    Enable TCK javatest debug options (port 5004)
+    -ds,--debug-server      Enable Server debug options (port 5005)
+    --connector             deploy connectors for connector tests
+
+You can attach to the ports via your IDE remote debugger options.
+Example:
+
+    ./runtests --web tomee-plume -c -d com.sun.ts.tests.ejb30.lite.stateful.concurrency.accesstimeout.annotated.Client#beanClassLevel_from_ejbembed
+
+Depending on the IDE, you will need to attempt twice to connect to the exposed port.
+
+## WHAT TO TEST
+
+The test that needs to be tested are the one having the following `keywords`:
+
+    javaee_web_profile, ejb_web_profile, jacc_web_profile, jaspic_web_profile, javamail_web_profile, jaxr_web_profile, xa_web_profile, jaxrpc_web_profile, jaxws_web_profile
+
+For more information about TCK structure and tests attributes check the link:about_tck{outfilesuffix}[about_tck] documentation.
+
 ## WHAT NEXT
 
 Getting from zero to passing is a long road.  Failures and the
diff --git a/about_tck.adoc b/about_tck.adoc
new file mode 100644
index 0000000..335891f
--- /dev/null
+++ b/about_tck.adoc
@@ -0,0 +1,37 @@
+# About JakartaEE TCK
+
+## CTS
+
+The JakartaEE Test Compatibility Kit (TCK) is conformed by a Compatibility Test Suite (CTS).
+
+CTS is a set of tools and tests used to verify that a licensee's implementation of Java EE 8 technology conforms to the applicable specification.
+
+Java EE 8 CTS includes version 5.0 of the JT harness.
+
+## Tests organization
+
+The JakartaEE TCK is conformed by a total of 47,219 tests that can be divided in two subset: one set for Web Profile and other for Full Profile.
+
+Each test has a set of attributes like id, keyword, testName, test_directory and classname among others.
+The `keyword` attribute can be used to differentiate the test that belong to a Web and/or Full Profile, and if they are optional base on the type of profile.
+
+The following are the `keywords` related with Web Profile:
+
+    javaee_web_profile, ejb_web_profile, jacc_web_profile, jaspic_web_profile, javamail_web_profile, jaxr_web_profile, xa_web_profile, jaxrpc_web_profile, jaxws_web_profile
+
+## JT Harness UI
+This is a useful UI tool that comes in handy when one needs to know if a specific test is or not part of a specific profile.
+
+## start JT Harness UI
+From the `$TCK_HOME` execute:
+
+    cd bin
+    ant gui
+
+The UI shows all the TCK test and you can navigate to an specific test and view the Test Description tab that contains the test attributes described above.
+
+
+
+
+
+
diff --git a/pom.xml b/pom.xml
index 9849e8c..f93d4c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,8 +38,8 @@
   <properties>
 
     <openejb.groupId>org.apache.tomee</openejb.groupId>
-    <openejb.version>8.0.0-M2</openejb.version>
-    <tomee.version>8.0.0-M2</tomee.version>
+    <openejb.version>8.0.0-SNAPSHOT</openejb.version>
+    <tomee.version>8.0.0-SNAPSHOT</tomee.version>
 
     <tomcat.version>9.0.12</tomcat.version>
 
@@ -50,7 +50,7 @@
     -->
     <javaee.cts.home>${javaee8.cts.home}</javaee.cts.home>
     <javaee.ri.home>${javaee8.ri.home}</javaee.ri.home>
-    <javaee.tck.version>8.0a</javaee.tck.version>
+    <javaee.tck.version>8.0</javaee.tck.version>
 
     <localRepository>${settings.localRepository}</localRepository>
     <examples.version>1.1-SNAPSHOT</examples.version>
diff --git a/runtests b/runtests
index fb82cb4..8c4ee1a 100755
--- a/runtests
+++ b/runtests
@@ -330,7 +330,7 @@
 
 # Fire up Maven to do the real work
 if [ -z $nc ]; then
-exec mvn -U -V --file "$DIRNAME/pom.xml" \
+exec mvn -V --file "$DIRNAME/pom.xml" \
       --batch-mode \
       --errors \
       $CONFIG \
@@ -346,7 +346,7 @@
                -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 -U -V --file "$DIRNAME/pom.xml" \
+exec mvn -V --file "$DIRNAME/pom.xml" \
       --batch-mode \
       --errors \
       $CONFIG \
diff --git a/src/test/resources/testsuite.properties b/src/test/resources/testsuite.properties
index 1b290d9..0dbf8d6 100644
--- a/src/test/resources/testsuite.properties
+++ b/src/test/resources/testsuite.properties
@@ -158,6 +158,7 @@
 
 mailuser1=foo@foo.com
 mailHost=localhost
+javamail.password=test
 
 openejb.deployment.passwd=ignored
 openejb.deployment.user=ignored
diff --git a/src/test/tomee-plume/conf/system.properties b/src/test/tomee-plume/conf/system.properties
index 1ee4756..690f982 100644
--- a/src/test/tomee-plume/conf/system.properties
+++ b/src/test/tomee-plume/conf/system.properties
@@ -19,6 +19,7 @@
 openejb.deployments.classpath=true
 tomee.remote.support=true
 openejb.embedded.remotable=true
+openejb.environment.default=true
 
 RESOURCE.whitebox-notx-param|poolMaxSize=100
 RESOURCE.whitebox-notx|poolMaxSize=100
diff --git a/src/test/tomee-plus/conf/system.properties b/src/test/tomee-plus/conf/system.properties
index 1acf4a7..e817bcc 100644
--- a/src/test/tomee-plus/conf/system.properties
+++ b/src/test/tomee-plus/conf/system.properties
@@ -19,6 +19,7 @@
 openejb.deployments.classpath=true
 tomee.remote.support=true
 openejb.embedded.remotable=true
+openejb.environment.default=true
 
 RESOURCE.whitebox-notx-param|poolMaxSize=100
 RESOURCE.whitebox-notx|poolMaxSize=100
diff --git a/src/test/tomee/conf/system.properties b/src/test/tomee/conf/system.properties
index 7052e9f..2fcba79 100644
--- a/src/test/tomee/conf/system.properties
+++ b/src/test/tomee/conf/system.properties
@@ -19,6 +19,7 @@
 openejb.deployments.classpath=true
 tomee.remote.support=true
 openejb.embedded.remotable=true
+openejb.environment.default=true
 
 RESOURCE.whitebox-notx-param|poolMaxSize=100
 RESOURCE.whitebox-notx|poolMaxSize=100