Skip to content

Commit

Permalink
odpi#464 fix up compile errors and pull versions forward
Browse files Browse the repository at this point in the history 
Signed-off-by: Nigel Jones <[email protected]>
  • Loading branch information
@planetf1
planetf1 committed Sep 29, 2022
1 parent 692c5b1 commit 262392d
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 41 deletions.
12 changes: 11 additions & 1 deletion apache-atlas-adapter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>egeria-connector-hadoop-ecosystem</artifactId>
<groupId>org.odpi.egeria</groupId>
<version>2.11</version>
<version>3.13-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -72,10 +72,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>2.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
<version>3.2.3</version>
</dependency>
<!-- Testing -->
<dependency>
Expand All @@ -89,10 +91,12 @@
<dependency>
<groupId>org.mock-server</groupId>
<artifactId>mockserver-client-java</artifactId>
<version>5.14.0</version>
</dependency>
<dependency>
<groupId>org.mock-server</groupId>
<artifactId>mockserver-core</artifactId>
<version>5.14.0</version>
</dependency>
<dependency>
<groupId>org.odpi.egeria</groupId>
Expand All @@ -114,6 +118,12 @@
<groupId>org.odpi.egeria</groupId>
<artifactId>inmemory-open-metadata-topic-connector</artifactId>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
<scope>compile</scope>
</dependency>
</dependencies>

