Skip to content

Commit 9e1581f

Browse files
jknackjknack
committed
version bump: checkstyle, guava (for testing) and bom file
1 parent 556a1ac commit 9e1581f

3 files changed

Lines changed: 43 additions & 31 deletions

File tree

‎etc/source/jooby-style.xml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
- some best practices
2121
2222
Checkstyle is very configurable. Be sure to read the documentation at
23-
http://checkstyle.sf.net (or in your downloaded distribution).
23+
https://checkstyle.sourceforge.io (or in your downloaded distribution).
2424
2525
Most Checks are configurable, be sure to consult the documentation.
2626
@@ -42,43 +42,43 @@
4242
<property name="fileExtensions" value="java, properties, xml"/>
4343

4444
<!-- Checks that a package-info.java file exists for each package. -->
45-
<!-- See http://checkstyle.sf.net/config_javadoc.html#JavadocPackage
45+
<!-- See https://checkstyle.sourceforge.io/config_javadoc.html#JavadocPackage
4646
<module name="JavadocPackage"/>
4747
-->
4848

4949
<!-- Checks whether files end with a new line. -->
50-
<!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
50+
<!-- See https://checkstyle.sourceforge.io/config_misc.html#NewlineAtEndOfFile -->
5151
<module name="NewlineAtEndOfFile"/>
5252

5353
<!-- Checks that property files contain the same keys. -->
54-
<!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
54+
<!-- See https://checkstyle.sourceforge.io/config_misc.html#Translation -->
5555
<module name="Translation"/>
5656

5757
<!-- Checks for Size Violations. -->
58-
<!-- See http://checkstyle.sf.net/config_sizes.html -->
58+
<!-- See https://checkstyle.sourceforge.io/config_sizes.html -->
5959
<module name="FileLength"/>
6060

6161
<!-- Checks for whitespace -->
62-
<!-- See http://checkstyle.sf.net/config_whitespace.html -->
62+
<!-- See https://checkstyle.sourceforge.io/config_whitespace.html -->
6363
<module name="FileTabCharacter"/>
6464

6565
<!-- Miscellaneous other checks. -->
66-
<!-- See http://checkstyle.sf.net/config_misc.html -->
66+
<!-- See https://checkstyle.sourceforge.io/config_misc.html -->
6767
<module name="RegexpSingleline">
6868
<property name="format" value="\s+$"/>
6969
<property name="minimum" value="0"/>
7070
<property name="maximum" value="0"/>
7171
<property name="message" value="Line has trailing spaces."/>
7272
</module>
7373

74-
<!-- See http://checkstyle.sf.net/config_sizes.html -->
74+
<!-- See https://checkstyle.sourceforge.io/config_sizes.html -->
7575
<module name="LineLength">
7676
<property name="max" value="100"/>
7777
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://|^\\*"/>
7878
</module>
7979

8080
<!-- Checks for Headers -->
81-
<!-- See http://checkstyle.sf.net/config_header.html -->
81+
<!-- See https://checkstyle.sourceforge.io/config_header.html -->
8282
<!-- <module name="Header"> -->
8383
<!-- <property name="headerFile" value="${checkstyle.header.file}"/> -->
8484
<!-- <property name="fileExtensions" value="java"/> -->
@@ -87,9 +87,9 @@
8787
<module name="TreeWalker">
8888

8989
<!-- Checks for Javadoc comments. -->
90-
<!-- See http://checkstyle.sf.net/config_javadoc.html -->
90+
<!-- See https://checkstyle.sourceforge.io/config_javadoc.html -->
9191
<module name="JavadocMethod">
92-
<property name="scope" value="public" />
92+
<property name="accessModifiers" value="public" />
9393
</module>
9494
<module name="MissingJavadocMethod">
9595
<property name="scope" value="public" />
@@ -103,7 +103,7 @@
103103
<module name="JavadocStyle"/>
104104

105105
<!-- Checks for Naming Conventions. -->
106-
<!-- See http://checkstyle.sf.net/config_naming.html -->
106+
<!-- See https://checkstyle.sourceforge.io/config_naming.html -->
107107
<!-- <module name="ConstantName"/> -->
108108
<module name="LocalFinalVariableName"/>
109109
<module name="LocalVariableName"/>
@@ -115,7 +115,7 @@
115115
<module name="TypeName"/>
116116

117117
<!-- Checks for imports -->
118-
<!-- See http://checkstyle.sf.net/config_import.html -->
118+
<!-- See https://checkstyle.sourceforge.io/config_import.html -->
119119
<module name="AvoidStarImport"/>
120120
<module name="IllegalImport"/> <!-- defaults to sun.* packages -->
121121
<module name="RedundantImport"/>
@@ -137,7 +137,7 @@
137137
</module>
138138

