Upgraded libraries

a-rog · Oct 27, 2015 · 0dec12b · 0dec12b
1 parent d6ffcfb
commit 0dec12b
Show file tree

Hide file tree

Showing 11 changed files with 210 additions and 68 deletions.
diff --git a/InMemoryBrowser/pom.xml b/InMemoryBrowser/pom.xml
@@ -34,7 +34,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <org.springframework.version>4.1.3.RELEASE</org.springframework.version>
+        <org.springframework.version>4.2.2.RELEASE</org.springframework.version>
         <org.springsecurity.version>3.2.3.RELEASE</org.springsecurity.version>
         <java.target.version>1.8</java.target.version>
     </properties>
@@ -120,7 +120,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.0.1</version>
+            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -137,43 +137,43 @@
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
-            <version>1.1.3</version>
+            <version>1.2</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.2.4</version>
+            <version>2.4</version>
         </dependency>
 
         <dependency>
             <groupId>com.px100systems</groupId>
-            <artifactId>px100-utils</artifactId>
-            <version>0.3.2</version>
+            <artifactId>Px100Util</artifactId>
+            <version>0.3.0</version>
         </dependency>
         <dependency>
             <groupId>com.px100systems</groupId>
-            <artifactId>px100-persistence</artifactId>
-            <version>0.3.2</version>
+            <artifactId>Px100Persistence</artifactId>
+            <version>0.3.0</version>
         </dependency>
         <dependency>
             <groupId>com.px100systems</groupId>
-            <artifactId>px100-persistence-api</artifactId>
-            <version>0.3.2</version>
+            <artifactId>Px100PersistenceAPI</artifactId>
+            <version>0.3.0</version>
         </dependency>
         <dependency>
             <groupId>com.px100systems</groupId>
-            <artifactId>in-memory-jdbc-persistence</artifactId>
-            <version>0.3.2</version>
+            <artifactId>InMemoryJdbcPersistence</artifactId>
+            <version>0.3.0</version>
         </dependency>
         <dependency>
             <groupId>com.px100systems</groupId>
-            <artifactId>hazelcast-storage</artifactId>
-            <version>0.3.2</version>
+            <artifactId>InMemoryHazelcastStorage</artifactId>
+            <version>0.3.0</version>
         </dependency>
         <dependency>
             <groupId>com.px100systems</groupId>
-            <artifactId>ignite-storage</artifactId>
-            <version>0.3.2</version>
+            <artifactId>InMemoryIgniteStorage</artifactId>
+            <version>0.3.0</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/InMemoryBrowser/target/dbb.war b/InMemoryBrowser/target/dbb.war
diff --git a/InMemoryHazelcastStorage/pom.xml b/InMemoryHazelcastStorage/pom.xml
@@ -46,20 +46,20 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<com.hazelcast.version>3.5.1</com.hazelcast.version>
+		<com.hazelcast.version>3.5.3</com.hazelcast.version>
 		<java.target.version>1.8</java.target.version>
 	</properties>
 
 	<dependencies>
 		<dependency>
 			<groupId>com.px100systems</groupId>
-  			<artifactId>px100-utils</artifactId>
-			<version>0.3.2</version>
+  			<artifactId>Px100Util</artifactId>
+			<version>0.3.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.px100systems</groupId>
-  			<artifactId>px100-persistence-api</artifactId>
-			<version>0.3.2</version>
+  			<artifactId>Px100PersistenceAPI</artifactId>
+			<version>0.3.0</version>
 		</dependency>
 
 		<dependency>
@@ -86,7 +86,7 @@
 		<dependency>
 			<groupId>commons-logging</groupId>
 			<artifactId>commons-logging</artifactId>
-			<version>1.1.3</version>
+			<version>1.2</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/InMemoryIgniteStorage/pom.xml b/InMemoryIgniteStorage/pom.xml
@@ -56,20 +56,20 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <ignite.version>1.3.3</ignite.version>
+        <ignite.version>1.4.0</ignite.version>
         <java.target.version>1.8</java.target.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>com.px100systems</groupId>
-            <artifactId>px100-utils</artifactId>
-            <version>0.3.2</version>
+            <artifactId>Px100Util</artifactId>
+            <version>0.3.0</version>
         </dependency>
         <dependency>
             <groupId>com.px100systems</groupId>
-            <artifactId>px100-persistence-api</artifactId>
-            <version>0.3.2</version>
+            <artifactId>Px100PersistenceAPI</artifactId>
+            <version>0.3.0</version>
         </dependency>
 
         <dependency>
@@ -106,7 +106,7 @@
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
-            <version>1.1.3</version>
+            <version>1.2</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/InMemoryJdbcPersistence/pom.xml b/InMemoryJdbcPersistence/pom.xml
@@ -46,20 +46,20 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<org.springframework.version>4.1.3.RELEASE</org.springframework.version>
+		<org.springframework.version>4.2.2.RELEASE</org.springframework.version>
 		<java.target.version>1.8</java.target.version>
 	</properties>
 
 	<dependencies>
 		<dependency>
 			<groupId>com.px100systems</groupId>
-  			<artifactId>px100-utils</artifactId>
-			<version>0.3.2</version>
+  			<artifactId>Px100Util</artifactId>
+			<version>0.3.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.px100systems</groupId>
-  			<artifactId>px100-persistence-api</artifactId>
-			<version>0.3.2</version>
+  			<artifactId>Px100PersistenceAPI</artifactId>
+			<version>0.3.0</version>
 		</dependency>
 
 		<dependency>
