Skip to content

Commit

Permalink
Extract reporters as separate artifacts
Browse files Browse the repository at this point in the history
  • Loading branch information
shlomisut committed Apr 19, 2015
1 parent 31f1032 commit 82da9f7
Show file tree
Hide file tree
Showing 55 changed files with 246 additions and 380 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ target
bin
.*
repl-port
*.iml
27 changes: 27 additions & 0 deletions metrics2-riemann-reporter/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<modelVersion>4.0.0</modelVersion>
<artifactId>metrics2-riemann-reporter</artifactId>
<parent>
<artifactId>riemann-java-parent</artifactId>
<groupId>com.aphyr</groupId>
<version>0.4.0</version>
</parent>


<dependencies>
<dependency>
<groupId>com.yammer.metrics</groupId>
<artifactId>metrics-core</artifactId>
<version>2.1.2</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>riemann-java-client</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>
26 changes: 26 additions & 0 deletions metrics3-riemann-reporter/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<modelVersion>4.0.0</modelVersion>
<artifactId>metrics3-riemann-reporter</artifactId>
<parent>
<artifactId>riemann-java-parent</artifactId>
<groupId>com.aphyr</groupId>
<version>0.4.0</version>
</parent>

<dependencies>
<dependency>
<groupId>com.codahale.metrics</groupId>
<artifactId>metrics-core</artifactId>
<version>3.0.1</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>riemann-java-client</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>
288 changes: 120 additions & 168 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,180 +1,132 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.aphyr</groupId>
<artifactId>riemann-java-client</artifactId>
<version>0.3.1</version>
<packaging>bundle</packaging>
<name>Riemann Java Client</name>
<description>Java client for http://aphyr.github.com/riemann/</description>
<url>/</url>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.aphyr</groupId>
<artifactId>riemann-java-parent</artifactId>
<version>0.4.0</version>
<modules>
<module>riemann-java-client</module>
<module>metrics2-riemann-reporter</module>
<module>metrics3-riemann-reporter</module>
</modules>
<packaging>pom</packaging>
<name>Riemann Java Client</name>
<description>Java client for http://aphyr.github.com/riemann/</description>
<url>/</url>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>

<dependencies>
<dependency>
<groupId>org.codehaus.jsr166-mirror</groupId>
<artifactId>jsr166y</artifactId>
<version>1.7.0</version>
<scope>provided</scope>
</dependency>
<dependencies>
<!-- TEST DEP's -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit-dep</artifactId>
<version>4.10</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>2.5.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.9.5</version>
<scope>test</scope>
</dependency>
</dependencies>

<dependency>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
<version>3.6.1.Final</version>
</dependency>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>

<dependency>
<groupId>com.yammer.metrics</groupId>
<artifactId>metrics-core</artifactId>
<version>2.1.2</version>
</dependency>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.5</version>
<executions>
<execution>
<id>add-source</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>target/generated-sources</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>

<dependency>
<groupId>com.codahale.metrics</groupId>
<artifactId>metrics-core</artifactId>
<version>3.0.1</version>
</dependency>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>

<!-- TEST DEP's -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit-dep</artifactId>
<version>4.10</version>
<scope>test</scope>
</dependency>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.9.5</version>
<scope>test</scope>
</dependency>
</dependencies>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
<Export-Package>
com.aphyr.riemann;-noimport:=true,
com.aphyr.riemann.client;-noimport:=true,
com.codahale.metrics.riemann;-noimport:=true,
com.yammer.metrics.reporting;-noimport:=true
</Export-Package>
<Import-Package>
com.codahale.metrics;version="[3.0,4)";resolution:="optional",
com.yammer.metrics;resolution:="optional",
com.yammer.metrics.core;resolution:="optional",
com.yammer.metrics.stats;resolution:="optional",
*
</Import-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.5</version>
<executions>
<execution>
<id>add-source</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>target/generated-sources</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>generate-sources</id>
<phase>generate-sources</phase>
<configuration>
<tasks>
<mkdir dir="target/generated-sources"/>
<exec executable="protoc">
<arg value="--java_out=target/generated-sources"/>
<arg value="src/main/proto/riemann/proto.proto"/>
</exec>
</tasks>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
<Export-Package>
com.aphyr.riemann;-noimport:=true,
com.aphyr.riemann.client;-noimport:=true,
com.codahale.metrics.riemann;-noimport:=true,
com.yammer.metrics.reporting;-noimport:=true
</Export-Package>
<Import-Package>
com.codahale.metrics;version="[3.0,4)";resolution:="optional",
com.yammer.metrics;resolution:="optional",
com.yammer.metrics.core;resolution:="optional",
com.yammer.metrics.stats;resolution:="optional",
*
</Import-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>

<distributionManagement>
<repository>
<id>clojars</id>
<name>Clojars</name>
<url>https://clojars.org/repo</url>
</repository>
</distributionManagement>
<distributionManagement>
<repository>
<id>clojars</id>
<name>Clojars</name>
<url>https://clojars.org/repo</url>
</repository>
</distributionManagement>
</project>
28 changes: 0 additions & 28 deletions riemann-java-client.iml

This file was deleted.

Loading

0 comments on commit 82da9f7

Please sign in to comment.