Adapt to recent Gerrit core with the isolated prolog package Since change I28f2dc7b7cb prolog related classes were moved to a separate package. Change-Id: I59f1eea61bb5517e6d3c460cf478dad787aae6d5
diff --git a/owners/src/main/java/com/googlesource/gerrit/owners/OwnerPredicateProvider.java b/owners/src/main/java/com/googlesource/gerrit/owners/OwnerPredicateProvider.java index d15da8e..b83d7a8 100644 --- a/owners/src/main/java/com/googlesource/gerrit/owners/OwnerPredicateProvider.java +++ b/owners/src/main/java/com/googlesource/gerrit/owners/OwnerPredicateProvider.java
@@ -18,7 +18,7 @@ import com.google.common.collect.ImmutableSet; import com.google.gerrit.extensions.annotations.Listen; -import com.google.gerrit.server.rules.PredicateProvider; +import com.google.gerrit.server.rules.prolog.PredicateProvider; import com.google.inject.Inject; import com.googlesource.gerrit.owners.common.Accounts; import com.googlesource.gerrit.owners.common.PathOwnersEntriesCache;
diff --git a/owners/src/main/java/com/googlesource/gerrit/owners/OwnersModule.java b/owners/src/main/java/com/googlesource/gerrit/owners/OwnersModule.java index 7d2c4d5..81aef29 100644 --- a/owners/src/main/java/com/googlesource/gerrit/owners/OwnersModule.java +++ b/owners/src/main/java/com/googlesource/gerrit/owners/OwnersModule.java
@@ -17,7 +17,7 @@ import com.google.common.flogger.FluentLogger; import com.google.gerrit.extensions.registration.DynamicSet; -import com.google.gerrit.server.rules.PredicateProvider; +import com.google.gerrit.server.rules.prolog.PredicateProvider; import com.google.inject.AbstractModule; import com.google.inject.Inject; import com.googlesource.gerrit.owners.common.PathOwnersEntriesCache;
diff --git a/owners/src/main/java/com/googlesource/gerrit/owners/OwnersStoredValues.java b/owners/src/main/java/com/googlesource/gerrit/owners/OwnersStoredValues.java index 02ed2f8..cb5184a 100644 --- a/owners/src/main/java/com/googlesource/gerrit/owners/OwnersStoredValues.java +++ b/owners/src/main/java/com/googlesource/gerrit/owners/OwnersStoredValues.java
@@ -21,8 +21,8 @@ import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.patch.filediff.FileDiffOutput; import com.google.gerrit.server.project.ProjectState; -import com.google.gerrit.server.rules.StoredValue; -import com.google.gerrit.server.rules.StoredValues; +import com.google.gerrit.server.rules.prolog.StoredValue; +import com.google.gerrit.server.rules.prolog.StoredValues; import com.googlecode.prolog_cafe.lang.Prolog; import com.googlesource.gerrit.owners.common.Accounts; import com.googlesource.gerrit.owners.common.PathOwners;
diff --git a/owners/src/main/java/gerrit_owners/PRED_file_owners_2.java b/owners/src/main/java/gerrit_owners/PRED_file_owners_2.java index cbb23cf..11f1a74 100644 --- a/owners/src/main/java/gerrit_owners/PRED_file_owners_2.java +++ b/owners/src/main/java/gerrit_owners/PRED_file_owners_2.java
@@ -18,8 +18,8 @@ import com.google.gerrit.entities.Account; import com.google.gerrit.server.IdentifiedUser; -import com.google.gerrit.server.rules.PrologEnvironment; -import com.google.gerrit.server.rules.StoredValues; +import com.google.gerrit.server.rules.prolog.PrologEnvironment; +import com.google.gerrit.server.rules.prolog.StoredValues; import com.googlecode.prolog_cafe.exceptions.PInstantiationException; import com.googlecode.prolog_cafe.exceptions.PrologException; import com.googlecode.prolog_cafe.lang.Operation;