Merge branch 'release/1.42.2'

HCL-TECH-SOFTWARE · Sep 20, 2024 · 492ae62 · 492ae62
2 parents e6e990f + 1414564
commit 492ae62
Show file tree

Hide file tree

Showing 21 changed files with 36 additions and 19 deletions.
diff --git a/domino-jnx-api/pom.xml b/domino-jnx-api/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.hcl.domino</groupId>
     <artifactId>domino-jnx</artifactId>
-    <version>1.42.1</version>
+    <version>1.42.2</version>
   </parent>
   <artifactId>domino-jnx-api</artifactId>
   <name>HCL Domino API</name>

diff --git a/domino-jnx-api/src/main/java/com/hcl/domino/dql/DQL.java b/domino-jnx-api/src/main/java/com/hcl/domino/dql/DQL.java
@@ -126,6 +126,11 @@ public static abstract class DQLTerm {
      */
     @Override
     public abstract String toString();
+
+    @Override
+    public boolean equals(Object obj) {
+      return obj != null && getClass().equals(obj.getClass()) && toString().equals(obj.toString());
+    }
   }
 
   public static class InViewsOrFoldersTerm extends DQLTerm {

diff --git a/domino-jnx-api/src/test/java/com/hcl/domino/test/dql/TestDQLGenerator.java b/domino-jnx-api/src/test/java/com/hcl/domino/test/dql/TestDQLGenerator.java
@@ -107,4 +107,9 @@ public void testFormulas() {
     assertEquals("Bar = 'Baz' and @formula('Foo=''Hello''')", DQL.and(DQL.item("Bar").isEqualTo("Baz"), DQL.formula("Foo='Hello'")).toString());
   }
 
+  @Test
+  public void testTermEquivalence() {
+    assertEquals(DQL.item("Foo").isEqualTo("Bar"), DQL.item("Foo").isEqualTo("Bar"));
+  }
+
 }
diff --git a/domino-jnx-commons/pom.xml b/domino-jnx-commons/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.hcl.domino</groupId>
     <artifactId>domino-jnx</artifactId>
-    <version>1.42.1</version>
+    <version>1.42.2</version>
   </parent>
   <artifactId>domino-jnx-commons</artifactId>
   <name>HCL Domino API Common Code</name>
@@ -41,6 +41,13 @@
       <artifactId>junit-jupiter-params</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- used commonly downstream, useful for development toolchains-->
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+      <version>3.0.2</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
   <build>
     <finalName>${jar.finalName}</finalName>

diff --git a/domino-jnx-console/pom.xml b/domino-jnx-console/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.hcl.domino</groupId>
     <artifactId>domino-jnx</artifactId>
-    <version>1.42.1</version>
+    <version>1.42.2</version>
   </parent>
   <artifactId>domino-jnx-console</artifactId>
   <name>HCL Domino API Server Controller Connector</name>

diff --git a/domino-jnx-jna/pom.xml b/domino-jnx-jna/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.hcl.domino</groupId>
     <artifactId>domino-jnx</artifactId>
-    <version>1.42.1</version>
+    <version>1.42.2</version>
   </parent>
   <artifactId>domino-jnx-jna</artifactId>
   <name>HCL Domino API, JNA Implementation</name>

diff --git a/example/jnx-example-domino-servlet/pom.xml b/example/jnx-example-domino-servlet/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.hcl.domino</groupId>
     <artifactId>domino-jnx</artifactId>
-    <version>1.42.1</version>
+    <version>1.42.2</version>
     <relativePath>../..</relativePath>
   </parent>
   <artifactId>jnx-example-domino-servlet</artifactId>

diff --git a/example/jnx-example-domino-webapp-admin/pom.xml b/example/jnx-example-domino-webapp-admin/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.hcl.domino</groupId>
     <artifactId>domino-jnx</artifactId>
-    <version>1.42.1</version>
+    <version>1.42.2</version>
     <relativePath>../..</relativePath>
   </parent>
   <artifactId>jnx-example-domino-webapp-admin</artifactId>

diff --git a/example/jnx-example-gluon/pom.xml b/example/jnx-example-gluon/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.hcl.domino</groupId>
     <artifactId>domino-jnx</artifactId>
-    <version>1.42.1</version>
+    <version>1.42.2</version>
     <relativePath>../..</relativePath>
   </parent>
   <artifactId>jnx-example-gluon</artifactId>

