cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [cxf] branch master updated: Minor checkstyle updates
Date Mon, 21 May 2018 16:33:59 GMT
This is an automated email from the ASF dual-hosted git repository.

dkulp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/master by this push:
     new eaa7a4c  Minor checkstyle updates
eaa7a4c is described below

commit eaa7a4cb635b4815ff6fb823a2487803817a4829
Author: Daniel Kulp <dkulp@apache.org>
AuthorDate: Mon May 21 12:33:47 2018 -0400

    Minor checkstyle updates
---
 .../apache/cxf/bus/extension/ExtensionManagerBus.java  |  2 +-
 .../main/java/org/apache/cxf/endpoint/ClientImpl.java  |  2 +-
 .../apache/cxf/tracing/brave/BraveClientFeature.java   |  2 +-
 .../org/apache/cxf/tracing/brave/BraveFeature.java     |  2 +-
 .../apache/cxf/tracing/brave/jaxrs/BraveFeature.java   |  2 +-
 parent/pom.xml                                         |  2 +-
 pom.xml                                                | 18 +++++++++---------
 .../apache/cxf/aegis/util/date/XsDateTimeFormat.java   |  2 +-
 .../cxf/metrics/interceptors/CountingOutputStream.java |  2 +-
 .../org/apache/cxf/jaxrs/openapi/OpenApiFeature.java   | 10 +++++-----
 .../ext/search/jpa/AbstractJPATypedQueryVisitor.java   |  2 +-
 11 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