139139
<!-- Checks for whitespace -->
140-
<!-- See http://checkstyle.sf.net/config_whitespace.html -->
140+
<!-- See https://checkstyle.sourceforge.io/config_whitespace.html -->
141141
<module name="EmptyForIteratorPad"/>
142142
<module name="GenericWhitespace"/>
143143
<module name="MethodParamPad"/>
@@ -150,20 +150,20 @@
150150
<module name="WhitespaceAround"/>
151151

152152
<!-- Modifier Checks -->
153-
<!-- See http://checkstyle.sf.net/config_modifiers.html -->
153+
<!-- See https://checkstyle.sourceforge.io/config_modifiers.html -->
154154
<module name="ModifierOrder"/>
155155
<module name="RedundantModifier"/>
156156

157157
<!-- Checks for blocks. You know, those {}'s -->
158-
<!-- See http://checkstyle.sf.net/config_blocks.html -->
158+
<!-- See https://checkstyle.sourceforge.io/config_blocks.html -->
159159
<module name="AvoidNestedBlocks"/>
160160
<module name="EmptyBlock"/>
161161
<module name="LeftCurly"/>
162162
<module name="NeedBraces"/>
163163
<module name="RightCurly"/>
164164

165165
<!-- Checks for common coding problems -->
166-
<!-- See http://checkstyle.sf.net/config_coding.html -->
166+
<!-- See https://checkstyle.sourceforge.io/config_coding.html -->
167167
<!--<module name="AvoidInlineConditionals"/> -->
168168
<module name="EmptyStatement"/>
169169
<module name="EqualsHashCode"/>
@@ -177,15 +177,15 @@
177177
<module name="SimplifyBooleanReturn"/>
178178

179179
<!-- Checks for class design -->
180-
<!-- See http://checkstyle.sf.net/config_design.html -->
180+
<!-- See https://checkstyle.sourceforge.io/config_design.html -->
181181
<!-- <module name="DesignForExtension"/> -->
182182
<module name="FinalClass"/>
183183
<module name="HideUtilityClassConstructor"/>
184184
<module name="InterfaceIsType"/>
185185
<!--<module name="VisibilityModifier"/> -->
186186

187187
<!-- Miscellaneous other checks. -->
188-
<!-- See http://checkstyle.sf.net/config_misc.html -->
188+
<!-- See https://checkstyle.sourceforge.io/config_misc.html -->
189189
<module name="ArrayTypeStyle"/>
190190
<!--<module name="TodoComment"/> -->
191191
<module name="UpperEll"/>

