from: infinispan-remote
to: core
evidence:
 - file: "infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/impl/ProtobufSchemaInitializer.java"
   contains "import org.hibernate.ogm.options.spi.OptionsService;"

from: infinispan-remote
to: core
evidence:
 - file: "infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/impl/InfinispanRemoteDatastoreProvider.java"
   contains "import org.hibernate.ogm.util.impl.EffectivelyFinal;"

from: infinispan-remote
to: core
evidence:
 - file: "infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/impl/InfinispanRemoteStoredProceduresManager.java"
   contains "import org.hibernate.ogm.util.impl.CollectionHelper;"

from: infinispan-remote
to: core
evidence:
 - file: "infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/impl/ProtostreamAssociationMappingAdapter.java"
   contains "import org.hibernate.ogm.model.key.spi.EntityKey;"

from: infinispan-remote
to: core
evidence:
 - file: "infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/impl/VersionedAssociation.java"
   contains "import org.hibernate.ogm.model.spi.Association;"

from: infinispan-remote
to: core
evidence:
 - file: "infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/impl/VersionedTuple.java"
   contains "import org.hibernate.ogm.model.spi.Tuple;"

from: infinispan-remote
to: core
evidence:
 - file: "infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/impl/ProtoStreamMappingAdapter.java"
   contains "import org.hibernate.ogm.model.spi.Tuple;"

from: infinispan-remote
to: core
evidence:
 - file: "infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/impl/schema/TableDefinition.java"
   contains "import org.hibernate.ogm.type.spi.GridType;"

from: infinispan-remote
to: core
evidence:
 - file: "infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/impl/schema/SequenceTableDefinition.java"
   contains "import org.hibernate.ogm.model.key.spi.IdSourceKeyMetadata;"

from: infinispan-remote
to: core
evidence:
 - file: "infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/impl/sequences/SequencesPerCache.java"
   contains "import org.hibernate.ogm.model.key.spi.IdSourceKey;"

from: infinispan-remote
to: core
evidence:
 - file: "infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/impl/sequences/HotRodSequencer.java"
   contains "import org.hibernate.ogm.dialect.spi.NextValueRequest;"

from: infinispan-remote
to: core
evidence:
 - file: "infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/impl/sequences/HotRodSequenceHandler.java"
   contains "import org.hibernate.ogm.dialect.spi.NextValueRequest;"

from: infinispan-remote
to: core
evidence:
 - file: "infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/impl/protostream/ProtostreamPayload.java"
   contains "import org.hibernate.ogm.datastore.map.impl.MapTupleSnapshot;"

from: infinispan-remote
to: core
evidence:
 - file: "infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/impl/protostream/ProtostreamAssociationPayload.java"
   contains "import org.hibernate.ogm.datastore.map.impl.MapAssociationSnapshot;"

from: infinispan-remote
to: core
evidence:
 - file: "infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/impl/protostream/MainOgmCoDec.java"
   contains "import org.hibernate.ogm.model.key.spi.EntityKey;"

from: infinispan-remote
to: core
evidence:
 - file: "infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/impl/protostream/ProtoDataMapper.java"
   contains "import org.hibernate.ogm.model.key.spi.EntityKey;"

from: infinispan-remote
to: core
evidence:
 - file: "infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/impl/counter/HotRodSequenceCounterHandler.java"
   contains "import org.hibernate.ogm.model.key.spi.IdSourceKey;"

from: infinispan-remote
to: core
evidence:
 - file: "infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/impl/counter/CounterHandler.java"
   contains "import org.hibernate.ogm.dialect.spi.NextValueRequest;"

from: infinispan-remote
to: core
evidence:
 - file: "infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/impl/protobuf/CompositeProtobufCoDec.java"
   contains "import org.hibernate.ogm.datastore.map.impl.MapTupleSnapshot;"

from: infinispan-remote
to: core
evidence:
 - file: "infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/impl/protobuf/ProtofieldAccessorSet.java"
   contains "import org.hibernate.ogm.type.impl.AttributeConverterGridTypeAdaptor;"

from: infinispan-remote
to: core
evidence:
 - file: "infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/impl/protobuf/schema/SchemaValidator.java"
   contains "import org.hibernate.ogm.util.impl.ResourceHelper;"

from: infinispan-remote
to: core
evidence:
 - file: "infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/impl/protobuf/schema/SchemaDefinitions.java"
   contains "import org.hibernate.ogm.model.key.spi.IdSourceKeyMetadata;"

