Merge branch 'main' into main

OpenGamma · Nov 14, 2023 · b4cc294 · b4cc294
2 parents 1c4ebd5 + 5fdb7b9
commit b4cc294
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/modules/pom.xml b/modules/pom.xml
@@ -765,13 +765,13 @@
     <asm.version>9.5</asm.version>
     <assertj.version>3.24.2</assertj.version>
     <bridger.version>1.6.Final</bridger.version>
-    <guava.version>32.1.2-jre</guava.version><!-- didn't want to go beyond v27 but forced to by security https://github.com/google/guava/issues/3320 -->
+    <guava.version>32.1.3-jre</guava.version><!-- didn't want to go beyond v27 but forced to by security https://github.com/google/guava/issues/3320 -->
     <guava-docs.version>26.0-jre</guava-docs.version>
     <jcommander.version>1.78</jcommander.version>
     <joda-convert.version>2.2.3</joda-convert.version>
     <joda-beans.version>2.10.0</joda-beans.version>
     <joda.beans.version>${joda-beans.version}</joda.beans.version>
-    <junit5.version>5.9.3</junit5.version>
+    <junit5.version>5.10.1</junit5.version>
     <mockito.version>4.9.0</mockito.version>
     <slf4j.version>1.7.36</slf4j.version>
     <!-- Versions after M3 cause RequireFilesExist to reject relative paths -->

diff --git a/modules/product/src/main/java/com/opengamma/strata/product/common/ExchangeIds.java b/modules/product/src/main/java/com/opengamma/strata/product/common/ExchangeIds.java
@@ -150,6 +150,9 @@ public final class ExchangeIds {
   /** Nasdaq Commodity Exchange. */
   public static final ExchangeId NORX = ExchangeId.of("NORX");
 
+  /** OMIClear Exchange. */
+  public static final ExchangeId OMIC = ExchangeId.of("OMIC");
+
   //-------------------------------------------------------------------------
   /**
    * Restricted constructor.