Fix most of the @DataSourceDefinition based tests by overriding the Derby port number
diff --git a/src/test/tomee-plume/conf/system.properties b/src/test/tomee-plume/conf/system.properties
index 3424747..a99f793 100644
--- a/src/test/tomee-plume/conf/system.properties
+++ b/src/test/tomee-plume/conf/system.properties
@@ -102,6 +102,9 @@
 old-dd-whitebox-xa-param.rar.moduleId=oldwhitebox-xa-param
 old-dd-whitebox-xa.rar.moduleId=oldwhitebox-xa
 
+RESOURCE.global/jdbc/DB3|PortNumber=%derby.server.port%
+RESOURCE.defaultdsrepeatable|PortNumber=%derby.server.port%
+RESOURCE.defaultdsrepeatable1|PortNumber=%derby.server.port%
 
 compds.JdbcDriver=org.apache.derby.jdbc.ClientDriver
 compds.JdbcUrl=jdbc:derby://localhost:%derby.server.port%/derbydb;create=true