Merge pull request #28 from mandy-chessell/maintenance

Move to 3.11-SNAPSHOT
odpi · Oct 1, 2022 · 0c7bfcc · 0c7bfcc
2 parents 53a5e25 + 7db06ba
commit 0c7bfcc
Show file tree

Hide file tree

Showing 15 changed files with 92 additions and 66 deletions.
diff --git a/asset-deploy/pom.xml b/asset-deploy/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <artifactId>egeria-dev-projects</artifactId>
         <groupId>org.odpi.egeria</groupId>
-        <version>3.9</version>
+        <version>3.12</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -30,6 +30,11 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>org.odpi.egeria</groupId>
+            <artifactId>open-connector-framework</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.odpi.egeria</groupId>
             <artifactId>it-infrastructure-api</artifactId>

diff --git a/asset-look-up/pom.xml b/asset-look-up/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <artifactId>egeria-dev-projects</artifactId>
         <groupId>org.odpi.egeria</groupId>
-        <version>3.9</version>
+        <version>3.12</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/...k-up/src/main/java/org/odpi/openmetadata/devprojects/reports/assetlookup/AssetLookUp.java b/...k-up/src/main/java/org/odpi/openmetadata/devprojects/reports/assetlookup/AssetLookUp.java
diff --git a/asset-set-up/pom.xml b/asset-set-up/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <artifactId>egeria-dev-projects</artifactId>
         <groupId>org.odpi.egeria</groupId>
-        <version>3.9</version>
+        <version>3.12</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/...t-up/src/main/java/org/odpi/openmetadata/devprojects/utilities/assetsetup/AssetSetUp.java b/...t-up/src/main/java/org/odpi/openmetadata/devprojects/utilities/assetsetup/AssetSetUp.java
@@ -9,9 +9,9 @@
 import org.odpi.openmetadata.accessservices.datamanager.client.ExternalReferenceManagerClient;
 import org.odpi.openmetadata.accessservices.digitalarchitecture.client.ConnectionManager;
 import org.odpi.openmetadata.accessservices.digitalarchitecture.client.LocationManager;
-import org.odpi.openmetadata.accessservices.digitalarchitecture.client.ValidValuesManager;
 import org.odpi.openmetadata.accessservices.communityprofile.properties.ActorProfileProperties;
 import org.odpi.openmetadata.accessservices.assetmanager.client.ExternalAssetManagerClient;
+import org.odpi.openmetadata.accessservices.digitalarchitecture.client.ReferenceDataManager;
 import org.odpi.openmetadata.accessservices.governanceprogram.client.GovernanceZoneManager;
 import org.odpi.openmetadata.accessservices.governanceprogram.properties.GovernanceZoneProperties;
 import org.odpi.openmetadata.accessservices.itinfrastructure.client.CapabilityManagerClient;
@@ -47,9 +47,9 @@ public class AssetSetUp
     private static final String fileName9  = "sample-data/old-market-drop-foot-weekly-measurements/week4.csv";
     private static final String fileName10 = "sample-data/old-market-drop-foot-weekly-measurements/week5.csv";
 
-    private String serverName;
-    private String platformURLRoot;
-    private String clientUserId;
+    private final String serverName;
+    private final String platformURLRoot;
+    private final String clientUserId;
 
     private AssetConsumer                  assetConsumerClient            = null;
     private CSVFileAssetOwner              csvOnboardingClient            = null;
@@ -58,9 +58,9 @@ public class AssetSetUp
     private DatabaseManagerClient          databaseManagerClient          = null;
     private ExternalReferenceManagerClient externalReferenceManagerClient = null;
     private ConnectionManager              connectionManager              = null;
-    private LocationManager                locationManager                = null;
-    private ValidValuesManager             validValuesManager             = null;
-    private CapabilityManagerClient        capabilityManagerClient        = null;
+    private LocationManager                locationManager         = null;
+    private ReferenceDataManager           validValuesManager      = null;
+    private CapabilityManagerClient        capabilityManagerClient = null;
     private GovernanceZoneManager          governanceZoneManager          = null;
 
     private Map<String, String>            assetGUIDMap = new HashMap<>();

diff --git a/component-id-report/pom.xml b/component-id-report/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <artifactId>egeria-dev-projects</artifactId>
         <groupId>org.odpi.egeria</groupId>
-        <version>3.9</version>
+        <version>3.12</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/database-report/pom.xml b/database-report/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <artifactId>egeria-dev-projects</artifactId>
         <groupId>org.odpi.egeria</groupId>