index d274267..c476043 100644
--- a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
+++ b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
@@ -152,7 +152,7 @@ public class ExtensionManagerBus extends AbstractBasicInterceptorProvider
implem
     }
 
     public ExtensionManagerBus(Map<Class<?>, Object> e, Map<String, Object>
properties) {
-       this(e, properties, Thread.currentThread().getContextClassLoader());
+        this(e, properties, Thread.currentThread().getContextClassLoader());
     }
     public ExtensionManagerBus(Map<Class<?>, Object> e) {
         this(e, null, Thread.currentThread().getContextClassLoader());
diff --git a/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java b/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
index c4a3e82..eb82b88 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
@@ -109,7 +109,7 @@ public class ClientImpl
     }
 
     public ClientImpl(Bus b, Endpoint e, Conduit c) {
-       this(b, e, new PreexistingConduitSelector(c));
+        this(b, e, new PreexistingConduitSelector(c));
     }
 
     public ClientImpl(Bus b, Endpoint e, ConduitSelector sc) {
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientFeature.java
b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientFeature.java
index 3d2cb92..509c7bc 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientFeature.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientFeature.java
@@ -40,7 +40,7 @@ public class BraveClientFeature extends AbstractFeature {
               .newBuilder(tracing)
               .clientParser(new HttpClientSpanParser())
               .build()
-         );
+        );
     }
     
     public BraveClientFeature(HttpTracing brave) {
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveFeature.java
b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveFeature.java
index 07b8cd9..faf9c8d 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveFeature.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveFeature.java
@@ -55,7 +55,7 @@ public class BraveFeature extends AbstractFeature {
               .newBuilder(tracing)
               .serverParser(new HttpServerSpanParser())
               .build()
-         );
+        );
     }
 
     public BraveFeature(HttpTracing brave) {
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveFeature.java
b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveFeature.java
index 2b4e9cf..61f3e00 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveFeature.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveFeature.java
@@ -51,7 +51,7 @@ public class BraveFeature implements Feature {
               .newBuilder(tracing)
               .serverParser(new HttpServerSpanParser())
               .build()
-         );
+        );
     }
 
     public BraveFeature(final HttpTracing brave) {
diff --git a/parent/pom.xml b/parent/pom.xml
index 6c16765..6cc405b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -361,7 +361,7 @@
                         <dependency>
                             <groupId>com.puppycrawl.tools</groupId>
                             <artifactId>checkstyle</artifactId>
-                            <version>8.7</version>
+                            <version>8.10</version>
                             <exclusions>
                                 <!--  MCHECKSTYLE-156  -->
                                 <exclusion>
diff --git a/pom.xml b/pom.xml
index 6a93475..94df195 100644
--- a/pom.xml
+++ b/pom.xml
@@ -655,7 +655,14 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>1.4.1</version>
+                    <version>3.0.0-M1</version>
+                    <configuration>
+                        <rules>
+                            <requireMavenVersion>
+                                <version>3.1</version>
+                            </requireMavenVersion>
+                        </rules>
+                    </configuration>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -665,17 +672,10 @@
                 <artifactId>maven-enforcer-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>enforce-versions</id>
+                        <id>enforce-maven</id>
                         <goals>
                             <goal>enforce</goal>
                         </goals>
-                        <configuration>
-                            <rules>
-                                <requireMavenVersion>
-                                    <version>3.1</version>
-                                </requireMavenVersion>
-                            </rules>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/date/XsDateTimeFormat.java
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/date/XsDateTimeFormat.java
index cb75f4e..a9eac9e 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/date/XsDateTimeFormat.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/date/XsDateTimeFormat.java
@@ -44,7 +44,7 @@ public class XsDateTimeFormat extends Format {
     final boolean parseTimezone;
 
     XsDateTimeFormat(boolean pParseDate, boolean pParseTime) {
-      this(pParseDate, pParseTime, true);
+        this(pParseDate, pParseTime, true);
     }
 
     XsDateTimeFormat(boolean pParseDate, boolean pParseTime, boolean pParseTimezone) {
diff --git a/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/CountingOutputStream.java
b/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/CountingOutputStream.java
index 673a503..b51f710 100644
--- a/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/CountingOutputStream.java
+++ b/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/CountingOutputStream.java
@@ -26,7 +26,7 @@ public final class CountingOutputStream extends FilterOutputStream {
     private long count;
 
     public CountingOutputStream(OutputStream out) {
-      super(out);
+        super(out);
     }
 
     public long getCount() {
diff --git a/rt/rs/description-openapi-v3/src/main/java/org/apache/cxf/jaxrs/openapi/OpenApiFeature.java
b/rt/rs/description-openapi-v3/src/main/java/org/apache/cxf/jaxrs/openapi/OpenApiFeature.java
index 8df6c7d..5abc001 100644
--- a/rt/rs/description-openapi-v3/src/main/java/org/apache/cxf/jaxrs/openapi/OpenApiFeature.java
+++ b/rt/rs/description-openapi-v3/src/main/java/org/apache/cxf/jaxrs/openapi/OpenApiFeature.java
@@ -109,11 +109,11 @@ public class OpenApiFeature extends AbstractFeature implements SwaggerUiSupport,
         DefaultApplication(final List<ClassResourceInfo> cris, final Set<String>
resourcePackages) {
             this.serviceClasses = cris.stream().map(ClassResourceInfo::getServiceClass).
                     filter(cls -> {
-                    return resourcePackages == null || resourcePackages.isEmpty()
-                           ? true
-                           : resourcePackages.stream().
-                               anyMatch(pkg -> cls.getPackage().getName().startsWith(pkg));
-                }).collect(Collectors.toSet());
+                        return resourcePackages == null || resourcePackages.isEmpty()
+                            ? true
+                                : resourcePackages.stream().
+                                anyMatch(pkg -> cls.getPackage().getName().startsWith(pkg));
+                    }).collect(Collectors.toSet());
         }
 
         @Override
diff --git a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitor.java
b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitor.java
index fe53e5a..efa9c40 100644
--- a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitor.java
+++ b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitor.java
@@ -75,7 +75,7 @@ public abstract class AbstractJPATypedQueryVisitor<T, T1, E>
     protected AbstractJPATypedQueryVisitor(EntityManager em,
                                            Class<T> tClass,
                                            List<String> joinProps) {
-           this(em, tClass, null, null, joinProps);
+        this(em, tClass, null, null, joinProps);
     }
 
     protected AbstractJPATypedQueryVisitor(EntityManager em,

-- 
To stop receiving notification emails like this one, please contact
dkulp@apache.org.

Mime
View raw message