Use the release branch of Cedar (#209)

Signed-off-by: Shaobo He <shaobohe@amazon.com>
cedar-policy · Sep 17, 2024 · 9f471a1 · 9f471a1
1 parent e2090eb
commit 9f471a1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/CedarJava/build.gradle b/CedarJava/build.gradle
@@ -187,7 +187,7 @@ tasks.register('downloadIntegrationTests', Download) {
     group 'Build'
     description 'Downloads Cedar repository with integration tests.'
 
-    src 'https://codeload.github.com/cedar-policy/cedar-integration-tests/zip/main'
+    src 'https://codeload.github.com/cedar-policy/cedar-integration-tests/zip/release%2F4.0.x'
     dest layout.buildDirectory.file('cedar-integration-tests-main.zip')
     overwrite false
 }
@@ -208,8 +208,8 @@ tasks.register('extractCorpusTests', Copy) {
 
     dependsOn('extractIntegrationTests')
     dependsOn('processTestResources')
-    from tarTree(layout.buildDirectory.file('resources/test/cedar-integration-tests-main/corpus-tests.tar.gz'))
-    into layout.buildDirectory.dir('resources/test/cedar-integration-tests-main')
+    from tarTree(layout.buildDirectory.file('resources/test/cedar-integration-tests-release-4.0.x/corpus-tests.tar.gz'))
+    into layout.buildDirectory.dir('resources/test/cedar-integration-tests-release-4.0.x')
 }
 
 tasks.named('test') {

diff --git a/CedarJava/src/test/java/com/cedarpolicy/SharedIntegrationTests.java b/CedarJava/src/test/java/com/cedarpolicy/SharedIntegrationTests.java
@@ -79,7 +79,7 @@ private Path resolveIntegrationTestPath(String path) {
         if (resolved.isAbsolute()) {
             return resolved;
         } else {
-            final URL integrationTestsLocation = getClass().getResource("/cedar-integration-tests-main");
+            final URL integrationTestsLocation = getClass().getResource("/cedar-integration-tests-release-4.0.x");
             return integrationTestsLocation == null ? resolved : Paths.get(integrationTestsLocation.getPath(), path);
         }
     }

diff --git a/CedarJavaFFI/Cargo.toml b/CedarJavaFFI/Cargo.toml
@@ -31,9 +31,9 @@ crate_type = ["cdylib"]
 [dependencies.cedar-policy]
 version = "4.0.0"
 git = "https://github.com/cedar-policy/cedar"
-branch = "main"
+branch = "release/4.0.x"
 
 [dependencies.cedar-policy-formatter]
 version = "4.0.0"
 git = "https://github.com/cedar-policy/cedar"
-branch = "main"
+branch = "release/4.0.x"