diff --git a/example/jnx-example-graalvm-native/pom.xml b/example/jnx-example-graalvm-native/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.hcl.domino</groupId>
     <artifactId>domino-jnx</artifactId>
-    <version>1.42.1</version>
+    <version>1.42.2</version>
     <relativePath>../..</relativePath>
   </parent>
   <artifactId>jnx-example-graalvm-native</artifactId>

diff --git a/example/jnx-example-runjava/pom.xml b/example/jnx-example-runjava/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.hcl.domino</groupId>
     <artifactId>domino-jnx</artifactId>
-    <version>1.42.1</version>
+    <version>1.42.2</version>
     <relativePath>../..</relativePath>
   </parent>
   <artifactId>jnx-example-runjava</artifactId>

diff --git a/example/jnx-example-swt/pom.xml b/example/jnx-example-swt/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.hcl.domino</groupId>
     <artifactId>domino-jnx</artifactId>
-    <version>1.42.1</version>
+    <version>1.42.2</version>
     <relativePath>../..</relativePath>
   </parent>
   <artifactId>jnx-example-swt</artifactId>

diff --git a/example/jnx-example-webapp/pom.xml b/example/jnx-example-webapp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.hcl.domino</groupId>
     <artifactId>domino-jnx</artifactId>
-    <version>1.42.1</version>
+    <version>1.42.2</version>
     <relativePath>../..</relativePath>
   </parent>
   <artifactId>jnx-example-webapp</artifactId>

diff --git a/integration/domino-jnx-jakarta-security/pom.xml b/integration/domino-jnx-jakarta-security/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.hcl.domino</groupId>
     <artifactId>domino-jnx</artifactId>
-    <version>1.42.1</version>
+    <version>1.42.2</version>
     <relativePath>../..</relativePath>
   </parent>
   <artifactId>domino-jnx-jakarta-security</artifactId>

diff --git a/integration/domino-jnx-jsonb/pom.xml b/integration/domino-jnx-jsonb/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.hcl.domino</groupId>
     <artifactId>domino-jnx</artifactId>
-    <version>1.42.1</version>
+    <version>1.42.2</version>
     <relativePath>../..</relativePath>
   </parent>
   <artifactId>domino-jnx-jsonb</artifactId>

diff --git a/integration/domino-jnx-lsxbeshim/pom.xml b/integration/domino-jnx-lsxbeshim/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.hcl.domino</groupId>
     <artifactId>domino-jnx</artifactId>
-    <version>1.42.1</version>
+    <version>1.42.2</version>
     <relativePath>../..</relativePath>
   </parent>
   <artifactId>domino-jnx-lsxbeshim</artifactId>

diff --git a/integration/domino-jnx-rawdoc-json/pom.xml b/integration/domino-jnx-rawdoc-json/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.hcl.domino</groupId>
     <artifactId>domino-jnx</artifactId>
-    <version>1.42.1</version>
+    <version>1.42.2</version>
     <relativePath>../..</relativePath>
   </parent>
   <artifactId>domino-jnx-rawdoc-json</artifactId>

diff --git a/integration/domino-jnx-vertx-json/pom.xml b/integration/domino-jnx-vertx-json/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.hcl.domino</groupId>
     <artifactId>domino-jnx</artifactId>
-    <version>1.42.1</version>
+    <version>1.42.2</version>
     <relativePath>../..</relativePath>
   </parent>
   <artifactId>domino-jnx-vertx-json</artifactId>

diff --git a/integration/domino-jnx-xpages/pom.xml b/integration/domino-jnx-xpages/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.hcl.domino</groupId>
     <artifactId>domino-jnx</artifactId>
-    <version>1.42.1</version>
+    <version>1.42.2</version>
     <relativePath>../..</relativePath>
   </parent>
   <artifactId>domino-jnx-xpages</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.hcl.domino</groupId>
   <artifactId>domino-jnx</artifactId>
-  <version>1.42.1</version>
+  <version>1.42.2</version>
   <packaging>pom</packaging>
   <name>HCL Domino API Parent Project</name>
   <description>Modern Java API for HCL Domino</description>

diff --git a/test/it-domino-jnx/pom.xml b/test/it-domino-jnx/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.hcl.domino</groupId>
     <artifactId>domino-jnx</artifactId>
-    <version>1.42.1</version>
+    <version>1.42.2</version>
     <relativePath>../..</relativePath>
   </parent>
   <artifactId>it-domino-jnx</artifactId>