diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml index 57c52dd4744..6e0c83a388b 100644 --- a/.github/workflows/push-trigger.yml +++ b/.github/workflows/push-trigger.yml @@ -41,7 +41,7 @@ jobs: with: SERVICE_LOCATION: ./ secrets: - OSSRH_URL: ${{ secrets.RELEASE_URL }} + OSSRH_URL: ${{ secrets.OSSRH_CENTRAL_URL }} OSSRH_USER: ${{ secrets.OSSRH_USER }} OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} diff --git a/db_upgrade_scripts/mosip_kernel/sql/1.2.0.1_to_1.2.0.2_rollback.sql b/db_upgrade_scripts/mosip_kernel/sql/1.2.0.1_to_1.2.0.2_rollback.sql new file mode 100644 index 00000000000..381e2be11c1 --- /dev/null +++ b/db_upgrade_scripts/mosip_kernel/sql/1.2.0.1_to_1.2.0.2_rollback.sql @@ -0,0 +1 @@ +\echo 'Upgrade Queries not required for transition from $CURRENT_VERSION to $UPGRADE_VERSION' \ No newline at end of file diff --git a/db_upgrade_scripts/mosip_kernel/sql/1.2.0.1_to_1.2.0.2_upgrade.sql b/db_upgrade_scripts/mosip_kernel/sql/1.2.0.1_to_1.2.0.2_upgrade.sql new file mode 100644 index 00000000000..381e2be11c1 --- /dev/null +++ b/db_upgrade_scripts/mosip_kernel/sql/1.2.0.1_to_1.2.0.2_upgrade.sql @@ -0,0 +1 @@ +\echo 'Upgrade Queries not required for transition from $CURRENT_VERSION to $UPGRADE_VERSION' \ No newline at end of file diff --git a/kernel/kernel-applicanttype-api/pom.xml b/kernel/kernel-applicanttype-api/pom.xml index 346d06c8291..f12050adf06 100644 --- a/kernel/kernel-applicanttype-api/pom.xml +++ b/kernel/kernel-applicanttype-api/pom.xml @@ -5,19 +5,20 @@ io.mosip.kernel kernel-applicanttype-api Mosip Applicant type API - 1.2.0.1 + 1.2.0.2-SNAPSHOT 11 11 20180813 0.8.5 + 0.7.0 io.mosip.kernel kernel-core - 1.2.0.1 + 1.2.0.2-SNAPSHOT org.mvel @@ -41,11 +42,11 @@ ossrh - https://oss.sonatype.org/content/repositories/snapshots + https://central.sonatype.com/repository/maven-snapshots/ ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://central.sonatype.com/api/v1/publisher @@ -64,26 +65,15 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 + org.sonatype.central + central-publishing-maven-plugin + ${central.publishing.maven.plugin.version} true - - - default-deploy - deploy - - deploy - - - - ossrh - https://oss.sonatype.org/ - false + ossrh + false - org.apache.maven.plugins maven-source-plugin diff --git a/kernel/kernel-authcodeflowproxy-api/pom.xml b/kernel/kernel-authcodeflowproxy-api/pom.xml index 64c7d749f1f..ddc815217fb 100644 --- a/kernel/kernel-authcodeflowproxy-api/pom.xml +++ b/kernel/kernel-authcodeflowproxy-api/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.mosip.kernel kernel-authcodeflowproxy-api - 1.2.0.1 + 1.2.0.2-SNAPSHOT jar kernel-authcodeflowproxy-api Mosip commons project @@ -16,6 +16,7 @@ 11 11 3.8.0 + 0.7.0 3.0.2 @@ -220,7 +221,7 @@ 1.8.12 1.4.2 1.4.2 - 1.2.0.1 + 1.2.0.2-SNAPSHOT 0.8.5 @@ -238,11 +239,11 @@ ossrh - https://oss.sonatype.org/content/repositories/snapshots + https://central.sonatype.com/repository/maven-snapshots/ ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://central.sonatype.com/api/v1/publisher @@ -261,26 +262,15 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 + org.sonatype.central + central-publishing-maven-plugin + ${central.publishing.maven.plugin.version} true - - - default-deploy - deploy - - deploy - - - - ossrh - https://oss.sonatype.org/ - false + ossrh + false - org.apache.maven.plugins maven-source-plugin diff --git a/kernel/kernel-bioapi-provider/pom.xml b/kernel/kernel-bioapi-provider/pom.xml index 0867bc03a2f..e9c2f0d6ef7 100644 --- a/kernel/kernel-bioapi-provider/pom.xml +++ b/kernel/kernel-bioapi-provider/pom.xml @@ -5,7 +5,7 @@ io.mosip.kernel kernel-bioapi-provider - 1.2.0.1 + 1.2.0.2-SNAPSHOT kernel-bioapi-provider bioapi provider https://github.com/mosip/commons @@ -17,6 +17,7 @@ 11 11 3.8.0 + 0.7.0 3.0.2 @@ -221,7 +222,7 @@ 1.8.12 1.4.2 1.4.2 - 1.2.0.1 + 1.2.0.2-SNAPSHOT 1.2.0.1 0.8.5 @@ -240,11 +241,11 @@ ossrh - https://oss.sonatype.org/content/repositories/snapshots + https://central.sonatype.com/repository/maven-snapshots/ ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://central.sonatype.com/api/v1/publisher @@ -263,26 +264,15 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 + org.sonatype.central + central-publishing-maven-plugin + ${central.publishing.maven.plugin.version} true - - - default-deploy - deploy - - deploy - - - - ossrh - https://oss.sonatype.org/ - false + ossrh + false - org.apache.maven.plugins maven-source-plugin diff --git a/kernel/kernel-biometrics-api/pom.xml b/kernel/kernel-biometrics-api/pom.xml index 5e4b4078095..52bd8adac85 100644 --- a/kernel/kernel-biometrics-api/pom.xml +++ b/kernel/kernel-biometrics-api/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.mosip.kernel kernel-biometrics-api - 1.2.0.1 + 1.2.0.2-SNAPSHOT kernel-biometrics-api biometrics api definitions https://github.com/mosip/commons @@ -17,6 +17,7 @@ 11 11 3.8.0 + 0.7.0 3.0.2 @@ -220,7 +221,7 @@ 1.8.12 1.4.2 1.4.2 - 1.2.0.1 + 1.2.0.2-SNAPSHOT 0.8.5 @@ -251,11 +252,11 @@ ossrh - https://oss.sonatype.org/content/repositories/snapshots + https://central.sonatype.com/repository/maven-snapshots/ ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://central.sonatype.com/api/v1/publisher @@ -274,26 +275,15 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 + org.sonatype.central + central-publishing-maven-plugin + ${central.publishing.maven.plugin.version} true - - - default-deploy - deploy - - deploy - - - - ossrh - https://oss.sonatype.org/ - false + ossrh + false - org.apache.maven.plugins maven-source-plugin diff --git a/kernel/kernel-core/pom.xml b/kernel/kernel-core/pom.xml index ae9c47f401b..6291ea0dd30 100644 --- a/kernel/kernel-core/pom.xml +++ b/kernel/kernel-core/pom.xml @@ -27,6 +27,7 @@ 5.0.5.RELEASE 2.0.4.RELEASE 1.2.1.RELEASE + 0.7.0 2.0.7 @@ -120,7 +121,7 @@ **/constant/**,**/config/**,**/httpfilter/**,**/cache/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/verticle/**,**/spi/**,"**/proxy/**","**/entities/**","**/filter/**","**/util/**","**/verifier/**","**/jaxbclasses/**" kernel-core - 1.2.0.1 + 1.2.0.2-SNAPSHOT org.springframework.boot @@ -339,11 +340,11 @@ ossrh - https://oss.sonatype.org/content/repositories/snapshots + https://central.sonatype.com/repository/maven-snapshots/ ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://central.sonatype.com/api/v1/publisher @@ -362,26 +363,15 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 + org.sonatype.central + central-publishing-maven-plugin + ${central.publishing.maven.plugin.version} true - - - default-deploy - deploy - - deploy - - - - ossrh - https://oss.sonatype.org/ - false + ossrh + false - org.apache.maven.plugins maven-source-plugin diff --git a/kernel/kernel-dataaccess-hibernate/pom.xml b/kernel/kernel-dataaccess-hibernate/pom.xml index 74b7d41a74f..a9a2c187f63 100644 --- a/kernel/kernel-dataaccess-hibernate/pom.xml +++ b/kernel/kernel-dataaccess-hibernate/pom.xml @@ -12,6 +12,7 @@ 11 11 3.8.0 + 0.7.0 3.0.2 @@ -216,12 +217,12 @@ 1.8.12 1.4.2 1.4.2 - 1.2.0.1 + 1.2.0.2-SNAPSHOT 0.8.5 kernel-dataaccess-hibernate - 1.2.0.1 + 1.2.0.2-SNAPSHOT io.mosip.kernel @@ -266,11 +267,11 @@ ossrh - https://oss.sonatype.org/content/repositories/snapshots + https://central.sonatype.com/repository/maven-snapshots/ ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://central.sonatype.com/api/v1/publisher @@ -289,26 +290,15 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 + org.sonatype.central + central-publishing-maven-plugin + ${central.publishing.maven.plugin.version} true - - - default-deploy - deploy - - deploy - - - - ossrh - https://oss.sonatype.org/ - false + ossrh + false - org.apache.maven.plugins maven-source-plugin diff --git a/kernel/kernel-datamapper-orika/pom.xml b/kernel/kernel-datamapper-orika/pom.xml index e45df5afc0a..76a82755ec0 100644 --- a/kernel/kernel-datamapper-orika/pom.xml +++ b/kernel/kernel-datamapper-orika/pom.xml @@ -7,7 +7,7 @@ io.mosip.kernel kernel-datamapper-orika - 1.2.0.1 + 1.2.0.2-SNAPSHOT kernel-datamapper-orika http://maven.apache.org Mosip commons project @@ -18,6 +18,7 @@ 11 11 3.8.0 + 0.7.0 3.0.2 @@ -223,7 +224,7 @@ 1.4.2 1.4.2 UTF-8 - 1.2.0.1 + 1.2.0.2-SNAPSHOT 0.8.5 @@ -248,11 +249,11 @@ ossrh - https://oss.sonatype.org/content/repositories/snapshots + https://central.sonatype.com/repository/maven-snapshots/ ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://central.sonatype.com/api/v1/publisher @@ -271,26 +272,15 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 + org.sonatype.central + central-publishing-maven-plugin + ${central.publishing.maven.plugin.version} true - - - default-deploy - deploy - - deploy - - - - ossrh - https://oss.sonatype.org/ - false + ossrh + false - org.apache.maven.plugins maven-source-plugin diff --git a/kernel/kernel-demographics-api/pom.xml b/kernel/kernel-demographics-api/pom.xml index 485236573ce..a7570cc0380 100644 --- a/kernel/kernel-demographics-api/pom.xml +++ b/kernel/kernel-demographics-api/pom.xml @@ -5,7 +5,7 @@ io.mosip.kernel kernel-demographics-api - 1.2.0.1 + 1.2.0.2-SNAPSHOT kernel-demographics-api demographics api definitions https://github.com/mosip/commons @@ -18,6 +18,7 @@ 11 11 3.8.0 + 0.7.0 3.0.2 @@ -221,7 +222,7 @@ 1.8.12 1.4.2 1.4.2 - 1.2.0.1 + 1.2.0.2-SNAPSHOT 0.8.5 @@ -242,11 +243,11 @@ ossrh - https://oss.sonatype.org/content/repositories/snapshots + https://central.sonatype.com/repository/maven-snapshots/ ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://central.sonatype.com/api/v1/publisher @@ -265,26 +266,15 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 + org.sonatype.central + central-publishing-maven-plugin + ${central.publishing.maven.plugin.version} true - - - default-deploy - deploy - - deploy - - - - ossrh - https://oss.sonatype.org/ - false + ossrh + false - org.apache.maven.plugins maven-source-plugin diff --git a/kernel/kernel-idgenerator-machineid/pom.xml b/kernel/kernel-idgenerator-machineid/pom.xml index b8549afa5fe..6bef2eafb5d 100644 --- a/kernel/kernel-idgenerator-machineid/pom.xml +++ b/kernel/kernel-idgenerator-machineid/pom.xml @@ -5,7 +5,7 @@ 4.0.0 io.mosip.kernel kernel-idgenerator-machineid - 1.2.0.1 + 1.2.0.2-SNAPSHOT UTF-8 @@ -13,6 +13,7 @@ 11 11 3.8.0 + 0.7.0 3.0.2 @@ -217,10 +218,9 @@ 1.8.12 1.4.2 1.4.2 - 1.2.0.1 - 1.2.0.1 - 1.2.0.1 - 1.2.0.1 + 1.2.0.2-SNAPSHOT + 1.2.0.2-SNAPSHOT + 1.2.0.2-SNAPSHOT 0.8.5 @@ -250,11 +250,11 @@ ossrh - https://oss.sonatype.org/content/repositories/snapshots + https://central.sonatype.com/repository/maven-snapshots/ ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://central.sonatype.com/api/v1/publisher @@ -281,26 +281,15 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 + org.sonatype.central + central-publishing-maven-plugin + ${central.publishing.maven.plugin.version} true - - - default-deploy - deploy - - deploy - - - - ossrh - https://oss.sonatype.org/ - false + ossrh + false - org.apache.maven.plugins maven-source-plugin diff --git a/kernel/kernel-idgenerator-mispid/pom.xml b/kernel/kernel-idgenerator-mispid/pom.xml index dde5dd540c6..d2def65d51f 100644 --- a/kernel/kernel-idgenerator-mispid/pom.xml +++ b/kernel/kernel-idgenerator-mispid/pom.xml @@ -7,7 +7,7 @@ io.mosip.kernel kernel-idgenerator-mispid - 1.2.0.1 + 1.2.0.2-SNAPSHOT kernel-idgenerator-mispid Mosip commons project https://github.com/mosip/commons @@ -18,6 +18,7 @@ 11 11 3.8.0 + 0.7.0 3.0.2 @@ -117,9 +118,8 @@ 1.8.12 1.4.2 1.4.2 - 1.2.0.1 - 1.2.0.1 - 1.2.0.1 + 1.2.0.2-SNAPSHOT + 1.2.0.2-SNAPSHOT 0.8.5 @@ -149,11 +149,11 @@ ossrh - https://oss.sonatype.org/content/repositories/snapshots + https://central.sonatype.com/repository/maven-snapshots/ ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://central.sonatype.com/api/v1/publisher @@ -180,26 +180,15 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 + org.sonatype.central + central-publishing-maven-plugin + ${central.publishing.maven.plugin.version} true - - - default-deploy - deploy - - deploy - - - - ossrh - https://oss.sonatype.org/ - false + ossrh + false - org.apache.maven.plugins maven-source-plugin diff --git a/kernel/kernel-idgenerator-partnerid/pom.xml b/kernel/kernel-idgenerator-partnerid/pom.xml index 0597bd4c51d..f9faf4c3b8d 100644 --- a/kernel/kernel-idgenerator-partnerid/pom.xml +++ b/kernel/kernel-idgenerator-partnerid/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.mosip.kernel kernel-idgenerator-partnerid - 1.2.0.1 + 1.2.0.2-SNAPSHOT kernel-idgenerator-partnerid Mosip commons project http://maven.apache.org @@ -15,6 +15,7 @@ 11 11 3.8.0 + 0.7.0 3.0.2 @@ -219,9 +220,8 @@ 1.8.12 1.4.2 1.4.2 - 1.2.0.1 - 1.2.0.1 - 1.2.0.1 + 1.2.0.2-SNAPSHOT + 1.2.0.2-SNAPSHOT 0.8.5 @@ -252,11 +252,11 @@ ossrh - https://oss.sonatype.org/content/repositories/snapshots + https://central.sonatype.com/repository/maven-snapshots/ ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://central.sonatype.com/api/v1/publisher @@ -283,26 +283,15 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 + org.sonatype.central + central-publishing-maven-plugin + ${central.publishing.maven.plugin.version} true - - - default-deploy - deploy - - deploy - - - - ossrh - https://oss.sonatype.org/ - false + ossrh + false - org.apache.maven.plugins maven-source-plugin diff --git a/kernel/kernel-idgenerator-prid/pom.xml b/kernel/kernel-idgenerator-prid/pom.xml index 89cb2373e87..adf9c2e8579 100644 --- a/kernel/kernel-idgenerator-prid/pom.xml +++ b/kernel/kernel-idgenerator-prid/pom.xml @@ -13,6 +13,7 @@ 11 11 3.8.0 + 0.7.0 3.0.2 @@ -217,14 +218,13 @@ 1.8.12 1.4.2 1.4.2 - 1.2.0.1 - 1.2.0.1 - 1.2.0.1 - 1.2.0.1 + 1.2.0.2-SNAPSHOT + 1.2.0.2-SNAPSHOT + 1.2.0.2-SNAPSHOT 0.8.5 kernel-idgenerator-prid - 1.2.0.1 + 1.2.0.2-SNAPSHOT io.mosip.kernel @@ -257,11 +257,11 @@ ossrh - https://oss.sonatype.org/content/repositories/snapshots + https://central.sonatype.com/repository/maven-snapshots/ ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://central.sonatype.com/api/v1/publisher @@ -288,26 +288,15 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 + org.sonatype.central + central-publishing-maven-plugin + ${central.publishing.maven.plugin.version} true - - - default-deploy - deploy - - deploy - - - - ossrh - https://oss.sonatype.org/ - false + ossrh + false - org.apache.maven.plugins maven-source-plugin diff --git a/kernel/kernel-idgenerator-regcenterid/pom.xml b/kernel/kernel-idgenerator-regcenterid/pom.xml index 3cbfbcf20b9..cbcf73e500b 100644 --- a/kernel/kernel-idgenerator-regcenterid/pom.xml +++ b/kernel/kernel-idgenerator-regcenterid/pom.xml @@ -11,6 +11,7 @@ 11 11 3.8.0 + 0.7.0 3.0.2 @@ -215,15 +216,14 @@ 1.8.12 1.4.2 1.4.2 - 1.2.0.1 - 1.2.0.1 - 1.2.0.1 - 1.2.0.1 + 1.2.0.2-SNAPSHOT + 1.2.0.2-SNAPSHOT + 1.2.0.2-SNAPSHOT 1.2.0.1 0.8.5 kernel-idgenerator-regcenterid - 1.2.0.1 + 1.2.0.2-SNAPSHOT io.mosip.kernel @@ -252,11 +252,11 @@ ossrh - https://oss.sonatype.org/content/repositories/snapshots + https://central.sonatype.com/repository/maven-snapshots/ ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://central.sonatype.com/api/v1/publisher @@ -283,26 +283,15 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 + org.sonatype.central + central-publishing-maven-plugin + ${central.publishing.maven.plugin.version} true - - - default-deploy - deploy - - deploy - - - - ossrh - https://oss.sonatype.org/ - false + ossrh + false - org.apache.maven.plugins maven-source-plugin diff --git a/kernel/kernel-idgenerator-rid/pom.xml b/kernel/kernel-idgenerator-rid/pom.xml index f1edaea7cdc..e12de0218cf 100644 --- a/kernel/kernel-idgenerator-rid/pom.xml +++ b/kernel/kernel-idgenerator-rid/pom.xml @@ -8,7 +8,7 @@ io.mosip.kernel kernel-idgenerator-rid - 1.2.0.1 + 1.2.0.2-SNAPSHOT UTF-8 @@ -16,6 +16,7 @@ 11 11 3.8.0 + 0.7.0 3.0.2 @@ -115,8 +116,8 @@ 1.8.12 1.4.2 1.4.2 - 1.2.0.1 - 1.2.0.1 + 1.2.0.2-SNAPSHOT + 1.2.0.2-SNAPSHOT 0.8.5 @@ -147,11 +148,11 @@ ossrh - https://oss.sonatype.org/content/repositories/snapshots + https://central.sonatype.com/repository/maven-snapshots/ ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://central.sonatype.com/api/v1/publisher @@ -178,26 +179,15 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 + org.sonatype.central + central-publishing-maven-plugin + ${central.publishing.maven.plugin.version} true - - - default-deploy - deploy - - deploy - - - - ossrh - https://oss.sonatype.org/ - false + ossrh + false - org.apache.maven.plugins maven-source-plugin diff --git a/kernel/kernel-idgenerator-service/pom.xml b/kernel/kernel-idgenerator-service/pom.xml index 8360bf4218f..2eeaac651a6 100644 --- a/kernel/kernel-idgenerator-service/pom.xml +++ b/kernel/kernel-idgenerator-service/pom.xml @@ -113,19 +113,19 @@ 1.4.2 1.4.2 UTF-8 - 1.2.0.1 - 1.2.0.1 + 1.2.0.2-SNAPSHOT + 1.2.0.2-SNAPSHOT 1.3.2 3.4.1 - 1.2.0.1 - 1.2.0.1 + 1.2.0.2-SNAPSHOT 2.3.7 - 1.2.0.1 + 1.2.0.2-SNAPSHOT 0.8.5 **/constant/**,**/config/**,**/httpfilter/**,**/cache/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/verticle/**,**/spi/**,"**/proxy/**","**/entities/**","**/filter/**","**/util/**","**/verifier/**","**/IDGeneratorVertxApplication.java" + 0.7.0 kernel-idgenerator-service - 1.2.0.1 + 1.2.0.2-SNAPSHOT io.mosip.kernel @@ -276,11 +276,11 @@ ossrh - https://oss.sonatype.org/content/repositories/snapshots + https://central.sonatype.com/repository/maven-snapshots/ ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://central.sonatype.com/api/v1/publisher @@ -299,6 +299,9 @@ build-info repackage + + false + @@ -316,23 +319,13 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 + org.sonatype.central + central-publishing-maven-plugin + ${central.publishing.maven.plugin.version} true - - - default-deploy - deploy - - deploy - - - - ossrh - https://oss.sonatype.org/ - false + ossrh + false diff --git a/kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/idgenerator/IDGeneratorVertxApplication.java b/kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/idgenerator/IDGeneratorVertxApplication.java index 292af017f39..dfc32f80f8e 100644 --- a/kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/idgenerator/IDGeneratorVertxApplication.java +++ b/kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/idgenerator/IDGeneratorVertxApplication.java @@ -11,6 +11,7 @@ import javax.annotation.PostConstruct; +import io.mosip.kernel.idgenerator.util.Utility; import org.apache.commons.io.IOUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -65,6 +66,10 @@ public class IDGeneratorVertxApplication { */ private static Logger LOGGER; + private static final long DEFAULT_VID_JOB_FREQUENCY = 10000L; + + private static final long DEFAULT_UIN_JOB_FREQUENCY=10000L; + /** * Server context path. */ @@ -173,7 +178,7 @@ private static void startApplication() { Verticle[] workerVerticles = { new VidPoolCheckerVerticle(context), new VidPopulatorVerticle(context), new VidExpiryVerticle(context), new VidIsolatorVerticle(context) }; Stream.of(workerVerticles).forEach(verticle -> deploy(verticle, workerOptions, vertx)); - vertx.setTimer(1000, handler -> initVIDPool()); + vertx.setTimer(getVidInitJobFrequency(), handler -> initVIDPool()); Verticle[] uinVerticles = { new UinGeneratorVerticle(context),new UinTransferVerticle(context)}; Stream.of(uinVerticles).forEach(verticle -> vertx.deployVerticle(verticle, stringAsyncResult -> { if (stringAsyncResult.succeeded()) { @@ -183,7 +188,7 @@ private static void startApplication() { + stringAsyncResult.cause()); } })); - vertx.setTimer(1000, handler -> initUINPool()); + vertx.setTimer(getUinInitJobFrequency(), handler -> initUINPool()); } @PostConstruct @@ -205,4 +210,18 @@ private static void deploy(Verticle verticle, DeploymentOptions opts, Vertx vert } }); } + + /** + * Get VID init job frequency from system properties or default. + */ + private static long getVidInitJobFrequency() { + return Utility.getLongProperty("mosip.kernel.vid.init-job-frequency", DEFAULT_VID_JOB_FREQUENCY); + } + + /** + * Get UIN init job frequency from system properties or default. + */ + private static long getUinInitJobFrequency() { + return Utility.getLongProperty("mosip.kernel.uin.init-job-frequency", DEFAULT_UIN_JOB_FREQUENCY); + } } diff --git a/kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/idgenerator/util/Utility.java b/kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/idgenerator/util/Utility.java new file mode 100644 index 00000000000..7c7e0ec099c --- /dev/null +++ b/kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/idgenerator/util/Utility.java @@ -0,0 +1,28 @@ +package io.mosip.kernel.idgenerator.util; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import java.util.function.Function; + +public class Utility { + + private static final Logger LOGGER = LoggerFactory.getLogger(Utility.class); + + public static T getProperty(String propertyKey, T defaultValue, Function parser) { + try { + String value = System.getProperty(propertyKey); + if (value == null || value.trim().isEmpty()) { + LOGGER.info("{} is missing. Using default: {}", propertyKey, defaultValue); + return defaultValue; + } + return parser.apply(value.trim()); + } catch (Exception e) { + LOGGER.warn("Error reading property {}. Using default: {}", propertyKey, defaultValue, e); + return defaultValue; + } + } + + public static long getLongProperty(String propertyKey, long defaultValue) { + return getProperty(propertyKey, defaultValue, Long::parseLong); + } +} diff --git a/kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/uingenerator/repository/UinRepository.java b/kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/uingenerator/repository/UinRepository.java index 9798700f638..05540c71f26 100644 --- a/kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/uingenerator/repository/UinRepository.java +++ b/kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/uingenerator/repository/UinRepository.java @@ -53,9 +53,9 @@ public interface UinRepository extends JpaRepository { @Query(value = "UPDATE kernel.uin SET uin_status=:status, upd_by=:contextUser, upd_dtimes=:uptimes where uin=:uin", nativeQuery = true) public void updateStatus(@Param("status") String status, @Param("contextUser") String contextUser, @Param("uptimes") LocalDateTime uptimes, @Param("uin") String uin); - - @Query(value = "select uu.uin, uu.cr_by, uu.cr_dtimes, uu.del_dtimes, uu.is_deleted, uu.upd_by, uu.upd_dtimes, uu.uin_status from kernel.uin uu where uu.uin_status=?", nativeQuery = true) - public List findByStatus(String status); + + @Query(value = "select uu.uin, uu.cr_by, uu.cr_dtimes, uu.del_dtimes, uu.is_deleted, uu.upd_by, uu.upd_dtimes, uu.uin_status from kernel.uin uu where uu.uin_status=:status LIMIT :pageSize", nativeQuery = true) + public List findByStatus(@Param("status") String status, @Param("pageSize") int pageSize); long countByStatusAndIsDeletedFalse(String status); } \ No newline at end of file diff --git a/kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/uingenerator/service/impl/UinServiceImpl.java b/kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/uingenerator/service/impl/UinServiceImpl.java index b0975f6e29b..6f2282e6568 100644 --- a/kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/uingenerator/service/impl/UinServiceImpl.java +++ b/kernel/kernel-idgenerator-service/src/main/java/io/mosip/kernel/uingenerator/service/impl/UinServiceImpl.java @@ -9,6 +9,7 @@ import org.modelmapper.ModelMapper; import org.modelmapper.TypeToken; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; @@ -61,6 +62,9 @@ public class UinServiceImpl implements UinService { */ @Autowired private UINMetaDataUtil metaDataUtil; + + @Value("${mosip.kernel.uin.page.size:50000}") + private int pageSize; @Autowired private VertxAuthenticationProvider authHandler; @@ -128,7 +132,7 @@ public UinStatusUpdateReponseDto updateUinStatus(UinEntity uinAck, RoutingContex @Transactional(transactionManager = "transactionManager") @Override public void transferUin() { - List uinEntities=uinRepository.findByStatus(UinGeneratorConstant.ASSIGNED); + List uinEntities=uinRepository.findByStatus(UinGeneratorConstant.ISSUED, pageSize); List uinEntitiesAssined = modelMapper.map(uinEntities, new TypeToken>() {}.getType()); uinRepositoryAssigned.saveAll(uinEntitiesAssined); uinRepository.deleteAll(uinEntities); diff --git a/kernel/kernel-idgenerator-tokenid/pom.xml b/kernel/kernel-idgenerator-tokenid/pom.xml index 96cd1677cd1..346f30db489 100644 --- a/kernel/kernel-idgenerator-tokenid/pom.xml +++ b/kernel/kernel-idgenerator-tokenid/pom.xml @@ -6,7 +6,7 @@ 4.0.0 io.mosip.kernel kernel-idgenerator-tokenid - 1.2.0.1 + 1.2.0.2-SNAPSHOT UTF-8 @@ -14,6 +14,7 @@ 11 11 3.8.0 + 0.7.0 3.0.2 @@ -218,8 +219,8 @@ 1.8.12 1.4.2 1.4.2 - 1.2.0.1 - 1.2.0.1 + 1.2.0.2-SNAPSHOT + 1.2.0.2-SNAPSHOT 0.8.5 @@ -249,11 +250,11 @@ ossrh - https://oss.sonatype.org/content/repositories/snapshots + https://central.sonatype.com/repository/maven-snapshots/ ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://central.sonatype.com/api/v1/publisher @@ -295,26 +296,15 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 + org.sonatype.central + central-publishing-maven-plugin + ${central.publishing.maven.plugin.version} true - - - default-deploy - deploy - - deploy - - - - ossrh - https://oss.sonatype.org/ - false + ossrh + false - org.apache.maven.plugins maven-source-plugin diff --git a/kernel/kernel-idgenerator-vid/pom.xml b/kernel/kernel-idgenerator-vid/pom.xml index f6d3626b6a1..d3d20db4ec9 100644 --- a/kernel/kernel-idgenerator-vid/pom.xml +++ b/kernel/kernel-idgenerator-vid/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.mosip.kernel kernel-idgenerator-vid - 1.2.0.1 + 1.2.0.2-SNAPSHOT UTF-8 @@ -12,6 +12,7 @@ 11 11 3.8.0 + 0.7.0 3.0.2 @@ -216,8 +217,8 @@ 1.8.12 1.4.2 1.4.2 - 1.2.0.1 - 1.2.0.1 + 1.2.0.2-SNAPSHOT + 1.2.0.2-SNAPSHOT 0.8.5 @@ -236,11 +237,11 @@ ossrh - https://oss.sonatype.org/content/repositories/snapshots + https://central.sonatype.com/repository/maven-snapshots/ ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://central.sonatype.com/api/v1/publisher @@ -267,26 +268,15 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 + org.sonatype.central + central-publishing-maven-plugin + ${central.publishing.maven.plugin.version} true - - - default-deploy - deploy - - deploy - - - - ossrh - https://oss.sonatype.org/ - false + ossrh + false - org.apache.maven.plugins maven-source-plugin diff --git a/kernel/kernel-idobjectvalidator/pom.xml b/kernel/kernel-idobjectvalidator/pom.xml index 4a094712e57..c701bdfcd9c 100644 --- a/kernel/kernel-idobjectvalidator/pom.xml +++ b/kernel/kernel-idobjectvalidator/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 kernel-idobjectvalidator - 1.2.0.1 + 1.2.0.2-SNAPSHOT io.mosip.kernel UTF-8 @@ -12,6 +12,7 @@ 11 11 3.8.0 + 0.7.0 3.0.2 @@ -216,7 +217,7 @@ 1.8.12 1.4.2 1.4.2 - 1.2.0.1 + 1.2.0.2-SNAPSHOT 0.8.5 @@ -280,11 +281,11 @@ ossrh - https://oss.sonatype.org/content/repositories/snapshots + https://central.sonatype.com/repository/maven-snapshots/ ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://central.sonatype.com/api/v1/publisher @@ -297,15 +298,6 @@ - - org.springframework.boot - spring-boot-maven-plugin - ${spring.boot.version} - - ZIP - - - maven-deploy-plugin @@ -321,26 +313,15 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 + org.sonatype.central + central-publishing-maven-plugin + ${central.publishing.maven.plugin.version} true - - - default-deploy - deploy - - deploy - - - - ossrh - https://oss.sonatype.org/ - false + ossrh + false - org.apache.maven.plugins maven-source-plugin diff --git a/kernel/kernel-idvalidator-mispid/pom.xml b/kernel/kernel-idvalidator-mispid/pom.xml index dda523cc7ce..95d94619ee0 100644 --- a/kernel/kernel-idvalidator-mispid/pom.xml +++ b/kernel/kernel-idvalidator-mispid/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.mosip.kernel kernel-idvalidator-mispid - 1.2.0.1 + 1.2.0.2-SNAPSHOT UTF-8 @@ -12,6 +12,7 @@ 11 11 3.8.0 + 0.7.0 3.0.2 @@ -216,7 +217,7 @@ 1.8.12 1.4.2 1.4.2 - 1.2.0.1 + 1.2.0.2-SNAPSHOT 0.8.5 @@ -230,11 +231,11 @@ ossrh - https://oss.sonatype.org/content/repositories/snapshots + https://central.sonatype.com/repository/maven-snapshots/ ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://central.sonatype.com/api/v1/publisher @@ -261,26 +262,15 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 + org.sonatype.central + central-publishing-maven-plugin + ${central.publishing.maven.plugin.version} true - - - default-deploy - deploy - - deploy - - - - ossrh - https://oss.sonatype.org/ - false + ossrh + false - org.apache.maven.plugins maven-source-plugin diff --git a/kernel/kernel-idvalidator-prid/pom.xml b/kernel/kernel-idvalidator-prid/pom.xml index e96f2d4a7de..22f3fd547ae 100644 --- a/kernel/kernel-idvalidator-prid/pom.xml +++ b/kernel/kernel-idvalidator-prid/pom.xml @@ -12,6 +12,7 @@ 11 11 3.8.0 + 0.7.0 3.0.2 @@ -216,11 +217,11 @@ 1.8.12 1.4.2 1.4.2 - 1.2.0.1 + 1.2.0.2-SNAPSHOT 0.8.5 kernel-idvalidator-prid - 1.2.0.1 + 1.2.0.2-SNAPSHOT kernel-idvalidator-prid @@ -233,11 +234,11 @@ ossrh - https://oss.sonatype.org/content/repositories/snapshots + https://central.sonatype.com/repository/maven-snapshots/ ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://central.sonatype.com/api/v1/publisher @@ -264,26 +265,15 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 + org.sonatype.central + central-publishing-maven-plugin + ${central.publishing.maven.plugin.version} true - - - default-deploy - deploy - - deploy - - - - ossrh - https://oss.sonatype.org/ - false + ossrh + false - org.apache.maven.plugins maven-source-plugin diff --git a/kernel/kernel-idvalidator-rid/pom.xml b/kernel/kernel-idvalidator-rid/pom.xml index 04cc80d7e02..f75b3590c20 100644 --- a/kernel/kernel-idvalidator-rid/pom.xml +++ b/kernel/kernel-idvalidator-rid/pom.xml @@ -2,7 +2,7 @@ 4.0.0 io.mosip.kernel kernel-idvalidator-rid - 1.2.0.1 + 1.2.0.2-SNAPSHOT kernel-idvalidator-rid kernel-idvalidator-rid @@ -12,6 +12,7 @@ 11 11 3.8.0 + 0.7.0 3.0.2 @@ -111,7 +112,7 @@ 1.8.12 1.4.2 1.4.2 - 1.2.0.1 + 1.2.0.2-SNAPSHOT 0.8.5 @@ -125,11 +126,11 @@ ossrh - https://oss.sonatype.org/content/repositories/snapshots + https://central.sonatype.com/repository/maven-snapshots/ ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://central.sonatype.com/api/v1/publisher @@ -156,26 +157,15 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 + org.sonatype.central + central-publishing-maven-plugin + ${central.publishing.maven.plugin.version} true - - - default-deploy - deploy - - deploy - - - - ossrh - https://oss.sonatype.org/ - false + ossrh + false - org.apache.maven.plugins maven-source-plugin diff --git a/kernel/kernel-idvalidator-uin/pom.xml b/kernel/kernel-idvalidator-uin/pom.xml index bed43bfd901..49004c5b38c 100644 --- a/kernel/kernel-idvalidator-uin/pom.xml +++ b/kernel/kernel-idvalidator-uin/pom.xml @@ -2,7 +2,7 @@ 4.0.0 io.mosip.kernel kernel-idvalidator-uin - 1.2.0.1 + 1.2.0.2-SNAPSHOT kernel-idvalidator-uin kernel-idvalidator-uin @@ -12,6 +12,7 @@ 11 11 3.8.0 + 0.7.0 3.0.2 @@ -111,7 +112,7 @@ 1.8.12 1.4.2 1.4.2 - 1.2.0.1 + 1.2.0.2-SNAPSHOT 0.8.5 @@ -125,11 +126,11 @@ ossrh - https://oss.sonatype.org/content/repositories/snapshots + https://central.sonatype.com/repository/maven-snapshots/ ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://central.sonatype.com/api/v1/publisher @@ -156,26 +157,15 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 + org.sonatype.central + central-publishing-maven-plugin + ${central.publishing.maven.plugin.version} true - - - default-deploy - deploy - - deploy - - - - ossrh - https://oss.sonatype.org/ - false + ossrh + false - org.apache.maven.plugins maven-source-plugin diff --git a/kernel/kernel-idvalidator-vid/pom.xml b/kernel/kernel-idvalidator-vid/pom.xml index fd55153f8e5..1def77cf864 100644 --- a/kernel/kernel-idvalidator-vid/pom.xml +++ b/kernel/kernel-idvalidator-vid/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.mosip.kernel kernel-idvalidator-vid - 1.2.0.1 + 1.2.0.2-SNAPSHOT kernel-idvalidator-vid kernel-idvalidator-vid @@ -14,6 +14,7 @@ 11 11 3.8.0 + 0.7.0 3.0.2 @@ -218,7 +219,7 @@ 1.8.12 1.4.2 1.4.2 - 1.2.0.1 + 1.2.0.2-SNAPSHOT 0.8.5 @@ -233,11 +234,11 @@ ossrh - https://oss.sonatype.org/content/repositories/snapshots + https://central.sonatype.com/repository/maven-snapshots/ ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://central.sonatype.com/api/v1/publisher @@ -264,26 +265,15 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 + org.sonatype.central + central-publishing-maven-plugin + ${central.publishing.maven.plugin.version} true - - - default-deploy - deploy - - deploy - - - - ossrh - https://oss.sonatype.org/ - false + ossrh + false - org.apache.maven.plugins maven-source-plugin diff --git a/kernel/kernel-licensekeygenerator-misp/pom.xml b/kernel/kernel-licensekeygenerator-misp/pom.xml index a669b4da0a2..d8c5ccc278d 100644 --- a/kernel/kernel-licensekeygenerator-misp/pom.xml +++ b/kernel/kernel-licensekeygenerator-misp/pom.xml @@ -6,7 +6,7 @@ 4.0.0 io.mosip.kernel kernel-licensekeygenerator-misp - 1.2.0.1 + 1.2.0.2-SNAPSHOT UTF-8 @@ -14,6 +14,7 @@ 11 11 3.8.0 + 0.7.0 3.0.2 @@ -218,7 +219,7 @@ 1.8.12 1.4.2 1.4.2 - 1.2.0.1 + 1.2.0.2-SNAPSHOT 0.8.5 @@ -244,11 +245,11 @@ ossrh - https://oss.sonatype.org/content/repositories/snapshots + https://central.sonatype.com/repository/maven-snapshots/ ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://central.sonatype.com/api/v1/publisher @@ -275,26 +276,15 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 + org.sonatype.central + central-publishing-maven-plugin + ${central.publishing.maven.plugin.version} true - - - default-deploy - deploy - - deploy - - - - ossrh - https://oss.sonatype.org/ - false + ossrh + false - org.apache.maven.plugins maven-source-plugin diff --git a/kernel/kernel-logger-logback/pom.xml b/kernel/kernel-logger-logback/pom.xml index 0c2da11d8e6..dd2e89e2ede 100644 --- a/kernel/kernel-logger-logback/pom.xml +++ b/kernel/kernel-logger-logback/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.mosip.kernel kernel-logger-logback - 1.2.0.1 + 1.2.0.2-SNAPSHOT UTF-8 @@ -12,6 +12,7 @@ 11 11 3.8.0 + 0.7.0 3.0.2 @@ -216,7 +217,7 @@ 1.8.12 1.4.2 1.4.2 - 1.2.0.1 + 1.2.0.2-SNAPSHOT 0.8.5 @@ -248,11 +249,11 @@ ossrh - https://oss.sonatype.org/content/repositories/snapshots + https://central.sonatype.com/repository/maven-snapshots/ ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://central.sonatype.com/api/v1/publisher @@ -271,26 +272,15 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 + org.sonatype.central + central-publishing-maven-plugin + ${central.publishing.maven.plugin.version} true - - - default-deploy - deploy - - deploy - - - - ossrh - https://oss.sonatype.org/ - false + ossrh + false - org.apache.maven.plugins maven-source-plugin diff --git a/kernel/kernel-notification-service/pom.xml b/kernel/kernel-notification-service/pom.xml index 26ae9715760..993b2de6859 100644 --- a/kernel/kernel-notification-service/pom.xml +++ b/kernel/kernel-notification-service/pom.xml @@ -8,7 +8,7 @@ kernel-notification-service Mosip commons project https://github.com/mosip/commons - 1.2.0.1 + 1.2.0.2-SNAPSHOT io.mosip.kernel UTF-8 @@ -221,12 +221,13 @@ 1.8.12 1.4.2 1.4.2 - 1.2.0.1 - 1.2.0.1 - 1.2.0.1 - 1.2.0.1 + 1.2.0.2-SNAPSHOT + 1.2.0.2-SNAPSHOT + 1.2.0.2-SNAPSHOT + 1.2.0.2-SNAPSHOT 0.8.5 1.5.10 + 0.7.0 @@ -287,11 +288,11 @@ ossrh - https://oss.sonatype.org/content/repositories/snapshots + https://central.sonatype.com/repository/maven-snapshots/ ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://central.sonatype.com/api/v1/publisher @@ -310,6 +311,9 @@ build-info repackage + + false + @@ -327,26 +331,15 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 + org.sonatype.central + central-publishing-maven-plugin + ${central.publishing.maven.plugin.version} true - - - default-deploy - deploy - - deploy - - - - ossrh - https://oss.sonatype.org/ - false + ossrh + false - org.apache.maven.plugins maven-source-plugin @@ -512,8 +505,21 @@ ZIP + + + build-info-repackage + + build-info + repackage + + + false + + + pre-integration-test + pre-integration-test start @@ -528,24 +534,18 @@ --server.port=8090 --server.servlet.path=/app/generic - + post-integration-test + post-integration-test stop - - - build-info - repackage - - - - + org.springdoc springdoc-openapi-maven-plugin 0.2 diff --git a/kernel/kernel-pdfgenerator-itext/pom.xml b/kernel/kernel-pdfgenerator-itext/pom.xml index c290d7e8ca1..01c0cb1da0a 100644 --- a/kernel/kernel-pdfgenerator-itext/pom.xml +++ b/kernel/kernel-pdfgenerator-itext/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.mosip.kernel kernel-pdfgenerator-itext - 1.2.0.1 + 1.2.0.2-SNAPSHOT kernel-pdfgenerator generate pdf for given template @@ -14,6 +14,7 @@ 11 11 3.8.0 + 0.7.0 3.0.2 @@ -218,7 +219,7 @@ 1.8.12 1.4.2 1.4.2 - 1.2.0.1 + 1.2.0.2-SNAPSHOT 0.8.5 @@ -262,11 +263,11 @@ ossrh - https://oss.sonatype.org/content/repositories/snapshots + https://central.sonatype.com/repository/maven-snapshots/ ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://central.sonatype.com/api/v1/publisher @@ -285,26 +286,15 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 + org.sonatype.central + central-publishing-maven-plugin + ${central.publishing.maven.plugin.version} true - - - default-deploy - deploy - - deploy - - - - ossrh - https://oss.sonatype.org/ - false + ossrh + false - org.apache.maven.plugins maven-source-plugin diff --git a/kernel/kernel-pinvalidator/pom.xml b/kernel/kernel-pinvalidator/pom.xml index ee604de128c..08949ba3454 100644 --- a/kernel/kernel-pinvalidator/pom.xml +++ b/kernel/kernel-pinvalidator/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.mosip.kernel kernel-pinvalidator - 1.2.0.1 + 1.2.0.2-SNAPSHOT http://maven.apache.org UTF-8 @@ -13,6 +13,7 @@ 11 11 3.8.0 + 0.7.0 3.0.2 @@ -218,7 +219,7 @@ 1.4.2 1.4.2 UTF-8 - 1.2.0.1 + 1.2.0.2-SNAPSHOT 0.8.5 @@ -237,11 +238,11 @@ ossrh - https://oss.sonatype.org/content/repositories/snapshots + https://central.sonatype.com/repository/maven-snapshots/ ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://central.sonatype.com/api/v1/publisher @@ -268,26 +269,15 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 + org.sonatype.central + central-publishing-maven-plugin + ${central.publishing.maven.plugin.version} true - - - default-deploy - deploy - - deploy - - - - ossrh - https://oss.sonatype.org/ - false + ossrh + false - org.apache.maven.plugins maven-source-plugin diff --git a/kernel/kernel-pridgenerator-service/pom.xml b/kernel/kernel-pridgenerator-service/pom.xml index 491f21d0b58..fec57bd9940 100644 --- a/kernel/kernel-pridgenerator-service/pom.xml +++ b/kernel/kernel-pridgenerator-service/pom.xml @@ -215,15 +215,16 @@ 1.8.12 1.4.2 1.4.2 - 1.2.0.1 - 1.2.0.1 - 1.2.0.1 - 1.2.0.1 + 1.2.0.2-SNAPSHOT + 1.2.0.2-SNAPSHOT + 1.2.0.2-SNAPSHOT + 1.2.0.2-SNAPSHOT 0.8.5 **/constant/**,**/config/**,**/httpfilter/**,**/cache/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/verticle/**,**/spi/**,"**/proxy/**","**/entities/**","**/filter/**","**/util/**","**/verifier/**","**/KernelPridgeneratorServiceApplication.java" + 0.7.0 kernel-pridgenerator-service - 1.2.0.1 + 1.2.0.2-SNAPSHOT io.mosip.kernel @@ -359,11 +360,11 @@ ossrh - https://oss.sonatype.org/content/repositories/snapshots + https://central.sonatype.com/repository/maven-snapshots/ ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://central.sonatype.com/api/v1/publisher @@ -382,6 +383,9 @@ build-info repackage + + false + @@ -399,23 +403,13 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 + org.sonatype.central + central-publishing-maven-plugin + ${central.publishing.maven.plugin.version} true - - - default-deploy - deploy - - deploy - - - - ossrh - https://oss.sonatype.org/ - false + ossrh + false diff --git a/kernel/kernel-qrcodegenerator-zxing/pom.xml b/kernel/kernel-qrcodegenerator-zxing/pom.xml index 99e7ca57cff..d22b04f9170 100644 --- a/kernel/kernel-qrcodegenerator-zxing/pom.xml +++ b/kernel/kernel-qrcodegenerator-zxing/pom.xml @@ -6,7 +6,7 @@ io.mosip.kernel kernel-qrcodegenerator-zxing - 1.2.0.1 + 1.2.0.2-SNAPSHOT jar kernel-qrcodegenerator-zxing @@ -17,6 +17,7 @@ 11 11 3.8.0 + 0.7.0 3.0.2 @@ -221,7 +222,7 @@ 1.8.12 1.4.2 1.4.2 - 1.2.0.1 + 1.2.0.2-SNAPSHOT 0.8.5 @@ -245,11 +246,11 @@ ossrh - https://oss.sonatype.org/content/repositories/snapshots + https://central.sonatype.com/repository/maven-snapshots/ ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://central.sonatype.com/api/v1/publisher @@ -268,26 +269,15 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 + org.sonatype.central + central-publishing-maven-plugin + ${central.publishing.maven.plugin.version} true - - - default-deploy - deploy - - deploy - - - - ossrh - https://oss.sonatype.org/ - false + ossrh + false - org.apache.maven.plugins maven-source-plugin diff --git a/kernel/kernel-ridgenerator-service/pom.xml b/kernel/kernel-ridgenerator-service/pom.xml index 4e3b1e1c55b..bd3d210cee0 100644 --- a/kernel/kernel-ridgenerator-service/pom.xml +++ b/kernel/kernel-ridgenerator-service/pom.xml @@ -7,7 +7,7 @@ io.mosip.kernel kernel-ridgenerator-service - 1.2.0.1 + 1.2.0.2-SNAPSHOT kernel-ridgenerator-service Mosip commons project https://github.com/mosip/commons @@ -117,11 +117,12 @@ 1.8.12 1.4.2 1.4.2 - 1.2.0.1 - 1.2.0.1 - 1.2.0.1 + 1.2.0.2-SNAPSHOT + 1.2.0.2-SNAPSHOT + 1.2.0.2-SNAPSHOT 0.8.5 1.5.10 + 0.7.0 @@ -181,11 +182,11 @@ ossrh - https://oss.sonatype.org/content/repositories/snapshots + https://central.sonatype.com/repository/maven-snapshots/ ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://central.sonatype.com/api/v1/publisher @@ -204,6 +205,9 @@ build-info repackage + + false + @@ -221,23 +225,13 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 + org.sonatype.central + central-publishing-maven-plugin + ${central.publishing.maven.plugin.version} true - - - default-deploy - deploy - - deploy - - - - ossrh - https://oss.sonatype.org/ - false + ossrh + false @@ -397,8 +391,21 @@ ZIP + + + build-info-repackage + + build-info + repackage + + + false + + + pre-integration-test + pre-integration-test start @@ -413,21 +420,16 @@ --server.port=8090 --server.servlet.path=/app/generic - + post-integration-test + post-integration-test stop - - - build-info - repackage - - diff --git a/kernel/kernel-salt-generator/pom.xml b/kernel/kernel-salt-generator/pom.xml index cf7faabf35e..97bdd346c27 100644 --- a/kernel/kernel-salt-generator/pom.xml +++ b/kernel/kernel-salt-generator/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.mosip.kernel kernel-salt-generator - 1.2.0.1 + 1.2.0.2-SNAPSHOT Kernel Salt Generator Batch Job Application to for one-time populating of salt values for MOSIP related application salt tables. https://github.com/mosip/commons @@ -219,13 +219,14 @@ 1.8.12 1.4.2 1.4.2 - 1.2.0.1 - 1.2.0.1 + 1.2.0.2-SNAPSHOT + 1.2.0.2-SNAPSHOT 2.0.2.RELEASE 2.0.0.RELEASE 42.2.2 0.8.5 2.12.0 + 0.7.0 @@ -288,11 +289,11 @@ ossrh - https://oss.sonatype.org/content/repositories/snapshots + https://central.sonatype.com/repository/maven-snapshots/ ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://central.sonatype.com/api/v1/publisher @@ -310,6 +311,9 @@ build-info repackage + + false + @@ -328,26 +332,15 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 + org.sonatype.central + central-publishing-maven-plugin + ${central.publishing.maven.plugin.version} true - - - default-deploy - deploy - - deploy - - - - ossrh - https://oss.sonatype.org/ - false + ossrh + false - org.apache.maven.plugins maven-source-plugin diff --git a/kernel/kernel-templatemanager-velocity/pom.xml b/kernel/kernel-templatemanager-velocity/pom.xml index a36b1c08786..1dd2c3044b6 100644 --- a/kernel/kernel-templatemanager-velocity/pom.xml +++ b/kernel/kernel-templatemanager-velocity/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.mosip.kernel kernel-templatemanager-velocity - 1.2.0.1 + 1.2.0.2-SNAPSHOT Mosip Template Manager Using Velocity Template Engine UTF-8 @@ -13,6 +13,7 @@ 11 11 3.8.0 + 0.7.0 3.0.2 @@ -218,7 +219,7 @@ 1.8.12 1.4.2 1.4.2 - 1.2.0.1 + 1.2.0.2-SNAPSHOT 0.8.5 @@ -246,11 +247,11 @@ ossrh - https://oss.sonatype.org/content/repositories/snapshots + https://central.sonatype.com/repository/maven-snapshots/ ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://central.sonatype.com/api/v1/publisher @@ -269,26 +270,15 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 + org.sonatype.central + central-publishing-maven-plugin + ${central.publishing.maven.plugin.version} true - - - default-deploy - deploy - - deploy - - - - ossrh - https://oss.sonatype.org/ - false + ossrh + false - org.apache.maven.plugins maven-source-plugin diff --git a/kernel/kernel-transliteration-icu4j/pom.xml b/kernel/kernel-transliteration-icu4j/pom.xml index 6ba6b76ac2b..2a87465c510 100644 --- a/kernel/kernel-transliteration-icu4j/pom.xml +++ b/kernel/kernel-transliteration-icu4j/pom.xml @@ -7,7 +7,7 @@ io.mosip.kernel kernel-transliteration-icu4j jar - 1.2.0.1 + 1.2.0.2-SNAPSHOT kernel transliteration icu4j https://github.com/mosip/commons kernel-transliteration-icu4j @@ -19,6 +19,7 @@ 11 11 3.8.0 + 0.7.0 3.0.2 @@ -118,7 +119,7 @@ 1.8.12 1.4.2 1.4.2 - 1.2.0.1 + 1.2.0.2-SNAPSHOT 0.8.5 @@ -148,11 +149,11 @@ ossrh - https://oss.sonatype.org/content/repositories/snapshots + https://central.sonatype.com/repository/maven-snapshots/ ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://central.sonatype.com/api/v1/publisher @@ -171,26 +172,15 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 + org.sonatype.central + central-publishing-maven-plugin + ${central.publishing.maven.plugin.version} true - - - default-deploy - deploy - - deploy - - - - ossrh - https://oss.sonatype.org/ - false + ossrh + false - org.apache.maven.plugins maven-source-plugin diff --git a/kernel/kernel-websubclient-api/pom.xml b/kernel/kernel-websubclient-api/pom.xml index cbd52f3364d..c269af454fb 100644 --- a/kernel/kernel-websubclient-api/pom.xml +++ b/kernel/kernel-websubclient-api/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.mosip.kernel kernel-websubclient-api - 1.2.0.1 + 1.2.0.2-SNAPSHOT jar kernel-websubclient-api Mosip commons project @@ -16,6 +16,7 @@ 11 11 3.8.0 + 0.7.0 3.0.2 @@ -220,7 +221,7 @@ 1.8.12 1.4.2 1.4.2 - 1.2.0.1 + 1.2.0.2-SNAPSHOT 0.8.5 1.2.3 @@ -250,11 +251,11 @@ ossrh - https://oss.sonatype.org/content/repositories/snapshots + https://central.sonatype.com/repository/maven-snapshots/ ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://central.sonatype.com/api/v1/publisher @@ -273,26 +274,15 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 + org.sonatype.central + central-publishing-maven-plugin + ${central.publishing.maven.plugin.version} true - - - default-deploy - deploy - - deploy - - - - ossrh - https://oss.sonatype.org/ - false + ossrh + false - org.apache.maven.plugins maven-source-plugin diff --git a/kernel/pom.xml b/kernel/pom.xml index 36aecde56a5..c78e02091b0 100644 --- a/kernel/pom.xml +++ b/kernel/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 1.2.0.1 + 1.2.0.2-SNAPSHOT io.mosip.kernel kernel-parent pom @@ -23,6 +23,7 @@ 3.7.0.1746 3.2.0 2.3 + 0.7.0 **/constant/**,**/config/**,**/httpfilter/**,**/cache/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/verticle/**,**/spi/**,"**/proxy/**","**/entities/**","**/filter/**","**/util/**","**/verifier/**" @@ -72,37 +73,37 @@ - - ossrh - CentralRepository - https://oss.sonatype.org/content/repositories/snapshots - default - - true - - - - central - MavenCentral - default - https://repo1.maven.org/maven2 - - false - - + + ossrh-central + MavenCentralRepository + https://central.sonatype.com/repository/maven-snapshots + default + + true + + + + central + MavenCentral + default + https://repo1.maven.org/maven2 + + false + + - - + + - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - + ossrh + https://central.sonatype.com/repository/maven-snapshots/ + + + ossrh + https://central.sonatype.com/api/v1/publisher + + + @@ -237,28 +238,17 @@ - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - - default-deploy - deploy - - deploy - - - - - ossrh - https://oss.sonatype.org/ - false - - - - + + org.sonatype.central + central-publishing-maven-plugin + ${central.publishing.maven.plugin.version} + true + + ossrh + false + + + org.apache.maven.plugins maven-source-plugin true diff --git a/pom.xml b/pom.xml index fbd1f185f9f..7482fcbb60b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.mosip commons - 1.2.0.1 + 1.2.0.2-SNAPSHOT pom MOSIP Commons Parent POM @@ -32,27 +32,36 @@ https://github.com/mosip/commons - - - ossrh - Central Repository - https://oss.sonatype.org/content/repositories/snapshots - default - - true - - + + + ossrh-central + MavenCentralRepository + https://central.sonatype.com/repository/maven-snapshots + default + + true + + + + central + MavenCentral + default + https://repo1.maven.org/maven2 + + false + + - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - + + + ossrh + https://central.sonatype.com/repository/maven-snapshots/ + + + ossrh + https://central.sonatype.com/api/v1/publisher + + ${project.basedir}/../ @@ -131,27 +140,16 @@ - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 + + org.sonatype.central + central-publishing-maven-plugin + 0.7.0 true - - - default-deploy - deploy - - deploy - - - - ossrh - https://oss.sonatype.org/ - false + ossrh + false - - + org.apache.maven.plugins maven-source-plugin