@@ -69,34 +69,34 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring-tx</artifactId>
+			<artifactId>spring-beans</artifactId>
 			<version>${org.springframework.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring-jdbc</artifactId>
+			<artifactId>spring-expression</artifactId>
 			<version>${org.springframework.version}</version>
 		</dependency>
-		<!--dependency>
+		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring-beans</artifactId>
+			<artifactId>spring-context</artifactId>
 			<version>${org.springframework.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring-expression</artifactId>
+			<artifactId>spring-context-support</artifactId>
 			<version>${org.springframework.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
+			<artifactId>spring-tx</artifactId>
 			<version>${org.springframework.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring-context-support</artifactId>
+			<artifactId>spring-jdbc</artifactId>
 			<version>${org.springframework.version}</version>
-		</dependency-->
+		</dependency>
 
 		<dependency>
 			<groupId>commons-io</groupId>
@@ -106,7 +106,7 @@
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
-			<version>2.2.4</version>
+			<version>2.4</version>
 		</dependency>
 
 		<dependency>
@@ -117,7 +117,7 @@
 		<dependency>
 			<groupId>commons-logging</groupId>
 			<artifactId>commons-logging</artifactId>
-			<version>1.1.3</version>
+			<version>1.2</version>
 		</dependency>
 
 		<!-- Seems like it does not need explicit MySQL or H2 dependencies to start the embedded database (the JDBC driver class does it)

diff --git a/MongoStorage/pom.xml b/MongoStorage/pom.xml
@@ -55,19 +55,19 @@
     <dependencies>
         <dependency>
             <groupId>com.px100systems</groupId>
-            <artifactId>px100-utils</artifactId>
-            <version>0.3.2</version>
+            <artifactId>Px100Util</artifactId>
+            <version>0.3.0</version>
         </dependency>
         <dependency>
             <groupId>com.px100systems</groupId>
-            <artifactId>px100-persistence-api</artifactId>
-            <version>0.3.2</version>
+            <artifactId>Px100PersistenceAPI</artifactId>
+            <version>0.3.0</version>
         </dependency>
 
         <dependency>
             <groupId>org.mongodb</groupId>
             <artifactId>mongodb-driver</artifactId>
-            <version>3.0.2</version>
+            <version>3.1.0</version>
         </dependency>
 
         <dependency>
@@ -78,7 +78,7 @@
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
-            <version>1.1.3</version>
+            <version>1.2</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/Px100Persistence/pom.xml b/Px100Persistence/pom.xml
@@ -44,35 +44,55 @@
 			</plugin>
 		</plugins>
 	</build>
-
+		
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<org.springframework.version>4.1.3.RELEASE</org.springframework.version>
+		<org.springframework.version>4.2.2.RELEASE</org.springframework.version>
 		<java.target.version>1.8</java.target.version>
 	</properties>
 
 	<dependencies>
 		<dependency>
 			<groupId>com.px100systems</groupId>
-  			<artifactId>px100-utils</artifactId>
-			<version>0.3.2</version>
+  			<artifactId>Px100Util</artifactId>
+			<version>0.3.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.px100systems</groupId>
-  			<artifactId>px100-persistence-api</artifactId>
-			<version>0.3.2</version>
+  			<artifactId>Px100PersistenceAPI</artifactId>
+			<version>0.3.0</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
 			<version>${org.springframework.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-beans</artifactId>
+			<version>${org.springframework.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-expression</artifactId>
+			<version>${org.springframework.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
 			<version>${org.springframework.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context-support</artifactId>
+			<version>${org.springframework.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-aop</artifactId>
+			<version>${org.springframework.version}</version>
+		</dependency>
 
 		<dependency>
 			<groupId>log4j</groupId>
@@ -82,7 +102,7 @@
 		<dependency>
 			<groupId>commons-logging</groupId>
 			<artifactId>commons-logging</artifactId>
-			<version>1.1.3</version>
+			<version>1.2</version>
 		</dependency>
 
 		<dependency>
@@ -99,7 +119,7 @@
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>17.0</version>
+			<version>18.0</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/Px100PersistenceAPI/pom.xml b/Px100PersistenceAPI/pom.xml
@@ -52,8 +52,8 @@
 	<dependencies>
 		<dependency>
 			<groupId>com.px100systems</groupId>
-  			<artifactId>px100-utils</artifactId>
-			<version>0.3.2</version>
+  			<artifactId>Px100Util</artifactId>
+			<version>0.3.0</version>
 		</dependency>
 
 		<dependency>
@@ -64,7 +64,7 @@
 		<dependency>
 			<groupId>commons-logging</groupId>
 			<artifactId>commons-logging</artifactId>
-			<version>1.1.3</version>
+			<version>1.2</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/Px100PersistenceAPI/src/main/java/com/px100systems/data/core/Entity.java b/Px100PersistenceAPI/src/main/java/com/px100systems/data/core/Entity.java
@@ -316,4 +316,4 @@ public void setModifiedAt(Date modifiedAt) {
 	 */
 	public void cascadeDelete() {
 	}
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -316,4 +316,4 @@ public void setModifiedAt(Date modifiedAt) { @@
     	 */
     	public void cascadeDelete() {
     	}
-    }
+    }