Merge pull request #159 from openworm/development

Release 0.4.2

.travis.yml

@@ -1,9 +1,10 @@
 language: java
 install:
-- export main_repo_branch=$TRAVIS_BRANCH
-- if [[ ${main_repo_branch} != "master" && ${main_repo_branch} != "development" ]]; then main_repo_branch=development ; fi
-- git clone https://github.com/openworm/org.geppetto.model.git -b $main_repo_branch
+- git clone https://github.com/openworm/org.geppetto.model.git
 - cd org.geppetto.model
+- if [[ `git branch -a | egrep "remotes/origin/${TRAVIS_BRANCH}"` ]]; then git checkout $TRAVIS_BRANCH ; else echo "Branch $TRAVIS_BRANCH does not exist for the model bundle, checking out development ..." && git checkout development; fi
+- git status
+- git branch
 - mvn install
 - cd ..
 env:

pom.xml

@@ -4,12 +4,12 @@
 	<groupId>org.geppetto</groupId>
 	<artifactId>core</artifactId>
 	<name>Geppetto Core Bundle</name>
-	<version>0.4.1</version>
+	<version>0.4.2</version>
 	<packaging>bundle</packaging>
 	<properties>
 		<github.global.server>github</github.global.server>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.version>3.1.3.RELEASE</spring.version>
+		<spring.version>4.3.9.RELEASE</spring.version>
 	</properties>
 	<dependencies>
 		<!-- compile and runtime dependencies -->
@@ -19,9 +19,9 @@
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>com.springsource.org.apache.commons.logging</artifactId>
-			<version>1.1.1</version>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.servicemix.bundles</groupId>
@@ -86,17 +86,17 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>org.springframework.core</artifactId>
+			<artifactId>spring-core</artifactId>
 			<version>${spring.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>org.springframework.beans</artifactId>
+			<artifactId>spring-context</artifactId>
 			<version>${spring.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>org.springframework.context</artifactId>
+			<artifactId>spring-web</artifactId>
 			<version>${spring.version}</version>
 		</dependency>
 		<dependency>
@@ -105,16 +105,10 @@
 			<version>2.3.0</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>org.springframework.spring-library</artifactId>
-			<type>libd</type>
-			<version>${spring.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.junit</groupId>
 			<artifactId>com.springsource.org.junit</artifactId>
-			<version>4.5.0</version>
+			<version>4.7.0</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -279,7 +273,7 @@
 							{maven-resources},META-INF/spring=src/main/java/META-INF/spring,src/main/resources/Geppetto.properties,src/main/resources/GeppettoCommonLibrary.xmi
 						</Include-Resource>
 						<Import-Package>
-							org.springframework.context,org.aopalliance.aop,org.springframework.aop,,org.springframework.aop.scope,org.springframework.aop.framework,*
+							org.springframework.context,org.aopalliance.aop,org.springframework.aop,org.springframework.aop.scope,org.springframework.aop.framework,org.springframework.core,*
 						</Import-Package>
 					</instructions>
 					<DynamicImport-Package>

src/main/java/META-INF/spring/app-config.xml

@@ -2,9 +2,9 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-							http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+							http://www.springframework.org/schema/beans/spring-beans.xsd
 							http://www.springframework.org/schema/context
-							http://www.springframework.org/schema/context/spring-context-3.1.xsd">
+							http://www.springframework.org/schema/context/spring-context.xsd">
 
 	<!--  <bean class="org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor"/>--> 
 	<!-- Instructs Spring to scan for internal service components to instantiate and configure -->

src/main/java/META-INF/spring/module-config.xml

@@ -3,9 +3,9 @@
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:context="http://www.springframework.org/schema/context"		
 		xsi:schemaLocation="http://www.springframework.org/schema/beans
-							http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+							http://www.springframework.org/schema/beans/spring-beans.xsd
 							http://www.springframework.org/schema/context
-							http://www.springframework.org/schema/context/spring-context-3.1.xsd">
+							http://www.springframework.org/schema/context/spring-context.xsd">
 
 	<!--  <bean class="org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor"/>--> 
 	<!-- Instructs Spring to scan for internal service components to instantiate and configure -->

src/main/java/META-INF/spring/osgi-config.xml

@@ -4,11 +4,11 @@
 		xmlns:osgi="http://www.springframework.org/schema/osgi"	
 		xmlns:aop="http://www.springframework.org/schema/aop"
 		xsi:schemaLocation="http://www.springframework.org/schema/beans
-							http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+							http://www.springframework.org/schema/beans/spring-beans.xsd
 							http://www.springframework.org/schema/osgi
-							http://www.springframework.org/schema/osgi/spring-osgi-1.2.xsd
+							http://www.springframework.org/schema/osgi/spring-osgi.xsd
 							http://www.springframework.org/schema/aop 
-       						http://www.springframework.org/schema/aop/spring-aop-3.1.xsd">
+       						http://www.springframework.org/schema/aop/spring-aop.xsd">
 
 	<osgi:service id="ColladaModelExporter" ref="colladaModelInterpreterService"
 		interface="org.geppetto.core.model.IModelInterpreter">