Skip to content

Commit 898329e

Browse files
adrienlaueradrienlauer
committed
Update for seed 3.10+
1 parent 94c997a commit 898329e

57 files changed

Lines changed: 121 additions & 118 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎checkstyle.xml‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<!--
33
4-
Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
4+
Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
55
66
This Source Code Form is subject to the terms of the Mozilla Public
77
License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -23,6 +23,11 @@
2323
<property name="eachLine" value="true"/>
2424
</module>
2525

26+
<module name="LineLength">
27+
<property name="max" value="120"/>
28+
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
29+
</module>
30+
2631
<module name="TreeWalker">
2732
<module name="OuterTypeFilename"/>
2833
<module name="IllegalTokenText">
@@ -37,10 +42,6 @@
3742
<property name="allowByTailComment" value="true"/>
3843
<property name="allowNonPrintableEscapes" value="true"/>
3944
</module>
40-
<module name="LineLength">
41-
<property name="max" value="120"/>
42-
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
43-
</module>
4445
<module name="AvoidStarImport"/>
4546
<module name="OneTopLevelClass"/>
4647
<module name="NoLineWrap"/>
@@ -205,24 +206,22 @@
205206
</module>
206207
<module name="NonEmptyAtclauseDescription"/>
207208
<module name="JavadocTagContinuationIndentation"/>
208-
<!--<module name="SummaryJavadoc">-->
209-
<!--<property name="forbiddenSummaryFragments"-->
210-
<!--value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>-->
211-
<!--</module>-->
209+
<module name="SummaryJavadoc">
210+
<property name="forbiddenSummaryFragments"
211+
value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
212+
</module>
212213
<module name="JavadocParagraph"/>
213214
<module name="AtclauseOrder">
214215
<property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
215216
<property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
216217
</module>
217-
<module name="JavadocMethod">
218-
<property name="scope" value="public"/>
219-
<property name="allowMissingParamTags" value="true"/>
220-
<property name="allowMissingThrowsTags" value="true"/>
221-
<property name="allowMissingReturnTag" value="true"/>
218+
<module name="MissingJavadocMethodCheck">
222219
<property name="allowMissingPropertyJavadoc" value="true"/>
223220
<property name="minLineCount" value="2"/>
221+
</module>
222+
<module name="JavadocMethod">
223+
<property name="scope" value="public"/>
224224
<property name="allowedAnnotations" value="Override, Test"/>
225-
<property name="allowThrowsTagsForSubclasses" value="true"/>
226225
</module>
227226
<module name="MethodName">
228227
<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>

‎pom.xml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
22
3-
Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
3+
Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
44
55
This Source Code Form is subject to the terms of the Mozilla Public
66
License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -14,17 +14,17 @@
1414
<parent>
1515
<groupId>org.seedstack.poms</groupId>
1616
<artifactId>parent-internal</artifactId>
17-
<version>3.4.3</version>
17+
<version>3.4.9</version>
1818
</parent>
1919

2020
<groupId>org.seedstack.addons.w20</groupId>
2121
<artifactId>w20-bridge</artifactId>
22-
<version>3.2.8-SNAPSHOT</version>
22+
<version>3.2.9-SNAPSHOT</version>
2323
<packaging>pom</packaging>
2424

2525
<properties>
26-
<seed.version>3.8.0</seed.version>
27-
<web-bridge.version>1.0.3</web-bridge.version>
26+
<seed.version>3.10.0</seed.version>
27+
<web-bridge.version>1.0.4</web-bridge.version>
2828
<grunt-maven-plugin.version>1.5.0</grunt-maven-plugin.version>
2929

3030
<compatibility.version>3.0.0</compatibility.version>
@@ -86,6 +86,8 @@
8686
<licenseMerge>IGNORED_LICENSE|MPL 1.1</licenseMerge>
8787
<licenseMerge>IGNORED_LICENSE|GPL2 w/ CPE</licenseMerge>
8888
<licenseMerge>IGNORED_LICENSE|GNU General Public License, version 2 (GPL2), with the classpath exception</licenseMerge>
89+
<licenseMerge>IGNORED_LICENSE|EDL 1.0</licenseMerge>
90+
<licenseMerge>IGNORED_LICENSE|Eclipse Distribution License - v 1.0</licenseMerge>
8991
</licenseMerges>
9092
</configuration>
9193
</plugin>

‎rest/pom.xml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
4+
Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
55
66
This Source Code Form is subject to the terms of the Mozilla Public
77
License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -15,7 +15,7 @@
1515
<parent>
1616
<groupId>org.seedstack.addons.w20</groupId>
1717
<artifactId>w20-bridge</artifactId>
18-
<version>3.2.8-SNAPSHOT</version>
18+
<version>3.2.9-SNAPSHOT</version>
1919
</parent>
2020

2121
<artifactId>w20-bridge-rest</artifactId>
@@ -99,6 +99,13 @@
9999
<artifactId>seed-rest-jersey2</artifactId>
100100
<version>${seed.version}</version>
101101
<scope>test</scope>
102+
<exclusions>
103+
<!-- Remove this exclusion starting from seed 3.10.1 -->
104+
<exclusion>
105+
<groupId>jakarta.xml.bind</groupId>
106+
<artifactId>jakarta.xml.bind-api</artifactId>
107+
</exclusion>
108+
</exclusions>
102109
</dependency>
103110
<dependency>
104111
<groupId>ch.qos.logback</groupId>

‎rest/src/main/java/org/seedstack/w20/internal/AvailableFragment.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
2+
* Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
33
*
44
* This Source Code Form is subject to the terms of the Mozilla Public
55
* License, v. 2.0. If a copy of the MPL was not distributed with this

‎rest/src/main/java/org/seedstack/w20/internal/ConfiguredApplication.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
2+
* Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
33
*
44
* This Source Code Form is subject to the terms of the Mozilla Public
55
* License, v. 2.0. If a copy of the MPL was not distributed with this

‎rest/src/main/java/org/seedstack/w20/internal/CoreConfigurationHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
2+
* Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
33
*
44
* This Source Code Form is subject to the terms of the Mozilla Public
55
* License, v. 2.0. If a copy of the MPL was not distributed with this

‎rest/src/main/java/org/seedstack/w20/internal/Fragment.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
2+
* Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
33
*
44
* This Source Code Form is subject to the terms of the Mozilla Public
55
* License, v. 2.0. If a copy of the MPL was not distributed with this

‎rest/src/main/java/org/seedstack/w20/internal/FragmentManagerImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
2+
* Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
33
*
44
* This Source Code Form is subject to the terms of the Mozilla Public
55
* License, v. 2.0. If a copy of the MPL was not distributed with this

‎rest/src/main/java/org/seedstack/w20/internal/GlobalConfigurationHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
2+
* Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
33
*
44
* This Source Code Form is subject to the terms of the Mozilla Public
55
* License, v. 2.0. If a copy of the MPL was not distributed with this

‎rest/src/main/java/org/seedstack/w20/internal/Html5RewriteFilter.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
/*
2-
* Copyright © 2013-2018, The SeedStack authors <http://seedstack.org>
2+
* Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
33
*
44
* This Source Code Form is subject to the terms of the Mozilla Public
55
* License, v. 2.0. If a copy of the MPL was not distributed with this
66
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
77
*/
8-
98
package org.seedstack.w20.internal;
109

1110
import com.google.common.base.Strings;

0 commit comments

Comments
 (0)