Merge pull request #29 from openworm/development

Release 0.4.2

Author: tarelli

.travis.yml

@@ -3,19 +3,19 @@ language: java
 install:
     - 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 dependent bundle, checking out master ..." && git checkout master; fi
+    - if [[ `git branch -a | egrep "remotes/origin/${TRAVIS_BRANCH}"` ]]; then git checkout $TRAVIS_BRANCH ; else echo "Branch $TRAVIS_BRANCH does not exist for the dependent bundle, checking out master ..." && git checkout master; fi
     - git status
     - mvn install
     - cd ..
     - git clone https://github.com/openworm/org.geppetto.core.git
     - cd org.geppetto.core
-    - if [ `git branch -a | egrep "remotes/origin/${TRAVIS_BRANCH}"` ]; then git checkout $TRAVIS_BRANCH ; else echo "Branch $TRAVIS_BRANCH does not exist for the dependent bundle, checking out master ..." && git checkout master; fi
+    - if [[ `git branch -a | egrep "remotes/origin/${TRAVIS_BRANCH}"` ]]; then git checkout $TRAVIS_BRANCH ; else echo "Branch $TRAVIS_BRANCH does not exist for the dependent bundle, checking out master ..." && git checkout master; fi
     - git status
     - mvn install
     - cd ..    
     - git clone https://github.com/openworm/org.geppetto.simulation.git
     - cd org.geppetto.simulation
-    - if [ `git branch -a | egrep "remotes/origin/${TRAVIS_BRANCH}"` ]; then git checkout $TRAVIS_BRANCH ; else echo "Branch $TRAVIS_BRANCH does not exist for the dependent bundle, checking out master ..." && git checkout master; fi
+    - if [[ `git branch -a | egrep "remotes/origin/${TRAVIS_BRANCH}"` ]]; then git checkout $TRAVIS_BRANCH ; else echo "Branch $TRAVIS_BRANCH does not exist for the dependent bundle, checking out master ..." && git checkout master; fi
     - git status
     - mvn install
     - cd ..    

pom.xml

@@ -5,10 +5,10 @@
 	<groupId>org.geppetto</groupId>
 	<artifactId>datasources</artifactId>
 	<name>Geppetto Data Sources bundle</name>
-	<version>0.4.1</version>
+	<version>0.4.2</version>
 	<packaging>bundle</packaging>
 	<properties>
-		<spring.version>3.1.3.RELEASE</spring.version>
+		<spring.version>4.3.9.RELEASE</spring.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 	<dependencies>
@@ -25,17 +25,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-beans</artifactId>
 			<version>${spring.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>org.springframework.context</artifactId>
+			<artifactId>spring-context</artifactId>
 			<version>${spring.version}</version>
 		</dependency>
 		<dependency>
@@ -47,15 +47,9 @@
 		<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>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>org.springframework.spring-library</artifactId>
-			<type>libd</type>
-			<version>${spring.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-test</artifactId>
@@ -131,7 +125,7 @@
 							{maven-resources},META-INF/spring=src/main/java/META-INF/spring
 						</Include-Resource>
 						<Import-Package>
-							org.geppetto.core.services,org.geppetto.core.features,org.aopalliance.aop,org.springframework.aop,,org.springframework.aop.scope,org.springframework.aop.framework,*
+							org.geppetto.core.services,org.geppetto.core.features,org.aopalliance.aop,org.springframework.aop,org.springframework.aop.scope,org.springframework.aop.framework,org.springframework.core,*
 						</Import-Package>
 					</instructions>
 				</configuration>

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

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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"
+	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="Neo4jDataSourceExporter" ref="neo4jDataSource"

src/test/java/org/geppetto/datasources/DataSourcesGeppettoManagerTest.java

@@ -75,6 +75,7 @@ public static void setUp() throws Exception
 		context.registerBeanDefinition("scopedTarget.testDataSourceService", dataSourceBeanDefinition);
 		context.registerBeanDefinition("testQueryProcessorService", queryProcessorBeanDefinition);
 		context.registerBeanDefinition("scopedTarget.testQueryProcessorService", queryProcessorBeanDefinition);
+		context.refresh();
 		ContextRefreshedEvent event = new ContextRefreshedEvent(context);
 		ApplicationListenerBean listener = new ApplicationListenerBean();
 		listener.onApplicationEvent(event);