Update for next development version

DominoKit · Feb 12, 2024 · 914c23c · 914c23c
1 parent ae91927
commit 914c23c
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 32 deletions.
diff --git 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
@@ -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-SNAPSHOT</version>
     </parent>
     <packaging>jar</packaging>
     <modelVersion>4.0.0</modelVersion>

diff --git a/domino-ui-tools/mdi-icons-processor/pom.xml b/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-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/domino-ui-tools/pom.xml b/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-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/domino-ui-tools/theme-processor/pom.xml b/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-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/domino-ui-webjar/pom.xml b/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-SNAPSHOT</version>
     </parent>
     <packaging>jar</packaging>
     <modelVersion>4.0.0</modelVersion>

diff --git a/domino-ui/pom.xml b/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-SNAPSHOT</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>

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
@@ -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
@@ -5,7 +5,7 @@
 
     <groupId>org.dominokit</groupId>
     <artifactId>domino-ui-parent</artifactId>
-    <version>1.0.0-RC6</version>
+    <version>1.0.0-RC6.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>domino-ui-parent</name>
@@ -67,8 +67,8 @@
     </modules>
 
     <properties>
-        <snapshot.version>HEAD-SNAPSHOT</snapshot.version>
-        <next.release.version>1.0.0-RC6</next.release.version>
+        <snapshot.version>1.0.0-RC6.1-SNAPSHOT</snapshot.version>
+        <next.release.version>1.0.0-RC6.1</next.release.version>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
 
@@ -303,9 +303,9 @@
 
                     <!-- Configure branches -->
                     <gitFlowConfig>
-                        <productionBranch>master</productionBranch>
+                        <productionBranch>1.0.0-RC6.1</productionBranch>
                         <!-- default is develop, but we use development -->
-                        <developmentBranch>development</developmentBranch>
+                        <developmentBranch>1.0.0-RC6-dev</developmentBranch>
                     </gitFlowConfig>
                 </configuration>
             </plugin>