<build>
Expand Down
5 changes: 3 additions & 2 deletions .../test/java/org/odpi/egeria/connectors/apache/atlas/repositoryconnector/ConnectorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import org.odpi.openmetadata.adapters.eventbus.topic.inmemory.InMemoryOpenMetadataTopicConnector;
import org.odpi.openmetadata.adapters.repositoryservices.ConnectorConfigurationFactory;
import org.odpi.openmetadata.adminservices.configuration.properties.OpenMetadataExchangeRule;
import org.odpi.openmetadata.frameworks.auditlog.ComponentDevelopmentStatus;
import org.odpi.openmetadata.frameworks.connectors.Connector;
import org.odpi.openmetadata.frameworks.connectors.ConnectorBroker;
import org.odpi.openmetadata.frameworks.connectors.ffdc.ConnectionCheckedException;
Expand Down Expand Up @@ -102,7 +103,7 @@ public void startConnector() {
auditLogDestinations.add((OMRSAuditLogStore)auditLogConnector);
OMRSAuditLogDestination destination = new OMRSAuditLogDestination("TestServer", "Test", "ODPi", auditLogDestinations);

OMRSAuditLog auditLog = new OMRSAuditLog(destination, -1, "ConnectorTest", "Testing of the connector", null);
OMRSAuditLog auditLog = new OMRSAuditLog(destination, -1, ComponentDevelopmentStatus.SAMPLE, "ConnectorTest", "Testing of the connector", null);
contentManager = new OMRSRepositoryContentManager(MockConstants.EGERIA_USER, auditLog);
eventManager = new OMRSRepositoryEventManager("Mock Outbound EventManager",
new OMRSRepositoryEventExchangeRule(OpenMetadataExchangeRule.SELECTED_TYPES, Collections.emptyList()),
Expand Down Expand Up @@ -325,7 +326,7 @@ public void testInvalidConnectors() {
auditLogDestinations.add((OMRSAuditLogStore)auditLogConnector);
OMRSAuditLogDestination destination = new OMRSAuditLogDestination("TestServer", "Test", "ODPi", auditLogDestinations);

OMRSAuditLog auditLog = new OMRSAuditLog(destination, 1, "ConnectorTest2", "Testing of the connector", null);
OMRSAuditLog auditLog = new OMRSAuditLog(destination, 1, ComponentDevelopmentStatus.SAMPLE, "ConnectorTest2", "Testing of the connector", null);
OMRSRepositoryContentManager invalidContent = new OMRSRepositoryContentManager(MockConstants.EGERIA_USER, auditLog);
OMRSRepositoryEventManager invalidEvent = new OMRSRepositoryEventManager("Mock Outbound EventManager 2",
new OMRSRepositoryEventExchangeRule(OpenMetadataExchangeRule.SELECTED_TYPES, Collections.emptyList()),
Expand Down
4 changes: 2 additions & 2 deletions distribution/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<artifactId>egeria-connector-hadoop-ecosystem</artifactId>
<groupId>org.odpi.egeria</groupId>
<version>2.11</version>
<version>3.13-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -24,7 +24,7 @@
<dependency>
<groupId>org.odpi.egeria</groupId>
<artifactId>egeria-connector-apache-atlas-adapter</artifactId>
<version>${open-metadata.version}</version>
<version>3.13-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
66 changes: 30 additions & 36 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<groupId>org.odpi.egeria</groupId>
<artifactId>egeria-connector-hadoop-ecosystem</artifactId>
<version>2.11</version>
<version>3.13-SNAPSHOT</version>

<url>https://odpi.github.io/Egeria</url>

Expand Down Expand Up @@ -80,44 +80,44 @@
<packaging>pom</packaging>

<properties>
<open-metadata.version>2.11</open-metadata.version>
<open-metadata.version>3.12</open-metadata.version>
<!-- Level of Java -->
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<!-- Platform encoding -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<!-- Versions of dependent libraries -->
<apacheatlas.version>2.1.0</apacheatlas.version>
<slf4j.version>1.7.30</slf4j.version>
<jackson.version>2.12.3</jackson.version>
<spring.version>5.3.8</spring.version>
<apacheatlas.version>2.2.0</apacheatlas.version>
<slf4j.version>2.0.1</slf4j.version>
<jackson.version>2.13.4</jackson.version>
<spring.version>5.3.23</spring.version>
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
<maven-javadoc-plugin.version>3.3.0</maven-javadoc-plugin.version>
<maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
<maven-download.version>1.4.1</maven-download.version>
<maven-antrun.version>1.8</maven-antrun.version>
<maven-install.version>3.0.0-M1</maven-install.version>
<maven-shade.version>3.2.1</maven-shade.version>
<junit.platform.version>1.5.2</junit.platform.version>
<junit.jupiter.version>5.6.2</junit.jupiter.version>
<junit.version>4.12</junit.version>
<surefire.plugin.version>3.0.0-M5</surefire.plugin.version>
<logback.version>1.2.3</logback.version>
<testng.version>7.4.0</testng.version>
<maven-javadoc-plugin.version>3.4.1</maven-javadoc-plugin.version>
<maven-clean-plugin.version>3.2.0</maven-clean-plugin.version>
<maven-download.version>1.6.8</maven-download.version>
<maven-antrun.version>3.1.0</maven-antrun.version>
<maven-install.version>3.0.1</maven-install.version>
<maven-shade.version>3.4.0</maven-shade.version>
<junit.platform.version>1.9.1</junit.platform.version>
<junit.jupiter.version>5.9.1</junit.jupiter.version>
<junit.version>4.13.2</junit.version>
<surefire.plugin.version>3.0.0-M7</surefire.plugin.version>
<logback.version>1.4.1</logback.version>
<testng.version>7.6.1</testng.version>
<mock-server.version>5.11.2</mock-server.version>
<sleepycat.version>18.3.12</sleepycat.version>
<rhino.version>1.7.13</rhino.version>
<nimbus.version>9.10</nimbus.version>
<rhino.version>1.7.14</rhino.version>
<nimbus.version>9.25.4</nimbus.version>
<commons-beanutils.version>1.9.4</commons-beanutils.version>
<httpclient.version>4.5.13</httpclient.version>
<kafka.version>2.4.1</kafka.version>
<zookeeper.version>3.7.0</zookeeper.version>
<netty.version>4.1.65.Final</netty.version>
<kafka.version>2.8.2</kafka.version>
<zookeeper.version>3.8.0</zookeeper.version>
<netty.version>4.1.82.Final</netty.version>
<commons-codec.version>1.15</commons-codec.version>
<maven-compiler.version>3.8.1</maven-compiler.version>
<spotbugs.version>4.2.3</spotbugs.version>
<jacoco-plugin.version>0.8.5</jacoco-plugin.version>
<maven-compiler.version>3.10.1</maven-compiler.version>
<spotbugs.version>4.7.2</spotbugs.version>
<jacoco-plugin.version>0.8.8</jacoco-plugin.version>
<!-- Configuration of sonar code scanning-->
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
<!--suppress UnresolvedMavenProperty -->
Expand Down Expand Up @@ -479,13 +479,6 @@
</dependency>
</dependencies>

<repositories>
<repository>
<id>ossrh-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</repository>
</repositories>

<build>

<pluginManagement>
Expand Down Expand Up @@ -700,7 +693,7 @@
<!-- Note test scope dependencies can't be reliably checked -->
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.0</version>
<executions>
<execution>
<id>analyze</id>
Expand All @@ -723,6 +716,7 @@
<!-- Ignore these as used for packaging -->
<ignoredUnusedDeclaredDependency>org.odpi.egeria:egeria-connector-apache-atlas-adapter:*</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>org.apache.atlas:atlas-common:*</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>javax.xml.bind:jaxb-api:*</ignoredUnusedDeclaredDependency>
</ignoredUnusedDeclaredDependencies>
</configuration>
</execution>
Expand Down

0 comments on commit 262392d

Please sign in to comment.