from: infinispan-remote
to: core
evidence:
 - file: "infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/options/navigation/InfinispanRemoteGlobalContext.java"
   contains "import org.hibernate.ogm.datastore.keyvalue.options.navigation.KeyValueStoreGlobalContext;"

from: infinispan-remote
to: core
evidence:
 - file: "infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/options/navigation/InfinispanRemoteEntityContext.java"
   contains "import org.hibernate.ogm.datastore.keyvalue.options.navigation.KeyValueStoreEntityContext;"

from: infinispan-remote
to: core
evidence:
 - file: "infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/options/navigation/InfinispanRemotePropertyContext.java"
   contains "import org.hibernate.ogm.datastore.keyvalue.options.navigation.KeyValueStorePropertyContext;"

from: infinispan-remote
to: core
evidence:
 - file: "infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/options/navigation/impl/InfinispanRemoteEntityContextImpl.java"
   contains "import org.hibernate.ogm.options.navigation.spi.ConfigurationContext;"

from: infinispan-remote
to: core
evidence:
 - file: "infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/options/navigation/impl/InfinispanRemoteGlobalContextImpl.java"
   contains "import org.hibernate.ogm.options.navigation.spi.ConfigurationContext;"

from: infinispan-remote
to: core
evidence:
 - file: "infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/options/navigation/impl/InfinispanRemotePropertyContextImpl.java"
   contains "import org.hibernate.ogm.options.navigation.spi.ConfigurationContext;"

from: infinispan-remote
to: core
evidence:
 - file: "infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/configuration/impl/InfinispanRemoteValidators.java"
   contains "import org.hibernate.ogm.util.configurationreader.spi.PropertyValidator;"

from: infinispan-remote
to: core
evidence:
 - file: "infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/configuration/impl/InfinispanRemoteConfiguration.java"
   contains "import org.hibernate.ogm.util.configurationreader.spi.ConfigurationPropertyReader;"

from: infinispan-remote
to: core
evidence:
 - file: "infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/InfinispanRemoteDataStoreConfiguration.java"
   contains "import org.hibernate.ogm.options.navigation.spi.ConfigurationContext;"

from: infinispan-remote
to: core
evidence:
 - file: "infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/InfinispanRemoteDialect.java"
   contains "import org.hibernate.ogm.datastore.map.impl.MapAssociationSnapshot;"

from: infinispan-remote
to: core
evidence:
 - file: "infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/InfinispanRemoteProperties.java"
   contains "import org.hibernate.ogm.datastore.keyvalue.cfg.KeyValueStoreProperties;"

from: infinispan-remote
to: core
evidence:
 - file: "infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/query/impl/RawTypeClosableIterator.java"
   contains "import org.hibernate.ogm.datastore.map.impl.MapTupleSnapshot;"

from: infinispan-remote
to: core
evidence:
 - file: "infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/query/impl/InfinispanRemoteQueryHandler.java"
   contains "import org.hibernate.ogm.model.key.spi.EntityKeyMetadata;"

from: infinispan-remote
to: core
evidence:
 - file: "infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/query/impl/ProtostreamPayloadClosableIterator.java"
   contains "import org.hibernate.ogm.model.spi.Tuple;"

from: infinispan-remote
to: core
evidence:
 - file: "infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/query/parsing/impl/InfinispanRemoteBasedQueryParserService.java"
   contains "import org.hibernate.ogm.util.impl.Log;"

from: infinispan-remote
to: core
evidence:
 - file: "infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/query/parsing/impl/InfinispanRemotePredicateFactory.java"
   contains "import org.hibernate.ogm.datastore.spi.DatastoreProvider;"

from: infinispan-remote
to: core
evidence:
 - file: "infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/query/parsing/impl/InfinispanRemotePropertyHelper.java"
   contains "import org.hibernate.ogm.type.spi.GridType;"

from: infinispan-remote
to: core
evidence:
 - file: "infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/query/parsing/impl/InfinispanRemoteQueryRendererDelegate.java"
   contains "import org.hibernate.ogm.persister.impl.OgmEntityPersister;"

from: infinispan-remote
to: core
evidence:
 - file: "infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/query/parsing/impl/InfinispanRemoteQueryParsingResult.java"
   contains "import org.hibernate.ogm.query.spi.QueryParsingResult;"

from: infinispan-remote
to: core
evidence:
 - file: "infinispan-remote/src/main/java/org/hibernate/ogm/datastore/infinispanremote/query/parsing/impl/InfinispanRemoteProcessingChain.java"
   contains "import org.hibernate.ogm.query.parsing.impl.HibernateOGMQueryResolverDelegate;"