diff options
| author | Bogdan Drutu <bdrutu@google.com> | 2017-02-20 07:47:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-20 07:47:15 +0100 |
| commit | dc181507017f3cbceb6e7c34527096d8af799823 (patch) | |
| tree | 44707613d20cb673a9feafe9f977c899026f91c9 | |
| parent | ab034510e5266942cc532a1d192e653e3b78deca (diff) | |
| parent | 4e1f6ff3c26b6278efbcf2c7ea923c3f5bf872c5 (diff) | |
| download | platform_external_opencensus-java-dc181507017f3cbceb6e7c34527096d8af799823.tar.gz platform_external_opencensus-java-dc181507017f3cbceb6e7c34527096d8af799823.tar.bz2 platform_external_opencensus-java-dc181507017f3cbceb6e7c34527096d8af799823.zip | |
Merge pull request #100 from bogdandrutu/maven
Move core_impl to the equivalent maven path.
| -rw-r--r-- | BUILD | 2 | ||||
| -rw-r--r-- | core_impl/pom.xml | 1 | ||||
| -rw-r--r-- | core_impl/src/main/java/com/google/instrumentation/stats/StatsContextFactoryImpl.java (renamed from core_impl/java/com/google/instrumentation/stats/StatsContextFactoryImpl.java) | 0 | ||||
| -rw-r--r-- | core_impl/src/main/java/com/google/instrumentation/stats/StatsContextImpl.java (renamed from core_impl/java/com/google/instrumentation/stats/StatsContextImpl.java) | 0 | ||||
| -rw-r--r-- | core_impl/src/main/java/com/google/instrumentation/stats/StatsCurrentContext.java (renamed from core_impl/java/com/google/instrumentation/stats/StatsCurrentContext.java) | 0 | ||||
| -rw-r--r-- | core_impl/src/main/java/com/google/instrumentation/stats/StatsSerializer.java (renamed from core_impl/java/com/google/instrumentation/stats/StatsSerializer.java) | 0 |
6 files changed, 1 insertions, 2 deletions
@@ -34,7 +34,7 @@ java_library( java_library( name = "stats-core_impl", - srcs = glob(["core_impl/java/com/google/instrumentation/stats/*.java"]), + srcs = glob(["core_impl/src/main/java/com/google/instrumentation/stats/*.java"]), deps = [ ":shared", ":stats-core", diff --git a/core_impl/pom.xml b/core_impl/pom.xml index 76071b8d..9c66396e 100644 --- a/core_impl/pom.xml +++ b/core_impl/pom.xml @@ -38,7 +38,6 @@ </dependency> </dependencies> <build> - <sourceDirectory>java</sourceDirectory> <plugins> <plugin> <artifactId>maven-compiler-plugin</artifactId> diff --git a/core_impl/java/com/google/instrumentation/stats/StatsContextFactoryImpl.java b/core_impl/src/main/java/com/google/instrumentation/stats/StatsContextFactoryImpl.java index f888b997..f888b997 100644 --- a/core_impl/java/com/google/instrumentation/stats/StatsContextFactoryImpl.java +++ b/core_impl/src/main/java/com/google/instrumentation/stats/StatsContextFactoryImpl.java diff --git a/core_impl/java/com/google/instrumentation/stats/StatsContextImpl.java b/core_impl/src/main/java/com/google/instrumentation/stats/StatsContextImpl.java index af7d94fc..af7d94fc 100644 --- a/core_impl/java/com/google/instrumentation/stats/StatsContextImpl.java +++ b/core_impl/src/main/java/com/google/instrumentation/stats/StatsContextImpl.java diff --git a/core_impl/java/com/google/instrumentation/stats/StatsCurrentContext.java b/core_impl/src/main/java/com/google/instrumentation/stats/StatsCurrentContext.java index 53b138b2..53b138b2 100644 --- a/core_impl/java/com/google/instrumentation/stats/StatsCurrentContext.java +++ b/core_impl/src/main/java/com/google/instrumentation/stats/StatsCurrentContext.java diff --git a/core_impl/java/com/google/instrumentation/stats/StatsSerializer.java b/core_impl/src/main/java/com/google/instrumentation/stats/StatsSerializer.java index 62c4ca66..62c4ca66 100644 --- a/core_impl/java/com/google/instrumentation/stats/StatsSerializer.java +++ b/core_impl/src/main/java/com/google/instrumentation/stats/StatsSerializer.java |