Merge context_prop into context artifact. (#1928)

all/build.gradle

@@ -8,7 +8,6 @@ ext.moduleName = "io.opentelemetry.all"
 def subprojects = [
         project(':opentelemetry-api'),
         project(':opentelemetry-context'),
-        project(':opentelemetry-context-prop'),
         project(':opentelemetry-extension-runtime-metrics'),
         project(':opentelemetry-extension-trace-propagators'),
         project(':opentelemetry-extension-trace-utils'),

api/build.gradle

@@ -10,7 +10,7 @@ description = 'OpenTelemetry API'
 ext.moduleName = "io.opentelemetry.api"
 
 dependencies {
-    api project(':opentelemetry-context-prop')
+    api project(':opentelemetry-context')
 
     annotationProcessor libraries.auto_value
 

context_prop/README.md

@@ -1,8 +0,0 @@
-# OpenTelemetry Context Propagation
-
-[![Javadocs][javadoc-image]][javadoc-url]
-
-* Java 8 compatible.
-
-[javadoc-image]: https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-context-prop.svg
-[javadoc-url]: https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-context-prop

context_prop/build.gradle

@@ -1,19 +0,0 @@
-plugins {
-    id "java"
-    id "maven-publish"
-
-    id "ru.vyarus.animalsniffer"
-}
-
-description = 'OpenTelemetry Context Propagation'
-ext.moduleName = "io.opentelemetry.context.propagation"
-
-dependencies {
-    api project(':opentelemetry-context')
-
-    signature "net.sf.androidscents.signature:android-api-level-24:7.0_r2@signature"
-}
-
-javadoc {
-    exclude 'io/opentelemetry/internal/**'
-}

settings.gradle

@@ -24,7 +24,6 @@ rootProject.name = "opentelemetry-java"
 include ":opentelemetry-all",
         ":opentelemetry-api",
         ":opentelemetry-context",
-        ":opentelemetry-context-prop",
         ":opentelemetry-extension-auto-annotations",
         ":opentelemetry-extension-runtime-metrics",
         ":opentelemetry-extension-trace-propagators",