From 914c23cc08eb0a457ca47029bae18d91ef9418f3 Mon Sep 17 00:00:00 2001 From: "Ahmad K. Bawaneh" Date: Mon, 12 Feb 2024 17:57:30 +0300 Subject: [PATCH] Update for next development version --- .github/workflows/deploy.yaml | 43 +++++++++++-------- domino-ui-shared/pom.xml | 2 +- domino-ui-tools/mdi-icons-processor/pom.xml | 2 +- domino-ui-tools/pom.xml | 2 +- domino-ui-tools/theme-processor/pom.xml | 2 +- domino-ui-webjar/pom.xml | 2 +- domino-ui/pom.xml | 4 +- .../domino/ui/timepicker/Clock12.java | 8 +++- pom.xml | 10 ++--- 9 files changed, 43 insertions(+), 32 deletions(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index ed3bfc67a..40774b1fd 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -18,40 +18,45 @@ name: Deploy on: push: - branches: [ master , development] + branches: [ 1.0.0-RC6.1 , 1.0.0-RC6-dev] jobs: verify: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 strategy: matrix: - java-version: [ 8, 11 ] + java-version: [ 11 ] steps: - name: Check out Git repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Install Java and Maven - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: java-version: ${{ matrix.java-version }} - - run: mvn verify + distribution: 'temurin' + - run: mvn verify -B -e release: needs: verify - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - name: Check out Git repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Install Java and Maven - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: - java-version: 1.8 - - - name: Release Maven package - uses: samuelmeuli/action-maven-publish@v1 - with: - gpg_private_key: ${{ secrets.gpg_private_key }} - gpg_passphrase: ${{ secrets.gpg_passphrase }} - nexus_username: ${{ secrets.nexus_username }} - nexus_password: ${{ secrets.nexus_password }} - maven_args: -Dci=true + java-version: 11 + distribution: 'temurin' + server-id: ossrh + server-username: SONATYPE_USERNAME + server-password: SONATYPE_PASSWORD + - id: install-secret-key + name: Install gpg secret key + run: | + cat <(echo -e "${{ secrets.gpg_private_key }}") | gpg --batch --import + - name: publish to snapshot + run: mvn --no-transfer-progress clean deploy -B -e -Dci=true -Dgpg.passphrase=${{ secrets.gpg_passphrase }} + env: + SONATYPE_USERNAME: ${{ secrets.nexus_username }} + SONATYPE_PASSWORD: ${{ secrets.nexus_password }} diff --git a/domino-ui-shared/pom.xml b/domino-ui-shared/pom.xml index 3b96ad213..133186f5b 100644 --- a/domino-ui-shared/pom.xml +++ b/domino-ui-shared/pom.xml @@ -5,7 +5,7 @@ domino-ui-parent org.dominokit - 1.0.0-RC6 + 1.0.0-RC6.1-SNAPSHOT jar 4.0.0 diff --git a/domino-ui-tools/mdi-icons-processor/pom.xml b/domino-ui-tools/mdi-icons-processor/pom.xml index 5157a34ac..26bec7dd4 100644 --- a/domino-ui-tools/mdi-icons-processor/pom.xml +++ b/domino-ui-tools/mdi-icons-processor/pom.xml @@ -5,7 +5,7 @@ domino-ui-tools org.dominokit - 1.0.0-RC6 + 1.0.0-RC6.1-SNAPSHOT 4.0.0 diff --git a/domino-ui-tools/pom.xml b/domino-ui-tools/pom.xml index 60823caae..f5b4f43fd 100644 --- a/domino-ui-tools/pom.xml +++ b/domino-ui-tools/pom.xml @@ -5,7 +5,7 @@ domino-ui-parent org.dominokit - 1.0.0-RC6 + 1.0.0-RC6.1-SNAPSHOT 4.0.0 diff --git a/domino-ui-tools/theme-processor/pom.xml b/domino-ui-tools/theme-processor/pom.xml index c1e2823f2..e17d78c4b 100644 --- a/domino-ui-tools/theme-processor/pom.xml +++ b/domino-ui-tools/theme-processor/pom.xml @@ -5,7 +5,7 @@ domino-ui-tools org.dominokit - 1.0.0-RC6 + 1.0.0-RC6.1-SNAPSHOT 4.0.0 diff --git a/domino-ui-webjar/pom.xml b/domino-ui-webjar/pom.xml index 897bf4de0..8e90df623 100644 --- a/domino-ui-webjar/pom.xml +++ b/domino-ui-webjar/pom.xml @@ -5,7 +5,7 @@ domino-ui-parent org.dominokit - 1.0.0-RC6 + 1.0.0-RC6.1-SNAPSHOT jar 4.0.0 diff --git a/domino-ui/pom.xml b/domino-ui/pom.xml index e4f4eaf28..516add7cd 100644 --- a/domino-ui/pom.xml +++ b/domino-ui/pom.xml @@ -6,7 +6,7 @@ org.dominokit domino-ui-parent - 1.0.0-RC6 + 1.0.0-RC6.1-SNAPSHOT domino-ui @@ -113,7 +113,7 @@ domino-ui-components.css YUI - + true minify diff --git a/domino-ui/src/main/java/org/dominokit/domino/ui/timepicker/Clock12.java b/domino-ui/src/main/java/org/dominokit/domino/ui/timepicker/Clock12.java index 8a18e2eb6..c487b0166 100644 --- a/domino-ui/src/main/java/org/dominokit/domino/ui/timepicker/Clock12.java +++ b/domino-ui/src/main/java/org/dominokit/domino/ui/timepicker/Clock12.java @@ -108,7 +108,13 @@ public int getCorrectHour(int hour) { @Override public Date getTime() { JsDate jsDate = new JsDate(); - jsDate.setHours(DayPeriod.PM.equals(dayPeriod) ? hour + 12 : hour); + if (DayPeriod.PM.equals(dayPeriod) && hour < 12) { + jsDate.setHours(hour + 12); + } else if (DayPeriod.AM.equals(dayPeriod) && hour == 12) { + jsDate.setHours(0); + } else { + jsDate.setHours(hour); + } jsDate.setMinutes(minute); jsDate.setSeconds(second); return new Date(new Double(jsDate.getTime()).longValue()); diff --git a/pom.xml b/pom.xml index 2627ed059..b8921ce01 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.dominokit domino-ui-parent - 1.0.0-RC6 + 1.0.0-RC6.1-SNAPSHOT pom domino-ui-parent @@ -67,8 +67,8 @@ - HEAD-SNAPSHOT - 1.0.0-RC6 + 1.0.0-RC6.1-SNAPSHOT + 1.0.0-RC6.1 1.8 1.8 @@ -303,9 +303,9 @@ - master + 1.0.0-RC6.1 - development + 1.0.0-RC6-dev