Skip to content

Commit

Permalink
BAH-3932 | Add. Bump Java Version 11 -> 17 And Required Dependencies (#…
Browse files Browse the repository at this point in the history
…116)

* [Rahul] | BAH-3932 | Add. Bump Java Version 11 -> 17

* [Rahul] | BAH-3932 | Add. Bump Dependencies For Java 17 Migration

javax -> jakarta
remove velocity-engine-core
introduce snakeyaml, netty-codec-http

* [Rahul] | BAH-3932 | Fix. Servelet contextConfigLocation For Java 17 Migration

* [Rahul] | BAH-3932 | Fix. javax -> jakarta

* [Rahul] | BAH-3932 | Add. Bump Dependencies For Java 17 Migration

spring 5.3.30 -> 6.0.19
jakarta servlet-api 3.0.1 -> 6.0.0
spring-boot 3.0.0 -> 3.0.13
Introduce Test Configuration For Mockito

* [Rahul] | BAH-3932 | Add. Embedded Tomcat 10 Support

* [Rahul] | BAH-3932 | Add. Bump Maven Wrapper For Jdk 17 Support
  • Loading branch information
rahu1ramesh authored Jun 27, 2024
1 parent ba9913f commit 7036d85
Show file tree
Hide file tree
Showing 13 changed files with 383 additions and 476 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Setup Java 11
- name: Setup Java 17
uses: actions/setup-java@v4
with:
distribution: "corretto"
java-version: "11"
java-version: "17"
- name: Set env.ARTIFACT_VERSION
run: |
wget -q https://raw.githubusercontent.com/Bahmni/bahmni-infra-utils/main/setArtifactVersion.sh && chmod +x setArtifactVersion.sh
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/validate_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ jobs:
name: Tests & Package
runs-on: ubuntu-latest
steps:
- name: Setup Java 11
- name: Setup Java 17
uses: actions/setup-java@v4
with:
distribution: "corretto"
java-version: "11"
java-version: "17"
- name: Checkout OpenERP Atomfeed Service Repo
uses: actions/checkout@v2
- name: Run Tests
Expand Down
9 changes: 5 additions & 4 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
#
# http://www.apache.org/licenses/LICENSE-2.0
#
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar
wrapperVersion=3.3.2
distributionType=only-script
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: java
jdk:
- openjdk11
- openjdk17
script: mvn clean install -DskipTests
notifications:
email:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ To run Liquibase migrations on the Vagrant machine:

## Building and Packaging the Docker Image

To build the project locally, ensure your machine has `Java 11` installed. Docker images for [odoo-connect](https://hub.docker.com/r/bahmni/odoo-connect/tags) are built using [GitHub Actions](/.github/workflows). Resources to build the [bahmni/odoo-connect](https://hub.docker.com/r/bahmni/odoo-connect/tags) images can be found in the [package](/package/docker/Dockerfile) directory.
To build the project locally, ensure your machine has `Java 17` installed. Docker images for [odoo-connect](https://hub.docker.com/r/bahmni/odoo-connect/tags) are built using [GitHub Actions](/.github/workflows). Resources to build the [bahmni/odoo-connect](https://hub.docker.com/r/bahmni/odoo-connect/tags) images can be found in the [package](/package/docker/Dockerfile) directory.

To build and package the project locally, run:

Expand Down
Loading

0 comments on commit 7036d85

Please sign in to comment.