-        <version>3.9</version>
+        <version>3.12</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -34,7 +34,12 @@
             <groupId>org.odpi.egeria</groupId>
             <artifactId>egeria-report-utilities</artifactId>
         </dependency>
-
+
+        <dependency>
+            <groupId>org.odpi.egeria</groupId>
+            <artifactId>open-connector-framework</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.odpi.egeria</groupId>
             <artifactId>data-manager-api</artifactId>

diff --git a/egeria-config-utility/pom.xml b/egeria-config-utility/pom.xml
@@ -10,15 +10,15 @@
     <parent>
         <artifactId>egeria-dev-projects</artifactId>
         <groupId>org.odpi.egeria</groupId>
-        <version>3.9</version>
+        <version>3.12</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <scm>
         <connection>scm:git:git://github.com/odpi/egeria-dev-projects.git</connection>
         <developerConnection>scm:git:ssh://github.com/odpi/egeria-dev-projects.git</developerConnection>
-        <url>http://github.com/odpi/egeria-dev-projects</url>
+        <url>https://github.com/odpi/egeria-dev-projects</url>
     </scm>
 
     <name>Egeria Config Utility</name>

diff --git a/egeria-infrastructure-catalog-connector/pom.xml b/egeria-infrastructure-catalog-connector/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <artifactId>egeria-dev-projects</artifactId>
         <groupId>org.odpi.egeria</groupId>
-        <version>3.9</version>
+        <version>3.12</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/...adata/devprojects/connectors/integration/egeria/EgeriaCataloguerIntegrationConnector.java b/...adata/devprojects/connectors/integration/egeria/EgeriaCataloguerIntegrationConnector.java
@@ -37,6 +37,7 @@
 import org.odpi.openmetadata.platformservices.client.PlatformServicesClient;
 import org.odpi.openmetadata.repositoryservices.auditlog.OMRSAuditingComponent;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -701,7 +702,7 @@ private void createConnector(String     serviceGUID,
 
             String dataAssetGUID = super.getContext().createDataAsset(assetProperties);
 
-            super.getContext().setupProcessCall(connectorGUID, dataAssetGUID, null, null, null, null, null);
+            super.getContext().setupProcessCall(connectorGUID, dataAssetGUID, null, new Date());
         }
 
         if (connectorConnection instanceof VirtualConnection)

diff --git a/egeria-ops-utility/pom.xml b/egeria-ops-utility/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <artifactId>egeria-dev-projects</artifactId>
         <groupId>org.odpi.egeria</groupId>
-        <version>3.9</version>
+        <version>3.12</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/egeria-platform-report/pom.xml b/egeria-platform-report/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <artifactId>egeria-dev-projects</artifactId>
         <groupId>org.odpi.egeria</groupId>
-        <version>3.9</version>
+        <version>3.12</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/egeria-report-utilities/pom.xml b/egeria-report-utilities/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <artifactId>egeria-dev-projects</artifactId>
         <groupId>org.odpi.egeria</groupId>
-        <version>3.9</version>
+        <version>3.12</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/event-display-audit-log-connector/pom.xml b/event-display-audit-log-connector/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <artifactId>egeria-dev-projects</artifactId>
         <groupId>org.odpi.egeria</groupId>
-        <version>3.9</version>
+        <version>3.12</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/pom.xml b/pom.xml
@@ -17,13 +17,13 @@
     <!-- These are our maven 'coordinates' ie the name of the artifact and its version -->
     <groupId>org.odpi.egeria</groupId>
     <artifactId>egeria-dev-projects</artifactId>
-    <version>3.9</version>
+    <version>3.12</version>
 
     <!-- This defines the link to our sources, and is required if the artifact is published to maven central -->
     <scm>
         <connection>scm:git:git://github.com/odpi/egeria-dev-projects.git</connection>
         <developerConnection>scm:git:ssh://github.com/odpi/egeria-dev-projects.git</developerConnection>
-        <url>http://github.com/odpi/egeria-dev-projects</url>
+        <url>https://github.com/odpi/egeria-dev-projects</url>
     </scm>
 
     <!-- Link for further information -->
@@ -108,7 +108,7 @@
 
     <properties>
         <!-- The version of EGERIA base libraries we are going to use -->
-        <open-metadata.version>3.9</open-metadata.version>
+        <open-metadata.version>3.12</open-metadata.version>
 
         <!-- Level of Java  -->
         <maven.compiler.source>11</maven.compiler.source>