Merge branch 'master' of https://bitbucket.org/omds/omdsservicedefinitions into develop
# Conflicts: # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AutorisierungType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/AutorisierungsartType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/CommonProcessRequestType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/CommonProcessResponseType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/CommonRequestType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/CommonResponseType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/DateianhangType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/DokumentDataType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/DokumentInfoType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/KontierungType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ObjectFactory.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ProzessDokumentBasisType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/VersichertesInteresseType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZahlungsdatenType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/common/ZahlwegType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on1basis/ObjectFactory.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CalculateRequestType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CalculateResponseType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateApplicationRequestType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateApplicationResponseType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateOfferRequestType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/CreateOfferResponseType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/FetchPolicyRequestType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/FetchPolicyResponseType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/ObjectFactory.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SpezAntragType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SubmitApplicationRequestType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/common/SubmitApplicationResponseType.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/FetchPolicyKfzResponse.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on2antrag/kfz/ObjectFactory.java # OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_7_0/on7schaden/ObjectFactory.java # OMDSServiceDefinition/src/main/resources/def/r1_7_0/ReleaseNotes-1-7-0.txt # OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds214-00.xsd # OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3CommonServiceTypes.xsd # OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3Services.wsdl # OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON1_Basisfunktionen.xsd # OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON2_Antrag_Common.xsd # OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON2_Antrag_Kfz.xsd # OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON2_Antrag_Kranken.xsd # OMDSServiceDefinition/src/main/resources/def/r1_7_0/omds3_ON7_Schaden.xsd
This commit is contained in:
@@ -253,19 +253,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
|
||||
</dependency>
|
||||
|
||||
<!-- CFX Ende -->
|
||||
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>log4j</groupId>-->
|
||||
<!-- <artifactId>log4j</artifactId>-->
|
||||
<!-- <version>1.2.12</version>-->
|
||||
<!-- <scope>test</scope>-->
|
||||
<!-- </dependency>-->
|
||||
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>junit</groupId>-->
|
||||
<!-- <artifactId>junit</artifactId>-->
|
||||
<!-- <scope>test</scope>-->
|
||||
<!-- </dependency>-->
|
||||
|
||||
</dependencies>
|
||||
|
||||
<!-- Zielordner fuer Deploy unter OMDS-Entwicklung -->
|
||||
|
||||
Reference in New Issue
Block a user