chore(core): fix some more problems after project refactoring

3 files changed, 2 insertions, 10 deletions

diff --git a/connector/src/main/resources/specific_eIDAS_connector.beans.xml b/connector/src/main/resources/specific_eIDAS_connector.beans.xml
index 7ce668ff..46cf1f5b 100644
--- a/connector/src/main/resources/specific_eIDAS_connector.beans.xml
+++ b/connector/src/main/resources/specific_eIDAS_connector.beans.xml
@@ -12,10 +12,6 @@
     http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd">
 
   <import resource="specific_eIDAS_core.beans.xml"/>
-<<<<<<< HEAD
-=======
-
->>>>>>> 7bf7c3c03fd3a1efeaf3f8e3dd75922e2f5f9921
 
   <bean id="processEngineSignalController"
         class="at.asitplus.eidas.specific.connector.controller.ProcessEngineSignalController" />
@@ -62,12 +58,8 @@
         class="at.asitplus.eidas.specific.connector.provider.PvpMetadataProvider" />
 
   <bean id="PVPSubjectNameGenerator"
-<<<<<<< HEAD
-    class="at.asitplus.eidas.specific.connector.builder.PvpSubjectNameGenerator" />
-=======
         class="at.asitplus.eidas.specific.connector.builder.PvpSubjectNameGenerator" />
 
->>>>>>> 7bf7c3c03fd3a1efeaf3f8e3dd75922e2f5f9921
 
   <!-- Tasks -->
   <bean id="GenerateCountrySelectionFrameTask"
diff --git a/modules/authmodule_id-austria/pom.xml b/modules/authmodule_id-austria/pom.xml
index 2c73617a..f4f226e4 100644
--- a/modules/authmodule_id-austria/pom.xml
+++ b/modules/authmodule_id-austria/pom.xml
@@ -83,6 +83,7 @@
       <groupId>at.asitplus.eidas.ms_specific</groupId>
       <artifactId>core_common_lib</artifactId>
       <scope>test</scope>
+      <type>test-jar</type>
     </dependency>    
     <dependency>
       <groupId>at.gv.egiz.eaaf</groupId>
diff --git a/modules/authmodule_id-austria/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/task/RequestIdAustriaSystemTaskTest.java b/modules/authmodule_id-austria/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/task/RequestIdAustriaSystemTaskTest.java
index 54b019eb..f6ffc729 100644
--- a/modules/authmodule_id-austria/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/task/RequestIdAustriaSystemTaskTest.java
+++ b/modules/authmodule_id-austria/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/task/RequestIdAustriaSystemTaskTest.java
@@ -59,7 +59,6 @@ import at.gv.egiz.eaaf.modules.pvp2.impl.opensaml.initialize.EaafOpenSaml3xIniti
 import at.gv.egiz.eaaf.modules.pvp2.impl.utils.Saml2Utils;
 import at.gv.egiz.eaaf.modules.pvp2.impl.validation.TrustEngineFactory;
 import at.gv.egiz.eaaf.modules.pvp2.impl.verification.SamlVerificationEngine;
-import at.gv.egiz.eaaf.modules.pvp2.test.binding.PostBindingTest;
 import eu.eidas.auth.commons.light.impl.LightRequest;
 
 @RunWith(SpringJUnit4ClassRunner.class)
@@ -436,7 +435,7 @@ public class RequestIdAustriaSystemTaskTest {
 
       @Override
       public InputStream getTemplate(String viewName) {
-        return PostBindingTest.class.getResourceAsStream("/data/pvp_postbinding_template.html");
+        return RequestIdAustriaSystemTaskTest.class.getResourceAsStream("/data/pvp_postbinding_template.html");
       }
 
       @Override