Skip to content

Commit d7aebd5

Browse files
committed
MXTS-74974: address PR review feedback (artifact-registry plugin 2.2.5, commit lockfile, explicit sourcesJar/javadocJar ordering)
1 parent cadded2 commit d7aebd5

3 files changed

Lines changed: 28 additions & 10 deletions

File tree

microdocs-crawler-gradle/build.gradle

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,19 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
5454
from 'build/docs/javadoc'
5555
}
5656

57-
// sourcesJar is created automatically by withSourcesJar() below (via the
58-
// com.maxxton.convention plugin's PublishingConfiguration, which calls it
59-
// as soon as maven-publish is applied).
57+
// Registers the sourcesJar task (withJavadocJar() just attaches the
58+
// existing javadocJar task above). Declared before the artifacts{} block
59+
// below so both tasks are guaranteed to exist by the time it references
60+
// them, rather than relying on the com.maxxton.convention plugin having
61+
// already created sourcesJar earlier via PublishingConfiguration.
62+
java {
63+
withJavadocJar()
64+
withSourcesJar()
65+
}
6066

6167
artifacts {
6268
archives fatJar
6369

6470
archives javadocJar
6571
archives sourcesJar
6672
}
67-
68-
java {
69-
withJavadocJar()
70-
withSourcesJar()
71-
}
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# This is a Gradle generated file for dependency locking.
2+
# Manual edits can break the build and are not advised.
3+
# This file is expected to be part of source control.
4+
com.fasterxml.jackson.core:jackson-annotations:2.10.1=compileClasspath,integrationTestCompileClasspath,integrationTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
5+
com.fasterxml.jackson.core:jackson-core:2.10.1=compileClasspath,integrationTestCompileClasspath,integrationTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
6+
com.fasterxml.jackson.core:jackson-databind:2.10.1=compileClasspath,integrationTestCompileClasspath,integrationTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
7+
com.mashape.unirest:unirest-java:1.4.9=compileClasspath,integrationTestCompileClasspath,integrationTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
8+
com.maxxton:microdocs-core-java:3.0.0=compileClasspath,integrationTestCompileClasspath,integrationTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
9+
commons-codec:commons-codec:1.9=compileClasspath,integrationTestCompileClasspath,integrationTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
10+
commons-logging:commons-logging:1.2=compileClasspath,integrationTestCompileClasspath,integrationTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
11+
org.apache.httpcomponents:httpasyncclient:4.1.1=compileClasspath,integrationTestCompileClasspath,integrationTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
12+
org.apache.httpcomponents:httpclient:4.5.2=compileClasspath,integrationTestCompileClasspath,integrationTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
13+
org.apache.httpcomponents:httpcore-nio:4.4.4=compileClasspath,integrationTestCompileClasspath,integrationTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
14+
org.apache.httpcomponents:httpcore:4.4.4=compileClasspath,integrationTestCompileClasspath,integrationTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
15+
org.apache.httpcomponents:httpmime:4.5.2=compileClasspath,integrationTestCompileClasspath,integrationTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
16+
org.json:json:20160212=compileClasspath,integrationTestCompileClasspath,integrationTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
17+
empty=annotationProcessor,integrationTestAnnotationProcessor,testAnnotationProcessor

microdocs-crawler-gradle/settings.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pluginManagement {
77
gradlePluginPortal()
88
}
99
plugins {
10-
id("com.google.cloud.artifactregistry.gradle.plugin") version "2.2.0"
10+
id("com.google.cloud.artifactregistry.gradle.plugin") version "2.2.5"
1111
}
1212
}
1313

@@ -16,7 +16,7 @@ buildscript {
1616
gradlePluginPortal()
1717
}
1818
dependencies {
19-
classpath("com.google.cloud.artifactregistry.gradle-plugin:com.google.cloud.artifactregistry.gradle-plugin.gradle.plugin:2.2.0")
19+
classpath("com.google.cloud.artifactregistry.gradle-plugin:com.google.cloud.artifactregistry.gradle-plugin.gradle.plugin:2.2.5")
2020
}
2121
}
2222

0 commit comments

Comments
 (0)