Cambios en los pom

Se cambió la versión del common de los pom por la más nueva
Fusion con la mas moderna

Conflicts:

client.service.subsystem.web/target/client.service.subsystem.web-0.0.1-S
NAPSHOT.war

client.service.subsystem.web/target/client.service.subsystem.web-0.0.1-S
NAPSHOT/WEB-INF/lib/client.service.subsystem-0.0.1-SNAPSHOT.jar
	client.service.subsystem.web/target/maven-archiver/pom.properties
	client.service.subsystem/derby.log

client.service.subsystem/target/client.service.subsystem-0.0.1-SNAPSHOT.
jar
	client.service.subsystem/target/maven-archiver/pom.properties

client.service.subsystem/target/surefire-reports/TEST-co.edu.uniandes.cs
w.client.logic.ejb.ClientLogicServiceTest.xml

client.service.subsystem/target/surefire-reports/TEST-co.edu.uniandes.cs
w.client.persistence.ClientPersistenceTest.xml

client.service.subsystem/target/surefire-reports/co.edu.uniandes.csw.cli
ent.logic.ejb.ClientLogicServiceTest.txt

client.service.subsystem/target/surefire-reports/co.edu.uniandes.csw.cli
ent.persistence.ClientPersistenceTest.txt
	client.web/target/client.web-0.0.1-SNAPSHOT.war
	client.web/target/maven-archiver/pom.properties
	product.service.subsystem.web/target/maven-archiver/pom.properties

product.service.subsystem.web/target/product.service.subsystem.web-0.0.1
-SNAPSHOT.war

product.service.subsystem.web/target/product.service.subsystem.web-0.0.1
-SNAPSHOT/WEB-INF/lib/product.service.subsystem-0.0.1-SNAPSHOT.jar
	product.service.subsystem/derby.log
	product.service.subsystem/target/maven-archiver/pom.properties

product.service.subsystem/target/product.service.subsystem-0.0.1-SNAPSHO
T.jar

product.service.subsystem/target/surefire-reports/TEST-co.edu.uniandes.c
sw.product.logic.ejb.ProductLogicServiceTest.xml

product.service.subsystem/target/surefire-reports/TEST-co.edu.uniandes.c
sw.product.persistence.ProductPersistenceTest.xml

product.service.subsystem/target/surefire-reports/co.edu.uniandes.csw.pr
oduct.logic.ejb.ProductLogicServiceTest.txt

product.service.subsystem/target/surefire-reports/co.edu.uniandes.csw.pr
oduct.persistence.ProductPersistenceTest.txt
	product.web/target/maven-archiver/pom.properties
	product.web/target/product.web-0.0.1-SNAPSHOT.war
	pyme.master.service.subsystem/target/maven-archiver/pom.properties

pyme.master.service.subsystem/target/pyme.master.service.subsystem-0.0.1
-SNAPSHOT.war

pyme.master.service.subsystem/target/pyme.master.service.subsystem-0.0.1
-SNAPSHOT/WEB-INF/lib/client.service.subsystem-0.0.1-SNAPSHOT.jar

pyme.master.service.subsystem/target/pyme.master.service.subsystem-0.0.1
-SNAPSHOT/WEB-INF/lib/product.service.subsystem-0.0.1-SNAPSHOT.jar

pyme.master.service.subsystem/target/pyme.master.service.subsystem-0.0.1
-SNAPSHOT/WEB-INF/lib/pyme.service.subsystem-0.0.1-SNAPSHOT.jar

pyme.master.service.subsystem/target/war/work/co.edu.uniandes.csw.spl/cl
ient.web/META-INF/MANIFEST.MF

pyme.master.service.subsystem/target/war/work/co.edu.uniandes.csw.spl/cl
ient.web/META-INF/maven/co.edu.uniandes.csw.spl/client.web/pom.propertie
s

pyme.master.service.subsystem/target/war/work/co.edu.uniandes.csw.spl/pr
oduct.web/META-INF/MANIFEST.MF

pyme.master.service.subsystem/target/war/work/co.edu.uniandes.csw.spl/pr
oduct.web/META-INF/maven/co.edu.uniandes.csw.spl/product.web/pom.propert
ies

