feat: ensure url doesn't have version. upgrade version

pom.xml

@@ -4,12 +4,12 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.iemr.common.identity</groupId>
-	<artifactId>identity</artifactId>
-	<version>0.0.1</version>
+	<artifactId>identity-api</artifactId>
+	<version>3.1.0</version>
 
 	<packaging>war</packaging>
 
-	<name>identity-api</name>
+	<name>Identity-API</name>
 	<description>iEMR Identity Service</description>
 
 	<parent>
@@ -30,6 +30,8 @@
 		<environment>${ENV_VAR}</environment>
 		<target-properties>target/classes/application.properties</target-properties>
 		<source-properties>target/classes/common_${environment}.properties</source-properties>
+		<ci-file>common_${environment}.properties</ci-file>
+		<context.root>identity-api</context.root>
 		<maven.test.skip>false</maven.test.skip>
 		<sonar.java.binaries>target</sonar.java.binaries>
 		<jacoco.version>0.8.11</jacoco.version>
@@ -224,18 +226,20 @@
 		<profile>
 			<id>1097_identity</id>
 			<properties>
-				<final-name>1097identityapi-v1.0</final-name>
+				<final-name>1097identity-api-${version}</final-name>
 				<target-properties>target/classes/application.properties</target-properties>
 				<source-properties>target/classes/1097_${environment}.properties</source-properties>
+				<ci-file>1097_${environment}.properties</ci-file>
+				<context.root>1097identity-api</context.root>
 			</properties>
 			<build>
-				<finalName>1097identityapi-v1.0</finalName>
+				<finalName>1097identityapi-${version}</finalName>
 			</build>
 		</profile>
 	</profiles>
 
 	<build>
-		<finalName>identity-v3.0.0</finalName>
+		<finalName>${artifactId}-${version}</finalName>
 		<plugins>
 			<plugin>
 				<groupId>org.owasp</groupId>
@@ -329,7 +333,8 @@
 									<filtering>true</filtering>
 									<includes>
 										<include>
-											common_${environment}.properties</include>
+											${ci-file}
+										</include>
 									</includes>
 								</resource>
 							</resources>
@@ -364,6 +369,20 @@
 							</target>
 						</configuration>
 					</execution>
+					<execution>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<id>clean-property-files</id>
+						<configuration>
+							<target>
+								<delete>
+									<file file="${source-properties}" />
+								</delete>
+							</target>
+						</configuration>
+					</execution>
 				</executions>
 			</plugin>
 			<plugin>
@@ -402,6 +421,10 @@
 							<filtering>true</filtering>
 							<directory>src/packaging/</directory>
 						</resource>
+						<resource>
+                        	<directory>src/main/webapp</directory>
+                        	<filtering>true</filtering>
+                    	</resource>
 					</webResources>
 				</configuration>
 			</plugin>

src/main/environment/1097_ci.properties

@@ -5,8 +5,16 @@ spring.datasource.password=@env.DATABASE_IDENTITY_PASSWORD@
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 #ELK logging file name
+logging.path=logs/
 logging.file.name=@env.IDENTITY_API_1097_LOGGING_FILE_NAME@
 
 springdoc.api-docs.enabled=@env.SWAGGER_DOC_ENABLED@
 springdoc.swagger-ui.enabled=@env.SWAGGER_DOC_ENABLED@
 
+jwt.secret=@JWT_SECRET_KEY@
+
+ # TM Config
+tm-url=@TM_API@
+
+# FHIR Config
+fhir-url=@FHIR_API@

src/main/environment/1097_example.properties

@@ -1,7 +1,17 @@
 server.port=8095
 # DataSource settings: set here your own configurations for the database
 
-spring.datasource.url=jdbc:mysql://localhost:3306/db_identity
+spring.datasource.url=jdbc:mysql://localhost:3306/db_1097_identity
 spring.datasource.username=root
 spring.datasource.password=1234
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+
+jwt.secret=my-32-character-ultra-secure-and-ultra-long-secret
+logging.path=logs/
+logging.file.name=logs/1097identity-api.log
+
+ # TM Config
+tm-url=http://localhost:8089/
+
+# FHIR Config
+fhir-url=http://localhost:8093/

src/main/environment/common_ci.properties

@@ -5,7 +5,16 @@ spring.datasource.password=@env.DATABASE_IDENTITY_PASSWORD@
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 #ELK logging file name
+logging.path=logs/
 logging.file.name=@env.IDENTITY_API_LOGGING_FILE_NAME@
 
 springdoc.api-docs.enabled=@env.SWAGGER_DOC_ENABLED@
 springdoc.swagger-ui.enabled=@env.SWAGGER_DOC_ENABLED@
+
+jwt.secret=@JWT_SECRET_KEY@
+
+ # TM Config
+tm-url=@TM_API@
+
+# FHIR Config
+fhir-url=@FHIR_API@

src/main/environment/common_example.properties

@@ -4,3 +4,13 @@ spring.datasource.url=jdbc:mysql://localhost:3306/db_iemr
 spring.datasource.username=root
 spring.datasource.password=1234
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+
+jwt.secret=my-32-character-ultra-secure-and-ultra-long-secret
+logging.path=logs/
+logging.file.name=logs/identity-api.log
+
+ # TM Config
+tm-url=http://localhost:8089/
+
+# FHIR Config
+fhir-url=http://localhost:8093/

src/main/resources/application.properties

@@ -28,9 +28,6 @@ logging.level.org.hibernate=INFO
 logging.level.com.iemr=DEBUG
 logging.level.org.springframework=INFO
 
-logging.path=logs/
-logging.file.name=logs/identity-api.log
-
 spring.datasource.tomcat.initial-size=5
 spring.datasource.tomcat.max-idle=15
 spring.datasource.tomcat.max-active=30
@@ -42,15 +39,9 @@ spring.datasource.continue-on-error=true
 spring.datasource.tomcat.remove-abandoned-timeout=600
 door-to-door-page-size=2
 
- # TM Config
-tm-url=http://10.208.122.38:8080/tmapi-v1.0
-
 #Get-HRP-Status
 get-HRP-Status=ANC/getHRPStatus
 
-# FHIR Config
-fhir-url=http://10.208.122.38:8080/fhirapi-v1.0
-
 #Get Beneficiary ABHA
 getHealthID=healthID/getBenhealthID
 

src/main/webapp/WEB-INF/jboss-web.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-web>
+    <context-root>/${context.root}</context-root>
+</jboss-web>