Merge pull request #22 from DataDog/tyler/circle-ci

Add circleci config file

.cirleci/config.yml

@@ -0,0 +1,34 @@
+version: 2
+jobs:
+  build:
+
+    working_directory: ~/dd-trace-java
+
+    docker:
+      - image: circleci/openjdk:8-jdk
+
+    steps:
+
+      - checkout
+
+      - restore_cache:
+          key: 'dd-trace-java-{{ checksum "pom.xml" }}-{{ checksum "dd-java-agent/pom.xml" }}-{{ checksum "dd-trace/pom.xml" }}'
+
+      - run: mvn -q install -DskipTests dependency:go-offline
+
+      - save_cache:
+          paths:
+            - ~/.m2
+          key: 'dd-trace-java-{{ checksum "pom.xml" }}-{{ checksum "dd-java-agent/pom.xml" }}-{{ checksum "dd-trace/pom.xml" }}'
+
+      - run: mvn package
+
+      - store_test_results:
+          path: dd-java-agent/target/surefire-reports
+      - store_test_results:
+          path: dd-java-agent-ittests/target/surefire-reports
+      - store_test_results:
+          path: dd-trace/target/surefire-reports
+
+      - store_artifacts:
+          path: dd-java-agent/target/dd-java-agent.jar

circle.yml

@@ -0,0 +1,19 @@
+
+machine:
+  java:
+    version: openjdk8
+
+dependencies:
+  override:
+    - mvn --fail-never -q dependency:go-offline || true
+
+dependencies:
+  override:
+    - mvn -q -DskipTests clean install dependency:resolve-plugins dependency:go-offline
+
+test:
+  override:
+    - mvn test
+  post:
+    - mkdir -p $CIRCLE_TEST_REPORTS/junit/
+    - find . -type f -regex ".*/target/surefire-reports/.*xml" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \;

dd-java-agent-ittests/pom.xml

@@ -8,10 +8,10 @@
     </parent>
 
     <artifactId>dd-java-agent-ittests</artifactId>
-    <packaging>jar</packaging>
     <name>dd-java-agent-ittests</name>
     <description>Datadog Java Agent integration tests</description>
     <url>https://github.com/datadog/dd-trace-java</url>
+    <packaging>pom</packaging>
 
 
     <properties>

dd-java-agent/pom.xml

@@ -8,10 +8,10 @@
     </parent>
 
     <artifactId>dd-java-agent</artifactId>
-    <packaging>jar</packaging>
     <name>dd-java-agent</name>
     <description>Datadog Java Agent for tracing</description>
     <url>https://github.com/datadog/dd-trace-java</url>
+    <packaging>jar</packaging>
 
 
     <properties>

dd-trace-annotations/pom.xml

@@ -6,11 +6,11 @@
     <artifactId>dd-trace-java</artifactId>
     <version>0.1.2-SNAPSHOT</version>
   </parent>
-  <groupId>com.datadoghq</groupId>
   <artifactId>dd-trace-annotations</artifactId>
   <version>0.1.2-SNAPSHOT</version>
   <name>dd-trace-annotations</name>
-  <url>http://maven.apache.org</url>
+  <url>https://github.com/datadog/dd-trace-java</url>
+  <packaging>jar</packaging>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>

dd-trace/pom.xml

@@ -9,10 +9,10 @@
     </parent>
 
     <artifactId>dd-trace</artifactId>
-    <packaging>jar</packaging>
     <name>dd-trace</name>
     <description>Datadog core library</description>
     <url>https://github.com/datadog/dd-trace-java</url>
+    <packaging>jar</packaging>
 
     <dependencies>
 
@@ -121,10 +121,10 @@
                                     <pattern>com.fasterxml</pattern>
                                     <shadedPattern>dd.com.fasterxml</shadedPattern>
                                 </relocation>
-                                <relocation>
-                                    <pattern>com.google</pattern>
-                                    <shadedPattern>dd.com.google</shadedPattern>
-                                </relocation>
+                                <!--<relocation>-->
+                                    <!--<pattern>com.google</pattern>-->
+                                    <!--<shadedPattern>dd.com.google</shadedPattern>-->
+                                <!--</relocation>-->
                                 <relocation>
                                     <pattern>org.yaml</pattern>
                                     <shadedPattern>dd.org.yaml</shadedPattern>