Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MOSIP-32454: Upgraded JavaFX version #634

Merged
merged 7 commits into from
Jun 25, 2024
Merged

MOSIP-32454: Upgraded JavaFX version #634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
80b3b45
MOSIP-32454: Java21 Migration
Jun 17, 2024
2d6ae9d
Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com>
Jun 17, 2024
7b4357a
Added version to registration-api
Jun 18, 2024
6824e2f
Added version to registration-client pom
Jun 18, 2024
ff41af0
Added versions in pom files
Jun 18, 2024
6b181bd
Changes in pom file
Jun 18, 2024
c5b04bf
MOSIP-32454: Upgraded JavaFX version
Jun 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .github/workflows/push-trigger.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ on:
- release*
- master
- 1.*
- develop
- develop*
- MOSIP*

jobs:
build-regclient:
uses: mosip/kattu/.github/workflows/maven-build.yml@master
uses: mosip/kattu/.github/workflows/maven-build.yml@master-java21
with:
SERVICE_LOCATION: registration
BUILD_ARTIFACT: registration
Expand All @@ -43,11 +43,11 @@ jobs:
BUILD_ARTIFACT: registration-local
steps:
- uses: actions/checkout@v3
- name: Set up JDK 11
uses: actions/setup-java@v1
- name: Set up JDK 21
uses: actions/setup-java@v3
with:
ref: ${{ github.ref }}
java-version: 11
distribution: 'temurin'
java-version: '21'
server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml
settings-path: ${{ github.workspace }} # location for the settings.xml file

Expand Down Expand Up @@ -83,7 +83,7 @@ jobs:
publish_to_nexus:
if: "${{ !contains(github.ref, 'master') && github.event_name != 'pull_request' && github.event_name != 'release' && github.event_name != 'prerelease' && github.event_name != 'publish' }}"
needs: build-regclient-local
uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master
uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master-java21
with:
SERVICE_LOCATION: registration
secrets:
Expand All @@ -105,7 +105,7 @@ jobs:
ONLY_DOCKER: true
fail-fast: false
name: ${{ matrix.SERVICE_NAME }}
uses: mosip/kattu/.github/workflows/docker-build.yml@master
uses: mosip/kattu/.github/workflows/docker-build.yml@master-java21
with:
SERVICE_LOCATION: ${{ matrix.SERVICE_LOCATION }}
SERVICE_NAME: ${{ matrix.SERVICE_NAME }}
Expand All @@ -120,7 +120,7 @@ jobs:
sonar_analysis:
needs: build-regclient-local
if: "${{ github.event_name != 'pull_request' }}"
uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master
uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master-java21
with:
SERVICE_LOCATION: registration
secrets:
Expand Down
2 changes: 1 addition & 1 deletion registration/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
<!-- support jaxb in java11 -->
<javax.activation.version>1.2.0</javax.activation.version>
<jaxb.api.version>2.3.1</jaxb.api.version>
<openjfx.version>11.0.2</openjfx.version>
<openjfx.version>21.0.3</openjfx.version>

<sonar.coverage.exclusions>
**/dto/**,
Expand Down
12 changes: 6 additions & 6 deletions registration/ref-impl/ref-document-scanner/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,25 +46,25 @@
<dependency>
<groupId>morena7</groupId>
<artifactId>morena7</artifactId>
<scope>system</scope>
<!--<scope>system</scope>-->
<version>1.0</version>
<systemPath>C:\Users\61044292\Downloads\morena-7.1.36\lib\morena7.jar</systemPath>
<!-- <systemPath>${basedir}/lib/morena/morena7.jar</systemPath>-->
</dependency>

<dependency>
<groupId>morena7-license</groupId>
<artifactId>morena7-license</artifactId>
<scope>system</scope>
<!--<scope>system</scope>-->
<version>1.0</version>
<systemPath>C:\Users\61044292\Downloads\morena-7.1.36\lib\morena_license.jar</systemPath>
<!--<systemPath>${basedir}/lib/morena/morena_license.jar</systemPath>-->
</dependency>

<dependency>
<groupId>morena7-win</groupId>
<artifactId>morena7-win</artifactId>
<scope>system</scope>
<!--<scope>system</scope>-->
<version>1.0</version>
<systemPath>C:\Users\61044292\Downloads\morena-7.1.36\lib\morena7_win.jar</systemPath>
<!-- <systemPath>${basedir}/lib/morena/morena7_win.jar</systemPath>-->
</dependency>

<!--<dependency>
Expand Down
2 changes: 2 additions & 0 deletions registration/registration-api-stub-impl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
<version>1.2.1-java21-SNAPSHOT</version>
</parent>

<groupId>io.mosip.registration</groupId>
<artifactId>registration-api-stub-impl</artifactId>
<version>1.2.1-java21-SNAPSHOT</version>

<properties>
<maven.compiler.source>21</maven.compiler.source>
Expand Down
7 changes: 4 additions & 3 deletions registration/registration-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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>

<parent>
Expand All @@ -11,13 +11,14 @@
</parent>

<artifactId>registration-api</artifactId>
<version>1.2.1-java21-SNAPSHOT</version>

<properties>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<spring.version>5.0.6.RELEASE</spring.version>
<mosip.core.kernel.version>1.2.1-java21-SNAPSHOT</mosip.core.kernel.version>
<openjfx.version>11.0.2</openjfx.version>
<openjfx.version>21.0.3</openjfx.version>
<spring-cloud-config.version>2.0.4.RELEASE</spring-cloud-config.version>
</properties>

Expand Down
1 change: 1 addition & 0 deletions registration/registration-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

<artifactId>registration-client</artifactId>
<packaging>jar</packaging>
<version>1.2.1-java21-SNAPSHOT</version>
<name>registration-client</name>
<description>Maven project of MOSIP Registration UI</description>

Expand Down
1 change: 1 addition & 0 deletions registration/registration-services/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<artifactId>registration-services</artifactId>
<name>registration-services</name>
<description>Maven project of MOSIP Registration Service</description>
<version>1.2.1-java21-SNAPSHOT</version>

<dependencies>
<!-- Lombok -->
Expand Down
1 change: 1 addition & 0 deletions registration/registration-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<artifactId>registration-test</artifactId>
<name>registration-test</name>
<description>Maven project of MOSIP Registration Test</description>
<version>1.2.1-java21-SNAPSHOT</version>

<properties>
<maven.compiler.source>21</maven.compiler.source>
Expand Down
Loading