File tree 6 files changed +27
-38
lines changed
testing/agent-for-testing
6 files changed +27
-38
lines changed Original file line number Diff line number Diff line change 1
- addListener(object : BuildAdapter () {
2
- override fun projectsEvaluated (gradle : Gradle ) {
3
- gradle.rootProject {
4
- repositories {
5
- mavenLocal()
6
- removeIf { it.name == " sonatype" }
7
- }
8
- }
1
+ allprojects {
2
+ repositories {
3
+ mavenLocal()
4
+ removeIf { it.name == " sonatype" }
9
5
}
10
- })
6
+ }
Original file line number Diff line number Diff line change 48
48
- 11
49
49
- 15
50
50
vm :
51
- - hotspot
52
- - openj9
51
+ - hotspot
52
+ - openj9
53
53
fail-fast : false
54
54
steps :
55
55
@@ -192,12 +192,15 @@ jobs:
192
192
path : ~/.gradle/wrapper
193
193
key : ${{ runner.os }}-gradle-wrapper-cache-${{ hashFiles('examples/distro/gradle/wrapper/gradle-wrapper.properties') }}
194
194
195
+ - name : Local publish
196
+ run : ./gradlew publishToMavenLocal
197
+
195
198
- name : Build distro
196
- run : ./gradlew build
199
+ run : ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts
197
200
working-directory : examples/distro
198
201
199
202
- name : Build extension
200
- run : ./gradlew build
203
+ run : ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts
201
204
working-directory : examples/extension
202
205
203
206
snapshot :
Original file line number Diff line number Diff line change 54
54
- 11
55
55
- 15
56
56
vm :
57
- - hotspot
58
- - openj9
57
+ - hotspot
58
+ - openj9
59
59
fail-fast : false
60
60
steps :
61
61
@@ -233,12 +233,15 @@ jobs:
233
233
path : ~/.gradle/wrapper
234
234
key : ${{ runner.os }}-gradle-wrapper-cache-${{ hashFiles('examples/distro/gradle/wrapper/gradle-wrapper.properties') }}
235
235
236
+ - name : Local publish
237
+ run : ./gradlew publishToMavenLocal
238
+
236
239
- name : Build distro
237
- run : ./gradlew build
240
+ run : ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts
238
241
working-directory : examples/distro
239
242
240
243
- name : Build extension
241
- run : ./gradlew build
244
+ run : ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts
242
245
working-directory : examples/extension
243
246
244
247
accept-pr :
Original file line number Diff line number Diff line change @@ -8,10 +8,10 @@ subprojects {
8
8
9
9
ext {
10
10
versions = [
11
- opentelemetry : " 1.4.1 " ,
12
- opentelemetryAlpha : " 1.4.1 -alpha" ,
13
- opentelemetryJavaagent : " 1.5 .0-SNAPSHOT" ,
14
- opentelemetryJavaagentAlpha : " 1.5 .0-alpha-SNAPSHOT" ,
11
+ opentelemetry : " 1.5.0 " ,
12
+ opentelemetryAlpha : " 1.5.0 -alpha" ,
13
+ opentelemetryJavaagent : " 1.6 .0-SNAPSHOT" ,
14
+ opentelemetryJavaagentAlpha : " 1.6 .0-alpha-SNAPSHOT" ,
15
15
bytebuddy : " 1.10.18" ,
16
16
guava : " 30.1-jre"
17
17
]
Original file line number Diff line number Diff line change @@ -21,10 +21,10 @@ version '1.0'
21
21
22
22
ext {
23
23
versions = [
24
- opentelemetry : " 1.4.1 " ,
25
- opentelemetryAlpha : " 1.4.1 -alpha" ,
26
- opentelemetryJavaagent : " 1.5 .0-SNAPSHOT" ,
27
- opentelemetryJavaagentAlpha : " 1.5 .0-alpha-SNAPSHOT" ,
24
+ opentelemetry : " 1.5.0 " ,
25
+ opentelemetryAlpha : " 1.5.0 -alpha" ,
26
+ opentelemetryJavaagent : " 1.6 .0-SNAPSHOT" ,
27
+ opentelemetryJavaagentAlpha : " 1.6 .0-alpha-SNAPSHOT" ,
28
28
]
29
29
30
30
deps = [
Original file line number Diff line number Diff line change @@ -70,10 +70,6 @@ project(":instrumentation").subprojects {
70
70
}
71
71
72
72
tasks {
73
- jar {
74
- enabled = false
75
- }
76
-
77
73
val relocateJavaagentLibs by registering(ShadowJar ::class ) {
78
74
configurations = listOf (javaagentLibs)
79
75
@@ -116,15 +112,6 @@ tasks {
116
112
jvmArgs(" -javaagent:${shadowJar.get().archiveFile.get().asFile.absolutePath} " )
117
113
}
118
114
}
119
-
120
- // Because shadow does not use default configurations
121
- publishing {
122
- publications {
123
- named<MavenPublication >(" maven" ) {
124
- project.shadow.component(this )
125
- }
126
- }
127
- }
128
115
}
129
116
130
117
fun CopySpec.isolateClasses (jars : Iterable <File >) {
You can’t perform that action at this time.
0 commit comments