prodddd

tldd-hotels/.classpath

@@ -18,12 +18,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
-		<attributes>
-			<attribute name="test" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>

tldd-hotels/target/classes/META-INF/MANIFEST.MF

 Manifest-Version: 1.0
+<<<<<<< HEAD
 Bnd-LastModified: 1595861104859
 Build-Jdk-Spec: 1.8
+=======
+Bnd-LastModified: 1594300674429
+Build-Jdk: 1.8.0_121
+Built-By: kasmi
+>>>>>>> 38409d887f3f1dc529bb01b9314fa594d8cc4402
 Bundle-ManifestVersion: 2
 Bundle-Name: tdr
 Bundle-SymbolicName: tldd-hotels
 Bundle-Version: 0.0.1.SNAPSHOT
 Created-By: Apache Maven Bundle Plugin
+<<<<<<< HEAD
 Export-Package: com.fractalite.hermes.teldar.Marshaller;uses:="com.gekko
  _holding.webservice.v2_4,org.apache.camel,org.springframework.stereotyp
  e";version="0.0.1",com.fractalite.hermes.teldar.cfg;uses:="com.fractali
@@ -44,5 +51,45 @@ Import-Package: com.fractalite.hermes.services.stay;version="[0.1,1)",co
  n="[1.6,2)",org.springframework.beans.factory.config;version="[3.0,4)",
  org.springframework.stereotype;version="[3.0,4)",org.w3c.dom,org.xml.sa
  x
+=======
+Export-Package: com.gekko_holding.webservice.v2_4;version="0.0.1";uses:=
+ "javax.jws,javax.xml.bind,javax.xml.bind.annotation,javax.xml.namespace
+ ,javax.xml.ws",com.fractalite.hermes.teldar.parsers;version="0.0.1";use
+ s:="com.fractalite.models.travel.stay,javax.xml.parsers,javax.xml.xpath
+ ,org.apache.camel,org.slf4j,org.springframework.stereotype,org.xml.sax"
+ ,com.fractalite.hermes.teldar.tools;version="0.0.1";uses:="com.fractali
+ te.models.travel.stay,javax.xml.bind.annotation",com.fractalite.hermes.
+ teldar.cfg;version="0.0.1";uses:="com.fractalite.hermes.services.stay,j
+ avax.xml.parsers,org.apache.camel.builder,org.w3c.dom,org.xml.sax",com.
+ fractalite.hermes.teldar.Marshaller;version="0.0.1";uses:="com.gekko_ho
+ lding.webservice.v2_4,org.apache.camel,org.springframework.stereotype",
+ com.fractalite.hermes.teldar.services;version="0.0.1";uses:="com.fracta
+ lite.models.commerce,com.fractalite.models.travel.stay,com.gekko_holdin
+ g.webservice.v2_4,javax.xml.datatype,org.apache.camel,org.slf4j"
+Import-Package: org.apache.camel;version="[2.8,3)",org.apache.camel.mode
+ l;version="[2.8,3)",org.apache.camel.model.language;version="[2.8,3)",o
+ rg.slf4j;version="[1.6,2)",org.xml.sax,org.joda.time;version="[1.5,2)",
+ org.joda.time.format;version="[1.5,2)",javax.xml.bind,javax.xml.bind.an
+ notation,javax.xml.datatype,javax.xml.namespace,javax.xml.parsers,javax
+ .xml.soap,javax.xml.transform,javax.xml.transform.dom,javax.xml.transfo
+ rm.stream,javax.xml.ws,javax.xml.xpath,org.apache.camel.builder;version
+ ="[2.8,3)",com.fractalite.hermes.services.stay;version="[0.1,1)",com.fr
+ actalite.hermes.teldar.Marshaller;version="[0.0,1)",com.fractalite.herm
+ es.teldar.parsers;version="[0.0,1)",com.fractalite.hermes.teldar.servic
+ es;version="[0.0,1)",com.fractalite.hermes.teldar.tools;version="[0.0,1
+ )",com.fractalite.models.commerce;version="[0.0,1)",com.fractalite.mode
+ ls.common;version="[0.0,1)",com.fractalite.models.travel;version="[0.0,
+ 1)",com.fractalite.models.travel.stay;version="[0.0,1)",com.gekko_holdi
+ ng.webservice.v2_4;version="[0.0,1)",com.giata.desthotel.mapping;versio
+ n="[0.0,1)",com.google.i18n.phonenumbers,javax.jws,org.apache.camel.com
+ ponent.http4;version="[2.8,3)",org.apache.camel.converter.jaxb;version=
+ "[2.8,3)",org.apache.camel.spi;version="[2.8,3)",org.apache.servicemix.
+ camel.nmr,org.apache.servicemix.nmr.api,org.codehaus.jackson.map;versio
+ n="[1.8,2)",org.springframework.stereotype;version="[3.0,4)",org.w3c.do
+ m,org.apache.camel.model.config;version="[2.8,3)",org.apache.camel.mode
+ l.dataformat;version="[2.8,3)",org.apache.camel.model.loadbalancer;vers
+ ion="[2.8,3)",org.springframework.beans.factory.config;version="[3.0,4)
+ "
+>>>>>>> 38409d887f3f1dc529bb01b9314fa594d8cc4402
 Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.6))"
 Tool: Bnd-5.1.1.202006162103