Use metainf-services annotation processor to generate all service files

Author: gitblit

CHANGELOG.md

@@ -6,6 +6,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 #### Fixed
 #### Changed
 - [fathom-core] Update to SLF4j 1.7.14
+- Use `org.kohsuke.metainf-services:meta-services` annotation processor to automatically generate all META-INF/services files
 #### Added
 #### Removed
 

fathom-eventbus/pom.xml

@@ -32,6 +32,13 @@
             <artifactId>fathom-core</artifactId>
             <version>${project.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.kohsuke.metainf-services</groupId>
+            <artifactId>metainf-services</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
     </dependencies>
 
 </project>

fathom-eventbus/src/main/java/fathom/eventbus/EventBusModule.java

@@ -17,6 +17,7 @@
 
 import com.google.common.eventbus.EventBus;
 import fathom.Module;
+import org.kohsuke.MetaInfServices;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -25,6 +26,7 @@
  *
  * @author James Moger
  */
+@MetaInfServices
 public final class EventBusModule extends Module {
 
     private static final Logger log = LoggerFactory.getLogger(EventBusModule.class);

fathom-eventbus/src/main/resources/META-INF/services/fathom.Module

@@ -37,6 +37,11 @@
             <artifactId>cache-annotations-ri-guice</artifactId>
             <version>1.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.kohsuke.metainf-services</groupId>
+            <artifactId>metainf-services</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>com.gitblit.fathom</groupId>
             <artifactId>fathom-test-tools</artifactId>

fathom-jcache/pom.xml

@@ -29,6 +29,7 @@
 import org.jsr107.ri.annotations.guice.CacheRemoveAllInterceptor;
 import org.jsr107.ri.annotations.guice.CacheRemoveEntryInterceptor;
 import org.jsr107.ri.annotations.guice.CacheResultInterceptor;
+import org.kohsuke.MetaInfServices;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -53,6 +54,7 @@
  *
  * @author James Moger
  */
+@MetaInfServices
 public final class JCacheModule extends Module {
 
     private static final Logger log = LoggerFactory.getLogger(JCacheModule.class);

fathom-jcache/src/main/java/fathom/jcache/JCacheModule.java

@@ -15,7 +15,8 @@
   ~ limitations under the License.
   -->
 
-<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">
+<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">
     <parent>
         <artifactId>fathom-parent</artifactId>
         <groupId>com.gitblit.fathom</groupId>
@@ -32,11 +33,16 @@
             <artifactId>fathom-core</artifactId>
             <version>${project.version}</version>
         </dependency>
-	<dependency>
-		<groupId>com.j256.simplejmx</groupId>
-		<artifactId>simplejmx</artifactId>
-		<version>1.12</version>
-	</dependency>
+        <dependency>
+            <groupId>org.kohsuke.metainf-services</groupId>
+            <artifactId>metainf-services</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.j256.simplejmx</groupId>
+            <artifactId>simplejmx</artifactId>
+            <version>1.12</version>
+        </dependency>
     </dependencies>
 
 </project>

fathom-jcache/src/main/resources/META-INF/services/fathom.Module

@@ -16,12 +16,14 @@
 package fathom.jmx;
 
 import fathom.Module;
+import org.kohsuke.MetaInfServices;
 
 /**
  * Fathom module which binds a JMX server.
  *
  * @author James Moger
  */
+@MetaInfServices
 public final class JmxModule extends Module {
 
     @Override

fathom-jmx/pom.xml

@@ -50,6 +50,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.kohsuke.metainf-services</groupId>
+            <artifactId>metainf-services</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>com.icegreen</groupId>
             <artifactId>greenmail</artifactId>

fathom-jmx/src/main/java/fathom/jmx/JmxModule.java

@@ -17,6 +17,7 @@
 package fathom.mailer;
 
 import fathom.Module;
+import org.kohsuke.MetaInfServices;
 import org.sonatype.micromailer.EMailer;
 import org.sonatype.micromailer.MailComposer;
 import org.sonatype.micromailer.MailSender;
@@ -29,6 +30,7 @@
 /**
  * @author James Moger
  */
+@MetaInfServices
 public class MailModule extends Module {
 
     @Override

fathom-jmx/src/main/resources/META-INF/services/fathom.Module

@@ -38,6 +38,11 @@
             <artifactId>metrics-ganglia</artifactId>
             <version>3.1.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.kohsuke.metainf-services</groupId>
+            <artifactId>metainf-services</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
 </project>

fathom-mailer/pom.xml

@@ -21,6 +21,7 @@
 import fathom.metrics.MetricsReporter;
 import info.ganglia.gmetric4j.gmetric.GMetric;
 import info.ganglia.gmetric4j.gmetric.GMetric.UDPAddressingMode;
+import org.kohsuke.MetaInfServices;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -32,6 +33,7 @@
  *
  * @author James Moger
  */
+@MetaInfServices
 public class Reporter implements MetricsReporter {
 
     private final Logger log = LoggerFactory.getLogger(Reporter.class);

fathom-mailer/src/main/java/fathom/mailer/MailModule.java

@@ -38,6 +38,11 @@
             <artifactId>metrics-graphite</artifactId>
             <version>3.1.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.kohsuke.metainf-services</groupId>
+            <artifactId>metainf-services</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
 </project>

fathom-mailer/src/main/resources/META-INF/services/fathom.Module

@@ -23,6 +23,7 @@
 import com.codahale.metrics.graphite.PickledGraphite;
 import fathom.conf.Settings;
 import fathom.metrics.MetricsReporter;
+import org.kohsuke.MetaInfServices;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -35,6 +36,7 @@
  *
  * @author James Moger
  */
+@MetaInfServices
 public class Reporter implements MetricsReporter {
 
     private final Logger log = LoggerFactory.getLogger(Reporter.class);

fathom-metrics-ganglia/pom.xml

@@ -42,6 +42,11 @@
             <artifactId>metrics-influxdb</artifactId>
             <version>${influxdb.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.kohsuke.metainf-services</groupId>
+            <artifactId>metainf-services</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
 </project>

fathom-metrics-ganglia/src/main/java/fathom/metrics/ganglia/Reporter.java

@@ -21,6 +21,7 @@
 import fathom.metrics.MetricsReporter;
 import metrics_influxdb.InfluxdbHttp;
 import metrics_influxdb.InfluxdbReporter;
+import org.kohsuke.MetaInfServices;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -32,6 +33,7 @@
  *
  * @author James Moger
  */
+@MetaInfServices
 public class Reporter implements MetricsReporter {
 
     private final Logger log = LoggerFactory.getLogger(Reporter.class);

fathom-metrics-graphite/pom.xml

@@ -42,6 +42,11 @@
             <artifactId>metrics-librato</artifactId>
             <version>${librato.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.kohsuke.metainf-services</groupId>
+            <artifactId>metainf-services</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
 </project>

fathom-metrics-graphite/src/main/java/fathom/metrics/graphite/Reporter.java

@@ -19,6 +19,7 @@
 import com.librato.metrics.LibratoReporter;
 import fathom.conf.Settings;
 import fathom.metrics.MetricsReporter;
+import org.kohsuke.MetaInfServices;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -30,6 +31,7 @@
  *
  * @author James Moger
  */
+@MetaInfServices
 public class Reporter implements MetricsReporter {
 
     private final Logger log = LoggerFactory.getLogger(Reporter.class);

fathom-metrics-graphite/src/main/resources/META-INF/services/fathom.metrics.MetricsReporter

@@ -43,6 +43,12 @@
             <artifactId>metrics-jvm</artifactId>
             <version>3.1.1</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.kohsuke.metainf-services</groupId>
+            <artifactId>metainf-services</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
 </project>

fathom-metrics-influxdb/pom.xml

@@ -17,6 +17,7 @@
 
 import com.codahale.metrics.MetricRegistry;
 import fathom.Module;
+import org.kohsuke.MetaInfServices;
 
 import static com.google.inject.matcher.Matchers.annotatedWith;
 import static com.google.inject.matcher.Matchers.any;
@@ -26,6 +27,7 @@
  *
  * @author James Moger
  */
+@MetaInfServices
 public final class MetricsModule extends Module {
 
     @Override

fathom-metrics-influxdb/src/main/java/fathom/metrics/influxdb/Reporter.java

@@ -48,6 +48,11 @@
             <artifactId>quartz-jobs</artifactId>
             <version>${quartz.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.kohsuke.metainf-services</groupId>
+            <artifactId>metainf-services</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>com.gitblit.fathom</groupId>
             <artifactId>fathom-test-tools</artifactId>

fathom-metrics-influxdb/src/main/resources/META-INF/services/fathom.metrics.MetricsReporter

@@ -18,13 +18,15 @@
 import com.google.common.base.Optional;
 import fathom.Module;
 import fathom.utils.ClassUtil;
+import org.kohsuke.MetaInfServices;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
  * Fathom module for Quartz.
  * This module auto-loads the JobsModule and registers the Quartz service.
  */
+@MetaInfServices
 public class QuartzModule extends Module {
 
     private static final Logger log = LoggerFactory.getLogger(QuartzModule.class);

fathom-metrics-librato/pom.xml

@@ -37,6 +37,11 @@
             <artifactId>fathom-security</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.kohsuke.metainf-services</groupId>
+            <artifactId>metainf-services</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
 </project>

fathom-metrics-librato/src/main/java/fathom/metrics/librato/Reporter.java

@@ -35,12 +35,14 @@
 import fathom.rest.security.aop.RequireToken;
 import fathom.rest.security.aop.RequireTokenInterceptor;
 import fathom.security.SecurityManager;
+import org.kohsuke.MetaInfServices;
 
 import static com.google.inject.matcher.Matchers.*;
 
 /**
  * @author James Moger
  */
+@MetaInfServices
 public class SecurityModule extends Module {
 
     @Override

fathom-metrics-librato/src/main/resources/META-INF/services/fathom.metrics.MetricsReporter

@@ -51,6 +51,11 @@
             <artifactId>shiro-web</artifactId>
             <version>${shiro.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.kohsuke.metainf-services</groupId>
+            <artifactId>metainf-services</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>com.gitblit.fathom</groupId>
             <artifactId>fathom-test-tools</artifactId>

fathom-metrics/pom.xml

@@ -25,13 +25,15 @@
 import org.apache.shiro.web.env.IniWebEnvironment;
 import org.apache.shiro.web.env.WebEnvironment;
 import org.apache.shiro.web.mgt.WebSecurityManager;
+import org.kohsuke.MetaInfServices;
 
 
 /**
  * Simple auth module based on Apache Shiro Core.
  *
  * @author James Moger
  */
+@MetaInfServices
 public class ShiroModule extends ServletsModule {
 
     @Override