Merge branch 'release/1.0.0-RC6.1' into 1.0.0-RC6-master

.github/workflows/deploy.yaml

@@ -18,40 +18,45 @@ name: Deploy
 
 on:
   push:
-    branches: [ master , development]
+    branches: [ 1.0.0-RC6-master , 1.0.0-RC6-dev]
 
 jobs:
   verify:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         java-version: [ 8, 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: ./mvnw verify -B -e
 
   release:
     needs: verify
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     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: 8
+          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: ./mvnw --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 }}

.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# 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.6.3/apache-maven-3.6.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar

domino-ui-shared/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>domino-ui-parent</artifactId>
         <groupId>org.dominokit</groupId>
-        <version>1.0.0-RC6</version>
+        <version>1.0.0-RC6.1</version>
     </parent>
     <packaging>jar</packaging>
     <modelVersion>4.0.0</modelVersion>

domino-ui-tools/mdi-icons-processor/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>domino-ui-tools</artifactId>
         <groupId>org.dominokit</groupId>
-        <version>1.0.0-RC6</version>
+        <version>1.0.0-RC6.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

domino-ui-tools/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>domino-ui-parent</artifactId>
         <groupId>org.dominokit</groupId>
-        <version>1.0.0-RC6</version>
+        <version>1.0.0-RC6.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

domino-ui-tools/theme-processor/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>domino-ui-tools</artifactId>
         <groupId>org.dominokit</groupId>
-        <version>1.0.0-RC6</version>
+        <version>1.0.0-RC6.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

domino-ui-webjar/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>domino-ui-parent</artifactId>
         <groupId>org.dominokit</groupId>
-        <version>1.0.0-RC6</version>
+        <version>1.0.0-RC6.1</version>
     </parent>
     <packaging>jar</packaging>
     <modelVersion>4.0.0</modelVersion>

domino-ui/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.dominokit</groupId>
         <artifactId>domino-ui-parent</artifactId>
-        <version>1.0.0-RC6</version>
+        <version>1.0.0-RC6.1</version>
     </parent>
 
     <artifactId>domino-ui</artifactId>
@@ -113,7 +113,7 @@
                             <cssFinalFile>domino-ui-components.css</cssFinalFile>
 
                             <cssEngine>YUI</cssEngine>
-
+                            <skipMinify>true</skipMinify>
                         </configuration>
                         <goals>
                             <goal>minify</goal>

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());