Merge branch 'samagra-comms:master' into master

.gitignore

@@ -72,7 +72,7 @@ fabric.properties
 # Android studio 3.1+ serialized cache file
 .idea/caches/build_file_checksums.ser
 
-src/main/resources/application-messagerosa.properties
+#src/main/resources/application-messagerosa.properties
 
 .gradle/
 .idea/

dependency-reduced-pom.xml

@@ -32,7 +32,7 @@
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
-      <version>1.18.2</version>
+      <version>1.18.12</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -111,7 +111,7 @@
     </dependency>
   </dependencies>
   <properties>
-    <java.version>10</java.version>
+    <java.version>11</java.version>
   </properties>
 </project>
 

pom.xml

@@ -8,21 +8,20 @@
 		<version>2.3.0.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
-	<groupId>com.samagra</groupId>
+	<groupId>com.uci</groupId>
 	<artifactId>message-rosa</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>message-rosa</name>
 	<description>message-rosa for messages</description>
 	<properties>
-		<java.version>10</java.version>
+		<java.version>11</java.version>
 	</properties>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.18.2</version>
-			<scope>provided</scope>
+			<version>1.18.12</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.xml.bind</groupId>
@@ -55,12 +54,6 @@
 			<version>5.6.2</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<version>1.18.2</version>
-			<scope>provided</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.json</groupId>
 			<artifactId>json</artifactId>

src/main/resources/application-messagerosa.properties

@@ -0,0 +1 @@
+campaign.url = ${CAMPAIGN_URL}