fix errors after merge

hibernate-core/hibernate-core.gradle

@@ -277,26 +277,6 @@ task generateEnversStaticMetamodel(
     destinationDir = new File( "${projectDir}/src/main/java" )
 }
 
-
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// todo (6.0) : fix after fixing hibernate-spatial
-processTestResources {
-    doLast {
-        copy {
-            from file( 'src/test/resources' )
-            into file( "${buildDir}/resources/test" )
-            include 'arquillian.xml'
-            include 'org/hibernate/test/wf/ddl/manifest.mf'
-            expand wildFlyInstallDir: project( ':hibernate-orm-modules' ).wildFlyInstallDir,
-                   hibernateMajorMinorVersion: "${project.ormVersion.family}",
-                   arquillianDeploymentExportDir: "${rootProject.buildDir.absolutePath}/arquillian-deployments"
-        }
-    }
-}
-
-test.dependsOn ':hibernate-orm-modules:prepareWildFlyForTests'
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 test {
     systemProperty 'file.encoding', 'utf-8'
     beforeTest { descriptor ->

hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ParameterTests.java

@@ -32,8 +32,6 @@ import org.hibernate.testing.orm.junit.ExpectedExceptionExtension;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
-import org.jboss.arquillian.test.spi.annotation.TestScoped;
-
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;