From 0dc4760f8ffe850ff935e887a8219909e3d6f96a Mon Sep 17 00:00:00 2001
From: Nikita Salnikov-Tarnovski <gnikem@gmail.com>
Date: Tue, 17 Nov 2020 17:25:43 +0200
Subject: [PATCH] Generate opentelemetry-javaagent "-all" artifact during
 "assemble" (#1645)

* Generate opentelemetry-javaagent "-all" artifact during "assemble"

* Update javaagent/javaagent.gradle

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>

* Update CONTRIBUTING.md

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
---
 CONTRIBUTING.md            | 6 ------
 javaagent/javaagent.gradle | 2 ++
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b9b5396d75..06c7a80142 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -30,12 +30,6 @@ java -version
 ./gradlew assemble
 ```
 
-and then generate the -all artifact
-
-```bash
-./gradlew :javaagent:shadowJar
-```
-
 and then you can find the java agent artifact at
 
 `javaagent/build/lib/opentelemetry-javaagent-<version>-all.jar`.
diff --git a/javaagent/javaagent.gradle b/javaagent/javaagent.gradle
index 8e5a09a3bf..1b02daf0d4 100644
--- a/javaagent/javaagent.gradle
+++ b/javaagent/javaagent.gradle
@@ -123,3 +123,5 @@ tasks.withType(Test).configureEach {
 
   dependsOn shadowJar
 }
+assemble.dependsOn lightShadow
+assemble.dependsOn shadowJar