version updates

svenruppert · May 6, 2019 · 37b3e08 · 37b3e08
1 parent b4ab36e
commit 37b3e08
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 23 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -66,7 +66,7 @@
       <dependency>
         <groupId>com.squareup</groupId>
         <artifactId>javapoet</artifactId>
-        <version>1.10.0</version>
+        <version>1.11.1</version>
       </dependency>
     </dependencies>
   </dependencyManagement>

diff --git a/modules/core/src/main/java/org/rapidpm/proxybuilder/core/metrics/RapidPMMetricsRegistry.java b/modules/core/src/main/java/org/rapidpm/proxybuilder/core/metrics/RapidPMMetricsRegistry.java
@@ -20,8 +20,8 @@
 package org.rapidpm.proxybuilder.core.metrics;
 
 import com.codahale.metrics.ConsoleReporter;
-import com.codahale.metrics.JmxReporter;
 import com.codahale.metrics.MetricRegistry;
+import com.codahale.metrics.jmx.JmxReporter;
 
 import java.util.concurrent.TimeUnit;
 
@@ -53,9 +53,9 @@ public void startJmxReporter() {
     synchronized (LOCK) {
       if (jmxReporter == null) {
         jmxReporter = JmxReporter.forRegistry(metrics)
-            .convertDurationsTo(DURATION_UNIT)
-            .convertRatesTo(RATE_UNIT)
-            .build();
+                                 .convertDurationsTo(DURATION_UNIT)
+                                 .convertRatesTo(RATE_UNIT)
+                                 .build();
       }
       jmxReporter.start();
     }

diff --git a/...apidpm/proxybuilder/staticgenerated/processors/StaticLoggingProxyAnnotationProcessor.java b/...apidpm/proxybuilder/staticgenerated/processors/StaticLoggingProxyAnnotationProcessor.java
@@ -101,13 +101,9 @@ protected CodeBlock defineMethodImplementation(final ExecutableElement methodEle
 
   private String joinString(List<? extends VariableElement> methodElementParameters) {
     Optional<String> reduce = methodElementParameters.stream()
-            .map(elementUtils -> elementUtils.toString())
+            .map(Object::toString)
             .reduce((s1, s2) -> s1 + " + \" - \" + " + s2);
-    if (reduce.isPresent()) {
-      return reduce.get();
-    } else {
-      return "";
-    }
+    return reduce.orElse("");
 
   }
 

diff --git a/...apidpm/proxybuilder/staticgenerated/processors/StaticMetricsProxyAnnotationProcessor.java b/...apidpm/proxybuilder/staticgenerated/processors/StaticMetricsProxyAnnotationProcessor.java
@@ -45,7 +45,6 @@ public class StaticMetricsProxyAnnotationProcessor extends BasicStaticProxyAnnot
 
   public static final String WITH_DELEGATOR = "withDelegator";
   public static final String RAPID_PMMETRICS_REGISTRY = RapidPMMetricsRegistry.class.getSimpleName();
-      ;
 
   @Override
   public Class<StaticMetricsProxy> responsibleFor() {

diff --git a/...rc/main/java/junit/org/rapidpm/proxybuilder/staticgenerated/processors/v008/MainV008.java b/...rc/main/java/junit/org/rapidpm/proxybuilder/staticgenerated/processors/v008/MainV008.java
@@ -1,7 +1,6 @@
 package junit.org.rapidpm.proxybuilder.staticgenerated.processors.v008;
 
 import java.sql.SQLException;
-import java.util.Arrays;
 import java.util.List;
 
 import static java.util.Arrays.asList;

diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,8 @@
   <parent>
     <groupId>org.rapidpm</groupId>
     <artifactId>rapidpm-dependencies</artifactId>
-    <version>3.5.8</version>
+<!--    <version>3.5.8</version>-->
+    <version>04.00.16-RPM</version>
   </parent>
 
 
@@ -61,14 +62,14 @@
       <timezone>+1</timezone>
     </developer>
   </developers>
-  <issueManagement>
-    <system>Youtrack</system>
-    <url>https://issues.rapidpm.org/issues?q=project%3A+ProxyBuilder</url>
-  </issueManagement>
-  <ciManagement>
-    <system>TeamCity</system>
-    <url>https://build.rapidpm.org/viewType.html?buildTypeId=RapidPM_Develop_ProxyBuilder_Snapshot</url>
-  </ciManagement>
+<!--  <issueManagement>-->
+<!--    <system>Youtrack</system>-->
+<!--    <url>https://issues.rapidpm.org/issues?q=project%3A+ProxyBuilder</url>-->
+<!--  </issueManagement>-->
+<!--  <ciManagement>-->
+<!--    <system>TeamCity</system>-->
+<!--    <url>https://build.rapidpm.org/viewType.html?buildTypeId=RapidPM_Develop_ProxyBuilder_Snapshot</url>-->
+<!--  </ciManagement>-->
   <licenses>
     <license>
       <name>The Apache Software License, Version 2.0</name>
@@ -87,6 +88,14 @@
   </properties>
 
   <dependencies>
+<!--    APIs-->
+
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+    </dependency>
+
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -95,21 +104,32 @@
     </dependency>
 
 
+    <!-- https://mvnrepository.com/artifact/io.dropwizard.metrics/metrics-core -->
     <dependency>
       <groupId>io.dropwizard.metrics</groupId>
       <artifactId>metrics-core</artifactId>
-      <version>3.2.4</version>
+      <version>4.1.0</version>
     </dependency>
+    <!-- https://mvnrepository.com/artifact/io.dropwizard.metrics/metrics-jvm -->
+    <dependency>
+      <groupId>io.dropwizard.metrics</groupId>
+      <artifactId>metrics-jmx</artifactId>
+      <version>4.1.0</version>
+    </dependency>
+
+
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
       <optional>true</optional>
       <!-- case: when no json de/serialization -->
     </dependency>
 
+<!--    reactivate-->
     <dependency>
       <groupId>org.rapidpm</groupId>
       <artifactId>rapidpm-dependencies-core-reflections</artifactId>
+      <version>3.6.3</version>
     </dependency>
 
     <dependency>