update dependencies and use a new super source approach compatible wi…

…th j2cl
DominoKit · Nov 28, 2023 · 6435e4e · 6435e4e
1 parent 3d5f4cc
commit 6435e4e
Show file tree

Hide file tree

Showing 132 changed files with 5,045 additions and 1,824 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: [ master , development ]
 
 jobs:
   verify:
-    runs-on: ubuntu-latest
+    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-latest
+    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/.mvn/maven.config b/.mvn/maven.config
diff --git a/.mvn/settings.xml b/.mvn/settings.xml
diff --git a/domino-rest-client/pom.xml b/domino-rest-client/pom.xml
@@ -21,12 +21,12 @@
             <version>1.0.0-RC1</version>
         </dependency>
         <dependency>
-            <groupId>com.google.gwt</groupId>
+            <groupId>org.gwtproject</groupId>
             <artifactId>gwt-user</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.google.gwt</groupId>
+            <groupId>org.gwtproject</groupId>
             <artifactId>gwt-dev</artifactId>
             <scope>test</scope>
         </dependency>
@@ -40,11 +40,6 @@
             <artifactId>domino-rest-shared</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.dominokit</groupId>
-            <artifactId>domino-rest-jaxrs</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.gwtproject.core</groupId>
             <artifactId>gwt-core</artifactId>
@@ -60,6 +55,43 @@
             <artifactId>gwt-xhr</artifactId>
             <version>1.0.0-RC1</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.gwtproject.regexp</groupId>
+            <artifactId>gwt-regexp</artifactId>
+            <version>1.0.0-RC1</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.elemental2</groupId>
+                    <artifactId>elemental2-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.google.elemental2</groupId>
+                    <artifactId>elemental2-dom</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.google.elemental2</groupId>
+                    <artifactId>elemental2-promise</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.google.elemental2</groupId>
+            <artifactId>elemental2-promise</artifactId>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/javax.ws.rs/javax.ws.rs-api -->
+        <dependency>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>javax.ws.rs-api</artifactId>
+            <version>${jax.rs.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dominokit</groupId>
+            <artifactId>domino-rest-jaxrs</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

diff --git a/domino-rest-client/src/main/java/org/dominokit/rest/DominoRestConfig.java b/domino-rest-client/src/main/java/org/dominokit/rest/DominoRestConfig.java
@@ -25,6 +25,8 @@
 import org.dominokit.rest.js.ServerEventFactory;
 import org.dominokit.rest.shared.request.*;
 import org.gwtproject.i18n.shared.DateTimeFormat;
+import org.gwtproject.regexp.shared.MatchResult;
+import org.gwtproject.regexp.shared.RegExp;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -253,4 +255,19 @@ public RestConfig setNullQueryParamStrategy(NullQueryParamStrategy strategy) {
     }
     return this;
   }
+
+  @Override
+  public UrlTokenRegexMatcher getUrlTokenRegexMatcher() {
+    return url -> {
+      if (url.contains("http:") || url.contains("https:")) {
+        RegExp regExp = RegExp.compile("^((.*:)//([a-z0-9\\-.]+)(|:[0-9]+)/)(.*)$");
+        MatchResult matcher = regExp.exec(url);
+        boolean matchFound = matcher != null; // equivalent to regExp.test(inputStr);
+        if (matchFound) {
+          return matcher.getGroup(matcher.getGroupCount() - 1);
+        }
+      }
+      return url;
+    };
+  }
 }
diff --git a/domino-rest-client/src/main/module.gwt.xml b/domino-rest-client/src/main/module.gwt.xml
@@ -20,5 +20,6 @@
     <inherits name="org.gwtproject.event.Event"/>
     <inherits name="org.gwtproject.core.Core"/>
     <inherits name="org.dominokit.domino.logger.Logging"/>
+    <inherits name="javax.ws.rs.JaxRs"/>
     <source path=""/>
 </module>
diff --git a/domino-rest-jaxrs/pom.xml b/domino-rest-jaxrs/pom.xml
@@ -15,23 +15,4 @@
     <url>https://github.com/DominoKit/domino-rest</url>
     <description>domino rest jax-rs super sources</description>
 
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-            </resource>
-        </resources>
-        <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>${maven.javadoc.plugin}</version>
-                    <configuration>
-                        <sourceFileIncludes>
-                            <include>**/GwtIncompatible.java</include>
-                        </sourceFileIncludes>
-                    </configuration>
-                </plugin>
-        </plugins>
-    </build>
 </project>
diff --git a/domino-rest-jaxrs/src/main/java/javax/ws/rs/Consumes.java b/domino-rest-jaxrs/src/main/java/javax/ws/rs/Consumes.java
diff --git a/domino-rest-jaxrs/src/main/java/javax/ws/rs/CookieParam.java b/domino-rest-jaxrs/src/main/java/javax/ws/rs/CookieParam.java