‎modules/jooby-bom/pom.xml‎

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,27 +22,27 @@
2222
<asm.version>9.1</asm.version>
2323
<auto-service.version>1.0</auto-service.version>
2424
<aws-java-sdk.version>1.11.916</aws-java-sdk.version>
25-
<boringssl.version>2.0.27.Final</boringssl.version>
2625
<bucket4j-core.version>6.0.1</bucket4j-core.version>
2726
<caffeine.version>2.8.8</caffeine.version>
28-
<checkstyle.version>8.38</checkstyle.version>
27+
<checkstyle.version>8.42</checkstyle.version>
2928
<commons-email.version>1.5</commons-email.version>
3029
<commons-io.version>2.8.0</commons-io.version>
3130
<compile-testing.version>0.19</compile-testing.version>
3231
<config.version>1.4.1</config.version>
32+
<conscrypt.version>2.5.1</conscrypt.version>
3333
<cron-utils.version>9.1.3</cron-utils.version>
3434
<ebean.version>12.8.3</ebean.version>
3535
<exec-maven-plugin.version>3.0.0</exec-maven-plugin.version>
3636
<flyway.version>7.5.1</flyway.version>
3737
<freemarker.version>2.3.31</freemarker.version>
38-
<frontend-maven-plugin.version>1.10.4</frontend-maven-plugin.version>
38+
<frontend-maven-plugin.version>1.11.0</frontend-maven-plugin.version>
3939
<frontend-plugin-core.version>1.11.2</frontend-plugin-core.version>
4040
<gradle-core.version>2.6</gradle-core.version>
4141
<gradle-plugins.version>0.9-rc-1</gradle-plugins.version>
4242
<gradle-tooling-api.version>2.6</gradle-tooling-api.version>
4343
<graphql-java.version>16.2</graphql-java.version>
4444
<gson.version>2.8.6</gson.version>
45-
<guava.version>29.0-jre</guava.version>
45+
<guava.version>30.0-jre</guava.version>
4646
<guice.version>4.2.3</guice.version>
4747
<h2.version>1.4.200</h2.version>
4848
<handlebars.version>4.2.0</handlebars.version>
@@ -55,9 +55,9 @@
5555
<javax.inject.version>1</javax.inject.version>
5656
<jboss-modules.version>1.11.0.Final</jboss-modules.version>
5757
<jdbi.version>3.20.0</jdbi.version>
58-
<jetty.version>9.4.35.v20201120</jetty.version>
58+
<jetty.version>9.4.40.v20210413</jetty.version>
5959
<jfiglet.version>0.0.8</jfiglet.version>
60-
<jmespath-java.version>1.11.973</jmespath-java.version>
60+
<jmespath-java.version>1.11.916</jmespath-java.version>
6161
<jooby-maven-plugin.version>2.9.6-SNAPSHOT</jooby-maven-plugin.version>
6262
<jooby.version>2.9.6-SNAPSHOT</jooby.version>
6363
<json.version>20210307</json.version>
@@ -75,7 +75,7 @@
7575
<maven-antrun-plugin.version>3.0.0</maven-antrun-plugin.version>
7676
<maven-archetype-plugin.version>3.2.0</maven-archetype-plugin.version>
7777
<maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
78-
<maven-checkstyle-plugin.version>3.1.1</maven-checkstyle-plugin.version>
78+
<maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
7979
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
8080
<maven-core.version>3.6.3</maven-core.version>
8181
<maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
@@ -93,7 +93,7 @@
9393
<maven-site-plugin.version>3.8.2</maven-site-plugin.version>
9494
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
9595
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
96-
<maven-tiles-plugin.version>2.19</maven-tiles-plugin.version>
96+
<maven-tiles-plugin.version>2.20</maven-tiles-plugin.version>
9797
<metrics.version>4.1.20</metrics.version>
9898
<mockito.version>3.9.0</mockito.version>
9999
<mojo-executor.version>2.3.1</mojo-executor.version>
@@ -113,13 +113,13 @@
113113
<rxjava.version>2.2.21</rxjava.version>
114114
<slf4j.version>1.7.30</slf4j.version>
115115
<spring.version>5.3.4</spring.version>
116-
<stork-maven-plugin.version>3.1.0</stork-maven-plugin.version>
116+
<stork-maven-plugin.version>3.1.1</stork-maven-plugin.version>
117117
<swagger-parser.version>2.0.24</swagger-parser.version>
118118
<swagger.version>2.1.6</swagger.version>
119119
<thymeleaf.version>3.0.12.RELEASE</thymeleaf.version>
120120
<truth.version>1.1.2</truth.version>
121121
<unbescape.version>1.1.6.RELEASE</unbescape.version>
122-
<undertow.version>2.2.3.Final</undertow.version>
122+
<undertow.version>2.2.7.Final</undertow.version>
123123
<versions-maven-plugin.version>2.8.1</versions-maven-plugin.version>
124124
<weld.version>3.1.5.Final</weld.version>
125125
</properties>
@@ -414,6 +414,12 @@
414414
<version>${caffeine.version}</version>
415415
<type>jar</type>
416416
</dependency>
417+
<dependency>
418+
<groupId>io.jooby</groupId>
419+
<artifactId>jooby-conscrypt</artifactId>
420+
<version>${jooby.version}</version>
421+
<type>jar</type>
422+
</dependency>
417423
<dependency>
418424
<groupId>org.ow2.asm</groupId>
419425
<artifactId>asm</artifactId>
@@ -720,6 +726,12 @@
720726
<version>${jsr305.version}</version>
721727
<type>jar</type>
722728
</dependency>
729+
<dependency>
730+
<groupId>org.conscrypt</groupId>
731+
<artifactId>conscrypt-openjdk-uber</artifactId>
732+
<version>${conscrypt.version}</version>
733+
<type>jar</type>
734+
</dependency>
723735
<dependency>
724736
<groupId>io.undertow</groupId>
725737
<artifactId>undertow-core</artifactId>

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,9 @@
113113
<jacoco.version>0.8.6</jacoco.version>
114114
<junit.version>5.7.1</junit.version>
115115
<rest-assured.version>4.3.3</rest-assured.version>
116-
<checkstyle.version>8.41</checkstyle.version>
116+
<checkstyle.version>8.42</checkstyle.version>
117117
<mockito.version>3.9.0</mockito.version>
118-
<guava.version>29.0-jre</guava.version>
118+
<guava.version>30.0-jre</guava.version>
119119

120120
<auto-service.version>1.0</auto-service.version>
121121
<compile-testing.version>0.19</compile-testing.version>

0 commit comments

Comments
 (0)