pyme.master.service.subsystem/target/war/work/co.edu.uniandes.csw.spl/py
me.web/META-INF/MANIFEST.MF

pyme.master.service.subsystem/target/war/work/co.edu.uniandes.csw.spl/py
me.web/META-INF/maven/co.edu.uniandes.csw.spl/pyme.web/pom.properties
	pyme.service.subsystem.web/target/maven-archiver/pom.properties

pyme.service.subsystem.web/target/pyme.service.subsystem.web-0.0.1-SNAPS
HOT.war

pyme.service.subsystem.web/target/pyme.service.subsystem.web-0.0.1-SNAPS
HOT/WEB-INF/lib/pyme.service.subsystem-0.0.1-SNAPSHOT.jar
	pyme.service.subsystem/derby.log

pyme.service.subsystem/target/classes/co/edu/uniandes/csw/pyme/logic/api
/_IPymeLogicService.class

pyme.service.subsystem/target/classes/co/edu/uniandes/csw/pyme/persisten
ce/_PymePersistence.class

pyme.service.subsystem/target/classes/co/edu/uniandes/csw/pyme/persisten
ce/api/_IPymePersistence.class
	pyme.service.subsystem/target/maven-archiver/pom.properties
	pyme.service.subsystem/target/pyme.service.subsystem-0.0.1-SNAPSHOT.jar

pyme.service.subsystem/target/surefire-reports/TEST-co.edu.uniandes.csw.
pyme.logic.ejb.PymeLogicServiceTest.xml

pyme.service.subsystem/target/surefire-reports/TEST-co.edu.uniandes.csw.
pyme.persistence.PymePersistenceTest.xml

pyme.service.subsystem/target/surefire-reports/co.edu.uniandes.csw.pyme.
logic.ejb.PymeLogicServiceTest.txt

pyme.service.subsystem/target/surefire-reports/co.edu.uniandes.csw.pyme.
persistence.PymePersistenceTest.txt
	pyme.web/target/maven-archiver/pom.properties
	pyme.web/target/pyme.web-0.0.1-SNAPSHOT.war
Merge branch 'master' of https://github.com/diegogm94/isis2603-grupo3-ciclo1

Conflicts:

client.service.subsystem.web/target/client.service.subsystem.web-0.0.1-S
NAPSHOT.war

client.service.subsystem.web/target/client.service.subsystem.web-0.0.1-S
NAPSHOT/WEB-INF/lib/client.service.subsystem-0.0.1-SNAPSHOT.jar
	client.service.subsystem.web/target/maven-archiver/pom.properties
	client.service.subsystem/derby.log

client.service.subsystem/target/client.service.subsystem-0.0.1-SNAPSHOT.
jar
	client.service.subsystem/target/maven-archiver/pom.properties

client.service.subsystem/target/surefire-reports/TEST-co.edu.uniandes.cs
w.client.logic.ejb.ClientLogicServiceTest.xml

client.service.subsystem/target/surefire-reports/TEST-co.edu.uniandes.cs
w.client.persistence.ClientPersistenceTest.xml

client.service.subsystem/target/surefire-reports/co.edu.uniandes.csw.cli
ent.logic.ejb.ClientLogicServiceTest.txt

client.service.subsystem/target/surefire-reports/co.edu.uniandes.csw.cli
ent.persistence.ClientPersistenceTest.txt
	client.web/target/client.web-0.0.1-SNAPSHOT.war
	client.web/target/maven-archiver/pom.properties
	product.service.subsystem.web/target/maven-archiver/pom.properties

product.service.subsystem.web/target/product.service.subsystem.web-0.0.1
-SNAPSHOT.war

product.service.subsystem.web/target/product.service.subsystem.web-0.0.1
-SNAPSHOT/WEB-INF/lib/product.service.subsystem-0.0.1-SNAPSHOT.jar
	product.service.subsystem/derby.log
	product.service.subsystem/target/maven-archiver/pom.properties

product.service.subsystem/target/product.service.subsystem-0.0.1-SNAPSHO
T.jar

product.service.subsystem/target/surefire-reports/TEST-co.edu.uniandes.c
sw.product.logic.ejb.ProductLogicServiceTest.xml

