Move core to the equivalent maven path.

44 files changed, 12 insertions, 1 deletions

diff --git a/core/pom.xml b/core/pom.xml
index 7402ef01..bc29d6f9 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -21,7 +21,6 @@
   </properties>
 
   <build>
-    <sourceDirectory>java</sourceDirectory>
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
@@ -30,6 +29,18 @@
           <source>1.6</source>
           <target>1.6</target>
         </configuration>
+        <executions>
+          <execution>
+            <id>default-testCompile</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>testCompile</goal>
+            </goals>
+            <configuration>
+              <skip>true</skip>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
diff --git a/core/java/com/google/instrumentation/common/Duration.java b/core/src/main/java/com/google/instrumentation/common/Duration.java
index 657575da..657575da 100644
--- a/core/java/com/google/instrumentation/common/Duration.java
+++ b/core/src/main/java/com/google/instrumentation/common/Duration.java
diff --git a/core/java/com/google/instrumentation/common/Function.java b/core/src/main/java/com/google/instrumentation/common/Function.java
index 16471a55..16471a55 100644
--- a/core/java/com/google/instrumentation/common/Function.java
+++ b/core/src/main/java/com/google/instrumentation/common/Function.java
diff --git a/core/java/com/google/instrumentation/common/NonThrowingCloseable.java b/core/src/main/java/com/google/instrumentation/common/NonThrowingCloseable.java
index 46ac71a5..46ac71a5 100644
--- a/core/java/com/google/instrumentation/common/NonThrowingCloseable.java
+++ b/core/src/main/java/com/google/instrumentation/common/NonThrowingCloseable.java
diff --git a/core/java/com/google/instrumentation/common/Provider.java b/core/src/main/java/com/google/instrumentation/common/Provider.java
index d32fbad9..d32fbad9 100644
--- a/core/java/com/google/instrumentation/common/Provider.java
+++ b/core/src/main/java/com/google/instrumentation/common/Provider.java
diff --git a/core/java/com/google/instrumentation/common/Timestamp.java b/core/src/main/java/com/google/instrumentation/common/Timestamp.java
index 6fad30f6..6fad30f6 100644
--- a/core/java/com/google/instrumentation/common/Timestamp.java
+++ b/core/src/main/java/com/google/instrumentation/common/Timestamp.java
diff --git a/core/java/com/google/instrumentation/common/TimestampFactory.java b/core/src/main/java/com/google/instrumentation/common/TimestampFactory.java
index 2ae9d4e3..2ae9d4e3 100644
--- a/core/java/com/google/instrumentation/common/TimestampFactory.java
+++ b/core/src/main/java/com/google/instrumentation/common/TimestampFactory.java
diff --git a/core/java/com/google/instrumentation/stats/DistributionAggregation.java b/core/src/main/java/com/google/instrumentation/stats/DistributionAggregation.java
index 47f19d5d..47f19d5d 100644
--- a/core/java/com/google/instrumentation/stats/DistributionAggregation.java
+++ b/core/src/main/java/com/google/instrumentation/stats/DistributionAggregation.java
diff --git a/core/java/com/google/instrumentation/stats/DistributionAggregationDescriptor.java b/core/src/main/java/com/google/instrumentation/stats/DistributionAggregationDescriptor.java
index 586124ad..586124ad 100644
--- a/core/java/com/google/instrumentation/stats/DistributionAggregationDescriptor.java
+++ b/core/src/main/java/com/google/instrumentation/stats/DistributionAggregationDescriptor.java
diff --git a/core/java/com/google/instrumentation/stats/IntervalAggregation.java b/core/src/main/java/com/google/instrumentation/stats/IntervalAggregation.java
index 9bd26923..9bd26923 100644
--- a/core/java/com/google/instrumentation/stats/IntervalAggregation.java
+++ b/core/src/main/java/com/google/instrumentation/stats/IntervalAggregation.java
diff --git a/core/java/com/google/instrumentation/stats/IntervalAggregationDescriptor.java b/core/src/main/java/com/google/instrumentation/stats/IntervalAggregationDescriptor.java
index b6c2dbe6..b6c2dbe6 100644
--- a/core/java/com/google/instrumentation/stats/IntervalAggregationDescriptor.java
+++ b/core/src/main/java/com/google/instrumentation/stats/IntervalAggregationDescriptor.java
diff --git a/core/java/com/google/instrumentation/stats/MeasurementDescriptor.java b/core/src/main/java/com/google/instrumentation/stats/MeasurementDescriptor.java
index d44c3637..d44c3637 100644
--- a/core/java/com/google/instrumentation/stats/MeasurementDescriptor.java
+++ b/core/src/main/java/com/google/instrumentation/stats/MeasurementDescriptor.java
diff --git a/core/java/com/google/instrumentation/stats/MeasurementMap.java b/core/src/main/java/com/google/instrumentation/stats/MeasurementMap.java
index 65a55aa6..65a55aa6 100644
--- a/core/java/com/google/instrumentation/stats/MeasurementMap.java
+++ b/core/src/main/java/com/google/instrumentation/stats/MeasurementMap.java
diff --git a/core/java/com/google/instrumentation/stats/MeasurementValue.java b/core/src/main/java/com/google/instrumentation/stats/MeasurementValue.java
index 3502b97b..3502b97b 100644
--- a/core/java/com/google/instrumentation/stats/MeasurementValue.java
+++ b/core/src/main/java/com/google/instrumentation/stats/MeasurementValue.java
diff --git a/core/java/com/google/instrumentation/stats/RpcConstants.java b/core/src/main/java/com/google/instrumentation/stats/RpcConstants.java
index b9e09586..b9e09586 100644
--- a/core/java/com/google/instrumentation/stats/RpcConstants.java
+++ b/core/src/main/java/com/google/instrumentation/stats/RpcConstants.java
diff --git a/core/java/com/google/instrumentation/stats/Stats.java b/core/src/main/java/com/google/instrumentation/stats/Stats.java
index e9313253..e9313253 100644
--- a/core/java/com/google/instrumentation/stats/Stats.java
+++ b/core/src/main/java/com/google/instrumentation/stats/Stats.java
diff --git a/core/java/com/google/instrumentation/stats/StatsContext.java b/core/src/main/java/com/google/instrumentation/stats/StatsContext.java
index 0a9f9674..0a9f9674 100644
--- a/core/java/com/google/instrumentation/stats/StatsContext.java
+++ b/core/src/main/java/com/google/instrumentation/stats/StatsContext.java
diff --git a/core/java/com/google/instrumentation/stats/StatsContextFactory.java b/core/src/main/java/com/google/instrumentation/stats/StatsContextFactory.java
index 581ca847..581ca847 100644
--- a/core/java/com/google/instrumentation/stats/StatsContextFactory.java
+++ b/core/src/main/java/com/google/instrumentation/stats/StatsContextFactory.java
diff --git a/core/java/com/google/instrumentation/stats/StatsManager.java b/core/src/main/java/com/google/instrumentation/stats/StatsManager.java
index 59253768..59253768 100644
--- a/core/java/com/google/instrumentation/stats/StatsManager.java
+++ b/core/src/main/java/com/google/instrumentation/stats/StatsManager.java
diff --git a/core/java/com/google/instrumentation/stats/StringUtil.java b/core/src/main/java/com/google/instrumentation/stats/StringUtil.java
index 180c2411..180c2411 100644
--- a/core/java/com/google/instrumentation/stats/StringUtil.java
+++ b/core/src/main/java/com/google/instrumentation/stats/StringUtil.java
diff --git a/core/java/com/google/instrumentation/stats/Tag.java b/core/src/main/java/com/google/instrumentation/stats/Tag.java
index 1bda1c85..1bda1c85 100644
--- a/core/java/com/google/instrumentation/stats/Tag.java
+++ b/core/src/main/java/com/google/instrumentation/stats/Tag.java
diff --git a/core/java/com/google/instrumentation/stats/TagKey.java b/core/src/main/java/com/google/instrumentation/stats/TagKey.java
index bce969e6..bce969e6 100644
--- a/core/java/com/google/instrumentation/stats/TagKey.java
+++ b/core/src/main/java/com/google/instrumentation/stats/TagKey.java
diff --git a/core/java/com/google/instrumentation/stats/TagValue.java b/core/src/main/java/com/google/instrumentation/stats/TagValue.java
index c12b184d..c12b184d 100644
--- a/core/java/com/google/instrumentation/stats/TagValue.java
+++ b/core/src/main/java/com/google/instrumentation/stats/TagValue.java
diff --git a/core/java/com/google/instrumentation/stats/View.java b/core/src/main/java/com/google/instrumentation/stats/View.java
index 90996960..90996960 100644
--- a/core/java/com/google/instrumentation/stats/View.java
+++ b/core/src/main/java/com/google/instrumentation/stats/View.java
diff --git a/core/java/com/google/instrumentation/stats/ViewDescriptor.java b/core/src/main/java/com/google/instrumentation/stats/ViewDescriptor.java
index ae2ccee4..ae2ccee4 100644
--- a/core/java/com/google/instrumentation/stats/ViewDescriptor.java
+++ b/core/src/main/java/com/google/instrumentation/stats/ViewDescriptor.java
diff --git a/core/javatests/com/google/instrumentation/common/DurationTest.java b/core/src/test/java/com/google/instrumentation/common/DurationTest.java
index 4ba9806c..4ba9806c 100644
--- a/core/javatests/com/google/instrumentation/common/DurationTest.java
+++ b/core/src/test/java/com/google/instrumentation/common/DurationTest.java
diff --git a/core/javatests/com/google/instrumentation/common/ProviderTest.java b/core/src/test/java/com/google/instrumentation/common/ProviderTest.java
index f125de25..f125de25 100644
--- a/core/javatests/com/google/instrumentation/common/ProviderTest.java
+++ b/core/src/test/java/com/google/instrumentation/common/ProviderTest.java
diff --git a/core/javatests/com/google/instrumentation/common/TimestampTest.java b/core/src/test/java/com/google/instrumentation/common/TimestampTest.java
index 1e994def..1e994def 100644
--- a/core/javatests/com/google/instrumentation/common/TimestampTest.java
+++ b/core/src/test/java/com/google/instrumentation/common/TimestampTest.java
diff --git a/core/javatests/com/google/instrumentation/stats/DistributionAggregationDescriptorTest.java b/core/src/test/java/com/google/instrumentation/stats/DistributionAggregationDescriptorTest.java
index abc57c5b..abc57c5b 100644
--- a/core/javatests/com/google/instrumentation/stats/DistributionAggregationDescriptorTest.java
+++ b/core/src/test/java/com/google/instrumentation/stats/DistributionAggregationDescriptorTest.java
diff --git a/core/javatests/com/google/instrumentation/stats/DistributionAggregationTest.java b/core/src/test/java/com/google/instrumentation/stats/DistributionAggregationTest.java
index 55e0e4e0..55e0e4e0 100644
--- a/core/javatests/com/google/instrumentation/stats/DistributionAggregationTest.java
+++ b/core/src/test/java/com/google/instrumentation/stats/DistributionAggregationTest.java
diff --git a/core/javatests/com/google/instrumentation/stats/IntervalAggregationDescriptorTest.java b/core/src/test/java/com/google/instrumentation/stats/IntervalAggregationDescriptorTest.java
index 3c8a5e45..3c8a5e45 100644
--- a/core/javatests/com/google/instrumentation/stats/IntervalAggregationDescriptorTest.java
+++ b/core/src/test/java/com/google/instrumentation/stats/IntervalAggregationDescriptorTest.java
diff --git a/core/javatests/com/google/instrumentation/stats/IntervalAggregationTest.java b/core/src/test/java/com/google/instrumentation/stats/IntervalAggregationTest.java
index a436ff0b..a436ff0b 100644
--- a/core/javatests/com/google/instrumentation/stats/IntervalAggregationTest.java
+++ b/core/src/test/java/com/google/instrumentation/stats/IntervalAggregationTest.java
diff --git a/core/javatests/com/google/instrumentation/stats/MeasurementDescriptorTest.java b/core/src/test/java/com/google/instrumentation/stats/MeasurementDescriptorTest.java
index 9fa16f37..9fa16f37 100644
--- a/core/javatests/com/google/instrumentation/stats/MeasurementDescriptorTest.java
+++ b/core/src/test/java/com/google/instrumentation/stats/MeasurementDescriptorTest.java
diff --git a/core/javatests/com/google/instrumentation/stats/MeasurementMapTest.java b/core/src/test/java/com/google/instrumentation/stats/MeasurementMapTest.java
index 068cdfc2..068cdfc2 100644
--- a/core/javatests/com/google/instrumentation/stats/MeasurementMapTest.java
+++ b/core/src/test/java/com/google/instrumentation/stats/MeasurementMapTest.java
diff --git a/core/javatests/com/google/instrumentation/stats/RpcConstantsTest.java b/core/src/test/java/com/google/instrumentation/stats/RpcConstantsTest.java
index 50ec1298..50ec1298 100644
--- a/core/javatests/com/google/instrumentation/stats/RpcConstantsTest.java
+++ b/core/src/test/java/com/google/instrumentation/stats/RpcConstantsTest.java
diff --git a/core/javatests/com/google/instrumentation/stats/StatsContextFactoryTest.java b/core/src/test/java/com/google/instrumentation/stats/StatsContextFactoryTest.java
index 12efa98f..12efa98f 100644
--- a/core/javatests/com/google/instrumentation/stats/StatsContextFactoryTest.java
+++ b/core/src/test/java/com/google/instrumentation/stats/StatsContextFactoryTest.java
diff --git a/core/javatests/com/google/instrumentation/stats/StatsContextTest.java b/core/src/test/java/com/google/instrumentation/stats/StatsContextTest.java
index 04531297..04531297 100644
--- a/core/javatests/com/google/instrumentation/stats/StatsContextTest.java
+++ b/core/src/test/java/com/google/instrumentation/stats/StatsContextTest.java
diff --git a/core/javatests/com/google/instrumentation/stats/StatsTest.java b/core/src/test/java/com/google/instrumentation/stats/StatsTest.java
index 2bbf5cef..2bbf5cef 100644
--- a/core/javatests/com/google/instrumentation/stats/StatsTest.java
+++ b/core/src/test/java/com/google/instrumentation/stats/StatsTest.java
diff --git a/core/javatests/com/google/instrumentation/stats/StringUtilTest.java b/core/src/test/java/com/google/instrumentation/stats/StringUtilTest.java
index 8d954098..8d954098 100644
--- a/core/javatests/com/google/instrumentation/stats/StringUtilTest.java
+++ b/core/src/test/java/com/google/instrumentation/stats/StringUtilTest.java
diff --git a/core/javatests/com/google/instrumentation/stats/TagKeyTest.java b/core/src/test/java/com/google/instrumentation/stats/TagKeyTest.java
index 36f469b8..36f469b8 100644
--- a/core/javatests/com/google/instrumentation/stats/TagKeyTest.java
+++ b/core/src/test/java/com/google/instrumentation/stats/TagKeyTest.java
diff --git a/core/javatests/com/google/instrumentation/stats/TagTest.java b/core/src/test/java/com/google/instrumentation/stats/TagTest.java
index 010b8a31..010b8a31 100644
--- a/core/javatests/com/google/instrumentation/stats/TagTest.java
+++ b/core/src/test/java/com/google/instrumentation/stats/TagTest.java
diff --git a/core/javatests/com/google/instrumentation/stats/TagValueTest.java b/core/src/test/java/com/google/instrumentation/stats/TagValueTest.java
index 63b98bf5..63b98bf5 100644
--- a/core/javatests/com/google/instrumentation/stats/TagValueTest.java
+++ b/core/src/test/java/com/google/instrumentation/stats/TagValueTest.java
diff --git a/core/javatests/com/google/instrumentation/stats/ViewDescriptorTest.java b/core/src/test/java/com/google/instrumentation/stats/ViewDescriptorTest.java
index f0781bf6..f0781bf6 100644
--- a/core/javatests/com/google/instrumentation/stats/ViewDescriptorTest.java
+++ b/core/src/test/java/com/google/instrumentation/stats/ViewDescriptorTest.java
diff --git a/core/javatests/com/google/instrumentation/stats/ViewTest.java b/core/src/test/java/com/google/instrumentation/stats/ViewTest.java
index 5a057918..5a057918 100644
--- a/core/javatests/com/google/instrumentation/stats/ViewTest.java
+++ b/core/src/test/java/com/google/instrumentation/stats/ViewTest.java