From 33d9d25e1b0950f6a4b0f7491fa98e308fa30a63 Mon Sep 17 00:00:00 2001 From: Roberto Perez Alcolea Date: Tue, 10 Mar 2020 17:04:30 -0700 Subject: [PATCH] Use latest hollow always and introduce dependency locks --- build.gradle | 15 ++++++++- gradle/dependencies.gradle | 31 ------------------- .../annotationProcessor.lockfile | 3 ++ gradle/dependency-locks/archives.lockfile | 3 ++ .../compileClasspath.lockfile | 4 +++ gradle/dependency-locks/default.lockfile | 4 +++ .../integTestAnnotationProcessor.lockfile | 3 ++ .../integTestCompileClasspath.lockfile | 12 +++++++ .../integTestRuntimeClasspath.lockfile | 12 +++++++ gradle/dependency-locks/jacocoAgent.lockfile | 4 +++ gradle/dependency-locks/jacocoAnt.lockfile | 11 +++++++ .../runtimeClasspath.lockfile | 4 +++ .../testAnnotationProcessor.lockfile | 3 ++ .../testCompileClasspath.lockfile | 12 +++++++ .../testRuntimeClasspath.lockfile | 12 +++++++ 15 files changed, 101 insertions(+), 32 deletions(-) delete mode 100644 gradle/dependencies.gradle create mode 100644 gradle/dependency-locks/annotationProcessor.lockfile create mode 100644 gradle/dependency-locks/archives.lockfile create mode 100644 gradle/dependency-locks/compileClasspath.lockfile create mode 100644 gradle/dependency-locks/default.lockfile create mode 100644 gradle/dependency-locks/integTestAnnotationProcessor.lockfile create mode 100644 gradle/dependency-locks/integTestCompileClasspath.lockfile create mode 100644 gradle/dependency-locks/integTestRuntimeClasspath.lockfile create mode 100644 gradle/dependency-locks/jacocoAgent.lockfile create mode 100644 gradle/dependency-locks/jacocoAnt.lockfile create mode 100644 gradle/dependency-locks/runtimeClasspath.lockfile create mode 100644 gradle/dependency-locks/testAnnotationProcessor.lockfile create mode 100644 gradle/dependency-locks/testCompileClasspath.lockfile create mode 100644 gradle/dependency-locks/testRuntimeClasspath.lockfile diff --git a/build.gradle b/build.gradle index 57965a9..7223793 100644 --- a/build.gradle +++ b/build.gradle @@ -34,7 +34,20 @@ contacts { sourceCompatibility = 1.8 targetCompatibility = 1.8 -apply from: 'gradle/dependencies.gradle' + +repositories { + jcenter() +} + +dependencies { + implementation gradleApi() + implementation localGroovy() + implementation "com.netflix.hollow:hollow:latest.release" +} + +dependencyLocking { + lockAllConfigurations() +} pluginBundle { plugins { diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle deleted file mode 100644 index dcfcd8e..0000000 --- a/gradle/dependencies.gradle +++ /dev/null @@ -1,31 +0,0 @@ -/** - * Copyright 2017 Netflix, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -repositories { - jcenter() -} - -ext { - hollowVersion = '3.2.0' -} - -dependencies { - compile gradleApi() - compile localGroovy() - compile "com.netflix.hollow:hollow:${hollowVersion}" -} - -// Dependency locks are not needed for this project -ext.set("dependencyLock.ignore", "true") diff --git a/gradle/dependency-locks/annotationProcessor.lockfile b/gradle/dependency-locks/annotationProcessor.lockfile new file mode 100644 index 0000000..656c5db --- /dev/null +++ b/gradle/dependency-locks/annotationProcessor.lockfile @@ -0,0 +1,3 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. diff --git a/gradle/dependency-locks/archives.lockfile b/gradle/dependency-locks/archives.lockfile new file mode 100644 index 0000000..656c5db --- /dev/null +++ b/gradle/dependency-locks/archives.lockfile @@ -0,0 +1,3 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. diff --git a/gradle/dependency-locks/compileClasspath.lockfile b/gradle/dependency-locks/compileClasspath.lockfile new file mode 100644 index 0000000..43ca2e1 --- /dev/null +++ b/gradle/dependency-locks/compileClasspath.lockfile @@ -0,0 +1,4 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. +com.netflix.hollow:hollow:4.8.2 diff --git a/gradle/dependency-locks/default.lockfile b/gradle/dependency-locks/default.lockfile new file mode 100644 index 0000000..43ca2e1 --- /dev/null +++ b/gradle/dependency-locks/default.lockfile @@ -0,0 +1,4 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. +com.netflix.hollow:hollow:4.8.2 diff --git a/gradle/dependency-locks/integTestAnnotationProcessor.lockfile b/gradle/dependency-locks/integTestAnnotationProcessor.lockfile new file mode 100644 index 0000000..656c5db --- /dev/null +++ b/gradle/dependency-locks/integTestAnnotationProcessor.lockfile @@ -0,0 +1,3 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. diff --git a/gradle/dependency-locks/integTestCompileClasspath.lockfile b/gradle/dependency-locks/integTestCompileClasspath.lockfile new file mode 100644 index 0000000..164f304 --- /dev/null +++ b/gradle/dependency-locks/integTestCompileClasspath.lockfile @@ -0,0 +1,12 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. +cglib:cglib-nodep:3.2.2 +com.google.guava:guava:19.0 +com.netflix.hollow:hollow:4.8.2 +com.netflix.nebula:nebula-test:7.8.5 +commons-io:commons-io:2.5 +junit:junit:4.12 +org.hamcrest:hamcrest-core:1.3 +org.objenesis:objenesis:2.4 +org.spockframework:spock-core:1.3-groovy-2.4 diff --git a/gradle/dependency-locks/integTestRuntimeClasspath.lockfile b/gradle/dependency-locks/integTestRuntimeClasspath.lockfile new file mode 100644 index 0000000..164f304 --- /dev/null +++ b/gradle/dependency-locks/integTestRuntimeClasspath.lockfile @@ -0,0 +1,12 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. +cglib:cglib-nodep:3.2.2 +com.google.guava:guava:19.0 +com.netflix.hollow:hollow:4.8.2 +com.netflix.nebula:nebula-test:7.8.5 +commons-io:commons-io:2.5 +junit:junit:4.12 +org.hamcrest:hamcrest-core:1.3 +org.objenesis:objenesis:2.4 +org.spockframework:spock-core:1.3-groovy-2.4 diff --git a/gradle/dependency-locks/jacocoAgent.lockfile b/gradle/dependency-locks/jacocoAgent.lockfile new file mode 100644 index 0000000..6b7fa31 --- /dev/null +++ b/gradle/dependency-locks/jacocoAgent.lockfile @@ -0,0 +1,4 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. +org.jacoco:org.jacoco.agent:0.8.5 diff --git a/gradle/dependency-locks/jacocoAnt.lockfile b/gradle/dependency-locks/jacocoAnt.lockfile new file mode 100644 index 0000000..40e2c29 --- /dev/null +++ b/gradle/dependency-locks/jacocoAnt.lockfile @@ -0,0 +1,11 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. +org.jacoco:org.jacoco.agent:0.8.5 +org.jacoco:org.jacoco.ant:0.8.5 +org.jacoco:org.jacoco.core:0.8.5 +org.jacoco:org.jacoco.report:0.8.5 +org.ow2.asm:asm-analysis:7.2 +org.ow2.asm:asm-commons:7.2 +org.ow2.asm:asm-tree:7.2 +org.ow2.asm:asm:7.2 diff --git a/gradle/dependency-locks/runtimeClasspath.lockfile b/gradle/dependency-locks/runtimeClasspath.lockfile new file mode 100644 index 0000000..43ca2e1 --- /dev/null +++ b/gradle/dependency-locks/runtimeClasspath.lockfile @@ -0,0 +1,4 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. +com.netflix.hollow:hollow:4.8.2 diff --git a/gradle/dependency-locks/testAnnotationProcessor.lockfile b/gradle/dependency-locks/testAnnotationProcessor.lockfile new file mode 100644 index 0000000..656c5db --- /dev/null +++ b/gradle/dependency-locks/testAnnotationProcessor.lockfile @@ -0,0 +1,3 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. diff --git a/gradle/dependency-locks/testCompileClasspath.lockfile b/gradle/dependency-locks/testCompileClasspath.lockfile new file mode 100644 index 0000000..164f304 --- /dev/null +++ b/gradle/dependency-locks/testCompileClasspath.lockfile @@ -0,0 +1,12 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. +cglib:cglib-nodep:3.2.2 +com.google.guava:guava:19.0 +com.netflix.hollow:hollow:4.8.2 +com.netflix.nebula:nebula-test:7.8.5 +commons-io:commons-io:2.5 +junit:junit:4.12 +org.hamcrest:hamcrest-core:1.3 +org.objenesis:objenesis:2.4 +org.spockframework:spock-core:1.3-groovy-2.4 diff --git a/gradle/dependency-locks/testRuntimeClasspath.lockfile b/gradle/dependency-locks/testRuntimeClasspath.lockfile new file mode 100644 index 0000000..164f304 --- /dev/null +++ b/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -0,0 +1,12 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. +cglib:cglib-nodep:3.2.2 +com.google.guava:guava:19.0 +com.netflix.hollow:hollow:4.8.2 +com.netflix.nebula:nebula-test:7.8.5 +commons-io:commons-io:2.5 +junit:junit:4.12 +org.hamcrest:hamcrest-core:1.3 +org.objenesis:objenesis:2.4 +org.spockframework:spock-core:1.3-groovy-2.4