Merge pull request #606 from opensrp/upgrade-jackson-databind

fix jackson-databind vulnerability
opensrp · Nov 2, 2022 · 1d30fe8 · 1d30fe8
2 parents f9e120d + 5f67859
commit 1d30fe8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
 	<artifactId>opensrp-server-core</artifactId>
 	<packaging>jar</packaging>
-	<version>3.2.6-SNAPSHOT</version>
+	<version>3.2.7-SNAPSHOT</version>
 	<name>opensrp-server-core</name>
 	<description>OpenSRP Server Core module</description>
 	<url>https://github.com/OpenSRP/opensrp-server-core</url>
@@ -25,7 +25,7 @@
 		<opensrp.api.version>1.1.3-SNAPSHOT</opensrp.api.version>
 		<opensrp.interface.version>2.0.1-SNAPSHOT</opensrp.interface.version>
 		<opensrp.plan.evaluator.version>1.6.7-SNAPSHOT</opensrp.plan.evaluator.version>
-		<jackson.version>2.12.6</jackson.version>
+		<jackson.version>2.13.2.1</jackson.version>
 		<powermock.version>2.0.5</powermock.version>
 		<lombok.version>1.18.12</lombok.version>
 		<spring.data.redis>2.2.13.RELEASE</spring.data.redis>
@@ -108,7 +108,7 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-annotations</artifactId>
-			<version>${jackson.version}</version>
+			<version>2.12.6</version>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk -->

diff --git a/src/test/java/org/opensrp/repository/postgres/OrganizationRepositoryTest.java b/src/test/java/org/opensrp/repository/postgres/OrganizationRepositoryTest.java
@@ -361,7 +361,7 @@ public void testFindAssignedLocations() {
 		assertEquals("304cbcd4-0850-404a-a8b1-486b02f7b84d", assignedLocations.get(0).getJurisdictionId());
 		assertEquals("7f2ae03f-9569-5535-918c-9d976b3ae5f8", assignedLocations.get(0).getPlanId());
 		assertEquals("2019-09-10", dateFormat.format(assignedLocations.get(0).getFromDate()));
-		assertEquals("2022-09-10", dateFormat.format(assignedLocations.get(0).getToDate()));
+		assertEquals("2030-09-10", dateFormat.format(assignedLocations.get(0).getToDate()));
 
 	}
 
@@ -376,7 +376,7 @@ public void testFindAssignedLocationsMutipleIds() {
 		assertEquals("304cbcd4-0850-404a-a8b1-486b02f7b84d", assignedLocations.get(0).getJurisdictionId());
 		assertEquals("7f2ae03f-9569-5535-918c-9d976b3ae5f8", assignedLocations.get(0).getPlanId());
 		assertEquals("2019-09-10", dateFormat.format(assignedLocations.get(0).getFromDate()));
-		assertEquals("2022-09-10", dateFormat.format(assignedLocations.get(0).getToDate()));
+		assertEquals("2030-09-10", dateFormat.format(assignedLocations.get(0).getToDate()));
 
 		assignedLocations = organizationRepository.findAssignedLocations(Arrays.asList(1l, 2l), true);
 		assertEquals(3, assignedLocations.size());

diff --git a/src/test/resources/test-scripts/organization.sql b/src/test/resources/test-scripts/organization.sql
@@ -24,6 +24,6 @@ INSERT INTO core.plan (identifier, json, date_deleted, server_version, id) VALUE
 INSERT INTO core.plan (identifier, json, date_deleted, server_version, id) VALUES ('7f2ae03f-9569-5535-918c-9d976b3ae5f8', '{}', null, 1567765433007, 294);
 
 
-INSERT INTO team.organization_location (id, organization_id, location_id, plan_id, from_date, to_date,duration) VALUES (1, 1, 2243, 162, '2019-09-10 17:29:55.059000', '2022-09-10 17:29:55.059000',daterange('2019-09-10','2022-09-10'));
-INSERT INTO team.organization_location (id, organization_id, location_id, plan_id, from_date, to_date,duration) VALUES (2, 1, 2243, 11, '2019-09-10 17:29:55.059000', '2022-09-10 17:29:55.059000',daterange('2019-09-10','2022-09-10'));
-INSERT INTO team.organization_location (id, organization_id, location_id, plan_id, from_date, to_date,duration) VALUES (3, 2, 2243, 294, '2019-09-10 17:29:55.059000', '2022-09-10 17:29:55.059000',daterange('2019-09-10','2022-09-10'));
+INSERT INTO team.organization_location (id, organization_id, location_id, plan_id, from_date, to_date,duration) VALUES (1, 1, 2243, 162, '2019-09-10 17:29:55.059000', '2030-09-10 17:29:55.059000',daterange('2019-09-10','2030-09-10'));
+INSERT INTO team.organization_location (id, organization_id, location_id, plan_id, from_date, to_date,duration) VALUES (2, 1, 2243, 11, '2019-09-10 17:29:55.059000', '2030-09-10 17:29:55.059000',daterange('2019-09-10','2030-09-10'));
+INSERT INTO team.organization_location (id, organization_id, location_id, plan_id, from_date, to_date,duration) VALUES (3, 2, 2243, 294, '2019-09-10 17:29:55.059000', '2030-09-10 17:29:55.059000',daterange('2019-09-10','2030-09-10'));