zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-06-24 05:11:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix overrides of plugin repository (take 2 of []

Browse source 
The correct way to override the plugins repo is through the pluginManagement
section in the gradle settings file.  Also make use of the gradle.properties
file to initialize repositoryUrl and also publishUrl so we don't have to mess
around with finding and assigning them in the main gradle file.

The lock files are also updated.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=233810854
This commit is contained in:
jianglai 2019-02-13 12:51:25 -08:00
parent 4f9bce1686
commit f677373a54
25 changed files with 69 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

22
gradle/build.gradle
View file

@ -1,18 +1,4 @@
buildscript {
ext.repositoryUrl = project.findProperty('repositoryUrl')
ext.publishUrl = project.findProperty('publishUrl')
repositories {
if (repositoryUrl == null) {
println "Using Maven central..."
mavenCentral()
} else {
maven {
println "Using GCS Maven repo..."
url repositoryUrl
}
}
}
// Lock buildscript dependencies.
configurations.classpath {
resolutionStrategy.activateDependencyLocking()
@ -71,7 +57,7 @@ task stage {
}
if (publishUrl != null) {
if (publishUrl) {
publishing {
repositories {
maven {
@ -129,12 +115,12 @@ allprojects {
if (project.name == 'services') return
repositories {
if (rootProject.repositoryUrl == null) {
mavenCentral()
} else {
if (rootProject.repositoryUrl) {
maven {
url rootProject.repositoryUrl
}
} else {
mavenCentral()
}
}

2
gradle/gradle.properties Normal file
View file

@ -0,0 +1,2 @@
repositoryUrl=
publishUrl=

41
gradle/gradle/dependency-locks/buildscript-classpath.lockfile
View file

@ -1,40 +1,73 @@
# 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.
antlr:antlr:2.7.7
cglib:cglib-nodep:3.2.2
com.google.cloud.tools:appengine-gradle-plugin:1.3.3
com.google.cloud.tools:appengine-plugins-core:0.3.2
com.google.code.gson:gson:2.7
com.google.guava:guava:20.0
com.googlecode.javaewah:JavaEWAH:1.1.6
com.jcraft:jsch:0.1.54
com.jcraft:jzlib:1.1.1
com.moowork.gradle:gradle-node-plugin:1.2.0
com.moowork.node:com.moowork.node.gradle.plugin:1.2.0
com.netflix.nebula:gradle-lint-plugin:10.4.2
com.netflix.nebula:nebula-gradle-interop:1.0.2
com.netflix.nebula:nebula-gradle-interop:1.0.3
com.netflix.nebula:nebula-test:7.1.7
commons-codec:commons-codec:1.9
commons-io:commons-io:2.5
commons-lang:commons-lang:2.6
commons-logging:commons-logging:1.2
junit:junit:4.12
log4j:log4j:1.2.14
nebula.lint:nebula.lint.gradle.plugin:10.4.2
net.ltgt.apt:net.ltgt.apt.gradle.plugin:0.19
net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:0.6.1
net.ltgt.gradle:gradle-apt-plugin:0.19
net.ltgt.gradle:gradle-errorprone-plugin:0.6.1
org.apache.ant:ant-antlr:1.8.4
org.apache.ant:ant-junit:1.8.4
org.apache.ant:ant-launcher:1.8.4
org.apache.ant:ant:1.8.4
org.apache.commons:commons-lang3:3.8.1
org.apache.httpcomponents:httpclient:4.5.2
org.apache.httpcomponents:httpcore:4.4.4
org.apache.maven:maven-artifact:3.6.0
org.apache.maven:maven-builder-support:3.6.0
org.apache.maven:maven-model-builder:3.6.0
org.apache.maven:maven-model:3.6.0
org.codehaus.gpars:gpars:1.2.1
org.codehaus.groovy:groovy-all:2.4.9
org.codehaus.groovy:groovy-ant:2.1.8
org.codehaus.groovy:groovy-groovydoc:2.1.8
org.codehaus.groovy:groovy-templates:2.1.8
org.codehaus.groovy:groovy-xml:2.1.8
org.codehaus.groovy:groovy:2.1.8
org.codehaus.jsr166-mirror:jsr166y:1.7.0
org.codehaus.plexus:plexus-component-annotations:1.7.1
org.codehaus.plexus:plexus-interpolation:1.25
org.codehaus.plexus:plexus-utils:3.1.0
org.codenarc:CodeNarc:0.25.2
org.eclipse.jdt:core:3.1.1
org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-r
org.gmetrics:GMetrics:0.7
org.hamcrest:hamcrest-core:1.3
org.jetbrains.kotlin:kotlin-stdlib-common:1.3.0
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.0
org.jetbrains.kotlin:kotlin-stdlib:1.3.0
org.jetbrains.kotlin:kotlin-stdlib-common:1.3.11
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.11
org.jetbrains.kotlin:kotlin-stdlib:1.3.11
org.jetbrains:annotations:13.0
org.multiverse:multiverse-core:0.7.0
org.objenesis:objenesis:2.4
org.ow2.asm:asm-analysis:4.0
org.ow2.asm:asm-commons:4.0
org.ow2.asm:asm-tree:4.0
org.ow2.asm:asm-util:4.0
org.ow2.asm:asm:7.0
org.slf4j:slf4j-api:1.7.2
org.sonatype.aether:aether-api:1.13.1
org.sonatype.aether:aether-impl:1.13.1
org.sonatype.aether:aether-spi:1.13.1
org.sonatype.aether:aether-util:1.13.1
org.spockframework:spock-core:1.1-groovy-2.4-rc-4
org.yaml:snakeyaml:1.17

13
gradle/package-lock.json generated Normal file
View file

@ -0,0 +1,13 @@
{
"name": "nomulus",
"version": "1.0.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
"google-closure-library": {
"version": "20190121.0.0",
"resolved": "https://registry.npmjs.org/google-closure-library/-/google-closure-library-20190121.0.0.tgz",
"integrity": "sha512-HkgqoXznjlx375vAYYQDS4Tt+ErrBNZ4D+mSev/8Pd/HlvmADX0CFuiDjZ/mk3ku474kgDoxUwi87O+siENn7w=="
}
}
}

7
gradle/proxy/gradle/dependency-locks/dockerJava.lockfile
View file

@ -1,7 +0,0 @@
# 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.aries:docker-java-shaded:3.1.0-rc-5
javax.activation:activation:1.1.1
org.slf4j:slf4j-api:1.7.5
org.slf4j:slf4j-simple:1.7.5

13
gradle/settings.gradle
View file

@ -1,3 +1,16 @@
if (repositoryUrl) {
println "Using repository $repositoryUrl for plugins"
pluginManagement {
repositories {
maven {
url repositoryUrl
}
}
}
} else {
println "Using default repository for plugins"
}
rootProject.name = 'nomulus'
include 'core'

22
gradle/third_party/gradle/dependency-locks/annotationProcessor.lockfile vendored
View file

@ -1,22 +0,0 @@
# 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.github.kevinstern:software-and-algorithms:1.0
com.github.stephenc.jcip:jcip-annotations:1.0-1
com.google.auto:auto-common:0.10
com.google.code.findbugs:jFormatString:3.0.0
com.google.code.findbugs:jsr305:3.0.0
com.google.errorprone:error_prone_annotation:2.3.2
com.google.errorprone:error_prone_annotations:2.3.2
com.google.errorprone:error_prone_check_api:2.3.2
com.google.errorprone:error_prone_core:2.3.2
com.google.errorprone:error_prone_type_annotations:2.3.2
com.google.guava:guava:23.5-jre
com.google.j2objc:j2objc-annotations:1.1
com.google.protobuf:protobuf-java:3.4.0
com.googlecode.java-diff-utils:diffutils:1.3.0
org.checkerframework:checker-qual:2.5.3
org.checkerframework:dataflow:2.5.3
org.checkerframework:javacutil:2.5.3
org.codehaus.mojo:animal-sniffer-annotations:1.14
org.pcollections:pcollections:2.1.2

3
gradle/third_party/gradle/dependency-locks/apt.lockfile vendored
View file

@ -1,3 +0,0 @@
# 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.

3
gradle/third_party/gradle/dependency-locks/archives.lockfile vendored
View file

@ -1,3 +0,0 @@
# 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.

16
gradle/third_party/gradle/dependency-locks/checkstyle.lockfile vendored
View file

@ -1,16 +0,0 @@
# 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.
antlr:antlr:2.7.7
com.google.code.findbugs:jsr305:3.0.2
com.google.errorprone:error_prone_annotations:2.1.3
com.google.guava:guava:25.1-jre
com.google.j2objc:j2objc-annotations:1.1
com.puppycrawl.tools:checkstyle:8.12
commons-beanutils:commons-beanutils:1.9.3
commons-cli:commons-cli:1.4
commons-collections:commons-collections:3.2.2
net.sf.saxon:Saxon-HE:9.8.0-12
org.antlr:antlr4-runtime:4.7.1
org.checkerframework:checker-qual:2.0.0
org.codehaus.mojo:animal-sniffer-annotations:1.14

3
gradle/third_party/gradle/dependency-locks/compile.lockfile vendored
View file

@ -1,3 +0,0 @@
# 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.

3
gradle/third_party/gradle/dependency-locks/compileClasspath.lockfile vendored
View file

@ -1,3 +0,0 @@
# 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.

3
gradle/third_party/gradle/dependency-locks/compileOnly.lockfile vendored
View file

@ -1,3 +0,0 @@
# 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.

3
gradle/third_party/gradle/dependency-locks/default.lockfile vendored
View file

@ -1,3 +0,0 @@
# 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.

22
gradle/third_party/gradle/dependency-locks/errorprone.lockfile vendored
View file

@ -1,22 +0,0 @@
# 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.github.kevinstern:software-and-algorithms:1.0
com.github.stephenc.jcip:jcip-annotations:1.0-1
com.google.auto:auto-common:0.10
com.google.code.findbugs:jFormatString:3.0.0
com.google.code.findbugs:jsr305:3.0.0
com.google.errorprone:error_prone_annotation:2.3.2
com.google.errorprone:error_prone_annotations:2.3.2
com.google.errorprone:error_prone_check_api:2.3.2
com.google.errorprone:error_prone_core:2.3.2
com.google.errorprone:error_prone_type_annotations:2.3.2
com.google.guava:guava:23.5-jre
com.google.j2objc:j2objc-annotations:1.1
com.google.protobuf:protobuf-java:3.4.0
com.googlecode.java-diff-utils:diffutils:1.3.0
org.checkerframework:checker-qual:2.5.3
org.checkerframework:dataflow:2.5.3
org.checkerframework:javacutil:2.5.3
org.codehaus.mojo:animal-sniffer-annotations:1.14
org.pcollections:pcollections:2.1.2

4
gradle/third_party/gradle/dependency-locks/errorproneJavac.lockfile vendored
View file

@ -1,4 +0,0 @@
# 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.google.errorprone:javac:9+181-r4173-1

3
gradle/third_party/gradle/dependency-locks/runtime.lockfile vendored
View file

@ -1,3 +0,0 @@
# 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.

3
gradle/third_party/gradle/dependency-locks/runtimeClasspath.lockfile vendored
View file

@ -1,3 +0,0 @@
# 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.

22
gradle/third_party/gradle/dependency-locks/testAnnotationProcessor.lockfile vendored
View file

@ -1,22 +0,0 @@
# 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.github.kevinstern:software-and-algorithms:1.0
com.github.stephenc.jcip:jcip-annotations:1.0-1
com.google.auto:auto-common:0.10
com.google.code.findbugs:jFormatString:3.0.0
com.google.code.findbugs:jsr305:3.0.0
com.google.errorprone:error_prone_annotation:2.3.2
com.google.errorprone:error_prone_annotations:2.3.2
com.google.errorprone:error_prone_check_api:2.3.2
com.google.errorprone:error_prone_core:2.3.2
com.google.errorprone:error_prone_type_annotations:2.3.2
com.google.guava:guava:23.5-jre
com.google.j2objc:j2objc-annotations:1.1
com.google.protobuf:protobuf-java:3.4.0
com.googlecode.java-diff-utils:diffutils:1.3.0
org.checkerframework:checker-qual:2.5.3
org.checkerframework:dataflow:2.5.3
org.checkerframework:javacutil:2.5.3
org.codehaus.mojo:animal-sniffer-annotations:1.14
org.pcollections:pcollections:2.1.2

3
gradle/third_party/gradle/dependency-locks/testApt.lockfile vendored
View file

@ -1,3 +0,0 @@
# 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.

3
gradle/third_party/gradle/dependency-locks/testCompile.lockfile vendored
View file

@ -1,3 +0,0 @@
# 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.

3
gradle/third_party/gradle/dependency-locks/testCompileClasspath.lockfile vendored
View file

@ -1,3 +0,0 @@
# 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.

3
gradle/third_party/gradle/dependency-locks/testCompileOnly.lockfile vendored
View file

@ -1,3 +0,0 @@
# 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.

3
gradle/third_party/gradle/dependency-locks/testRuntime.lockfile vendored
View file

@ -1,3 +0,0 @@
# 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.

3
gradle/third_party/gradle/dependency-locks/testRuntimeClasspath.lockfile vendored
View file

@ -1,3 +0,0 @@
# 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.