product.service.subsystem/target/surefire-reports/TEST-co.edu.uniandes.c
sw.product.persistence.ProductPersistenceTest.xml

product.service.subsystem/target/surefire-reports/co.edu.uniandes.csw.pr
oduct.logic.ejb.ProductLogicServiceTest.txt

product.service.subsystem/target/surefire-reports/co.edu.uniandes.csw.pr
oduct.persistence.ProductPersistenceTest.txt
	product.web/target/maven-archiver/pom.properties
	product.web/target/product.web-0.0.1-SNAPSHOT.war
	pyme.master.service.subsystem/target/maven-archiver/pom.properties

pyme.master.service.subsystem/target/pyme.master.service.subsystem-0.0.1
-SNAPSHOT.war

pyme.master.service.subsystem/target/pyme.master.service.subsystem-0.0.1
-SNAPSHOT/WEB-INF/lib/client.service.subsystem-0.0.1-SNAPSHOT.jar

pyme.master.service.subsystem/target/pyme.master.service.subsystem-0.0.1
-SNAPSHOT/WEB-INF/lib/product.service.subsystem-0.0.1-SNAPSHOT.jar

pyme.master.service.subsystem/target/pyme.master.service.subsystem-0.0.1
-SNAPSHOT/WEB-INF/lib/pyme.service.subsystem-0.0.1-SNAPSHOT.jar

pyme.master.service.subsystem/target/war/work/co.edu.uniandes.csw.spl/cl
ient.web/META-INF/MANIFEST.MF

pyme.master.service.subsystem/target/war/work/co.edu.uniandes.csw.spl/cl
ient.web/META-INF/maven/co.edu.uniandes.csw.spl/client.web/pom.propertie
s

pyme.master.service.subsystem/target/war/work/co.edu.uniandes.csw.spl/pr
oduct.web/META-INF/MANIFEST.MF

pyme.master.service.subsystem/target/war/work/co.edu.uniandes.csw.spl/pr
oduct.web/META-INF/maven/co.edu.uniandes.csw.spl/product.web/pom.propert
ies

pyme.master.service.subsystem/target/war/work/co.edu.uniandes.csw.spl/py
me.web/META-INF/MANIFEST.MF

pyme.master.service.subsystem/target/war/work/co.edu.uniandes.csw.spl/py
me.web/META-INF/maven/co.edu.uniandes.csw.spl/pyme.web/pom.properties
	pyme.service.subsystem.web/target/maven-archiver/pom.properties

pyme.service.subsystem.web/target/pyme.service.subsystem.web-0.0.1-SNAPS
HOT.war

pyme.service.subsystem.web/target/pyme.service.subsystem.web-0.0.1-SNAPS
HOT/WEB-INF/lib/pyme.service.subsystem-0.0.1-SNAPSHOT.jar
	pyme.service.subsystem/derby.log

pyme.service.subsystem/target/classes/co/edu/uniandes/csw/pyme/logic/api
/_IPymeLogicService.class

pyme.service.subsystem/target/classes/co/edu/uniandes/csw/pyme/persisten
ce/_PymePersistence.class

pyme.service.subsystem/target/classes/co/edu/uniandes/csw/pyme/persisten
ce/api/_IPymePersistence.class
	pyme.service.subsystem/target/maven-archiver/pom.properties
	pyme.service.subsystem/target/pyme.service.subsystem-0.0.1-SNAPSHOT.jar

pyme.service.subsystem/target/surefire-reports/TEST-co.edu.uniandes.csw.
pyme.logic.ejb.PymeLogicServiceTest.xml

pyme.service.subsystem/target/surefire-reports/TEST-co.edu.uniandes.csw.
pyme.persistence.PymePersistenceTest.xml

pyme.service.subsystem/target/surefire-reports/co.edu.uniandes.csw.pyme.
logic.ejb.PymeLogicServiceTest.txt

pyme.service.subsystem/target/surefire-reports/co.edu.uniandes.csw.pyme.
persistence.PymePersistenceTest.txt
	pyme.web/target/maven-archiver/pom.properties
	pyme.web/target/pyme.web-0.0.1-SNAPSHOT.war