-
Notifications
You must be signed in to change notification settings - Fork 8
build!: upgrade vaadin to 24.9.8 AND feat!: replace setClassNameGenerator with setPartNameGenerator AND refactor: avoid use of commons.lang3 AND docs: enhance class documentation in LegacyTwinColGrid AND docs: fix double brace in javadoc in LegacyTwinColGrid AND build: set version to 4.0.0-SNAPSHOT AND chore/ci #205
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Changes from all commits
72ee37b
102396a
13eaf33
102eed0
2ac6cb9
d8f8a10
313be6d
c302071
edec196
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,18 +3,18 @@ | |
| <modelVersion>4.0.0</modelVersion> | ||
| <groupId>com.flowingcode.vaadin.addons</groupId> | ||
| <artifactId>twincolgrid</artifactId> | ||
| <version>3.2.0-SNAPSHOT</version> | ||
| <version>4.0.0-SNAPSHOT</version> | ||
| <name>TwinColGrid add-on</name> | ||
| <description>Dual list component based on Vaadin Grids</description> | ||
| <url>https://www.flowingcode.com/en/open-source/</url> | ||
|
|
||
| <properties> | ||
| <vaadin.version>14.11.13</vaadin.version> | ||
| <maven.compiler.source>1.8</maven.compiler.source> | ||
| <maven.compiler.target>1.8</maven.compiler.target> | ||
| <vaadin.version>24.9.8</vaadin.version> | ||
| <maven.compiler.source>17</maven.compiler.source> | ||
| <maven.compiler.target>17</maven.compiler.target> | ||
| <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | ||
| <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> | ||
| <jetty.version>9.4.36.v20210114</jetty.version> | ||
| <jetty.version>11.0.26</jetty.version> | ||
| </properties> | ||
| <organization> | ||
| <name>Flowing Code</name> | ||
|
|
@@ -128,11 +128,11 @@ | |
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>javax.servlet</groupId> | ||
| <artifactId>servlet-api</artifactId> | ||
| <version>2.5</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <groupId>jakarta.servlet</groupId> | ||
| <artifactId>jakarta.servlet-api</artifactId> | ||
| <version>6.0.0</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>junit</groupId> | ||
| <artifactId>junit</artifactId> | ||
|
|
@@ -142,7 +142,7 @@ | |
| <dependency> | ||
| <groupId>com.flowingcode.vaadin.addons.demo</groupId> | ||
| <artifactId>commons-demo</artifactId> | ||
| <version>3.8.0</version> | ||
| <version>5.0.0</version> | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🧩 Analysis chain🌐 Web query:
💡 Result: Versions for com.flowingcode.vaadin.addons.demo:commons-demo available on Maven Central (examples with release dates): 4.3.0 (Sep 26, 2025), 4.2.0 (Jan 15, 2025), 4.1.0 (Jul 22, 2024), 4.0.0 (Feb 05, 2024), 3.10.0 (Feb 05, 2024), 3.9.0 (Oct 12, 2023), 3.8.0 (Sep 07, 2023). See Maven Central listing. [1] Source: Version 5.0.0 does not exist in Maven Central—use 4.3.0 instead. The commons-demo:5.0.0 reference cannot be resolved. Maven Central only provides up to version 4.3.0 (released Sep 26, 2025). Update line 145 to: This represents a safe version upgrade from 3.8.0 to the current stable release. 🤖 Prompt for AI Agents
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🧩 Analysis chain🏁 Script executed: Length of output: 3 @javier-godoy You're absolutely right, my apologies for the incorrect information. I've confirmed that It appears my initial web search results were outdated and didn't include the December 15, 2025 release. The dependency version is correct as specified in the PR. |
||
| <scope>test</scope> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
@@ -156,6 +156,10 @@ | |
| <configuration> | ||
| <licenseName>apache_v2</licenseName> | ||
| <addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage> | ||
| <excludes> | ||
| <exclude>main/bundles/**</exclude> | ||
| <exclude>main/frontend/**</exclude> | ||
| </excludes> | ||
| </configuration> | ||
| </plugin> | ||
|
|
||
|
|
@@ -351,47 +355,6 @@ | |
| </plugins> | ||
| </build> | ||
| </profile> | ||
|
|
||
| <profile> | ||
| <id>v23</id> | ||
| <properties> | ||
| <vaadin.version>23.3.5</vaadin.version> | ||
| <maven.compiler.source>11</maven.compiler.source> | ||
| <maven.compiler.target>11</maven.compiler.target> | ||
| </properties> | ||
| </profile> | ||
|
|
||
| <profile> | ||
| <id>v24</id> | ||
| <properties> | ||
| <maven.compiler.source>17</maven.compiler.source> | ||
| <maven.compiler.target>17</maven.compiler.target> | ||
| <vaadin.version>24.2.6</vaadin.version> | ||
| <jetty.version>11.0.12</jetty.version> | ||
| </properties> | ||
| <repositories> | ||
| <repository> | ||
| <id>vaadin-prerelease</id> | ||
| <url>https://maven.vaadin.com/vaadin-prereleases</url> | ||
| </repository> | ||
| </repositories> | ||
| <pluginRepositories> | ||
| <pluginRepository> | ||
| <id>vaadin-prerelease</id> | ||
| <url>https://maven.vaadin.com/vaadin-prereleases</url> | ||
| </pluginRepository> | ||
| </pluginRepositories> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>jakarta.servlet</groupId> | ||
| <artifactId>jakarta.servlet-api</artifactId> | ||
| <version>6.0.0</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| </dependencies> | ||
| </profile> | ||
|
|
||
|
|
||
| <profile> | ||
| <id>release</id> | ||
|
|
@@ -416,23 +379,11 @@ | |
| <jetty.version>11.0.26</jetty.version> | ||
| </properties> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>com.flowingcode.vaadin.addons.demo</groupId> | ||
| <artifactId>commons-demo</artifactId> | ||
| <version>5.0.0</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.vaadin</groupId> | ||
| <artifactId>vaadin-dev</artifactId> | ||
| <optional>true</optional> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>jakarta.servlet</groupId> | ||
| <artifactId>jakarta.servlet-api</artifactId> | ||
| <version>6.0.0</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| </dependencies> | ||
| </profile> | ||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| /*- | ||
| * #%L | ||
| * TwinColGrid add-on | ||
| * %% | ||
| * Copyright (C) 2017 - 2025 Flowing Code | ||
| * %% | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * #L% | ||
| */ | ||
| package com.flowingcode.vaadin.addons.twincolgrid; | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| import lombok.experimental.UtilityClass; | ||
|
|
||
| @UtilityClass | ||
| class CharSequenceUtils { | ||
|
|
||
| /** | ||
| * Green implementation of regionMatches. | ||
| * | ||
| * @param cs the {@link CharSequence} to be processed | ||
| * @param ignoreCase whether or not to be case-insensitive | ||
| * @param thisStart the index to start on the {@code cs} CharSequence | ||
| * @param substring the {@link CharSequence} to be looked for | ||
| * @param start the index to start on the {@code substring} CharSequence | ||
| * @param length character length of the region | ||
| * @return whether the region matched | ||
| * @see String#regionMatches(boolean, int, String, int, int) | ||
| */ | ||
| static boolean regionMatches(final CharSequence cs, final boolean ignoreCase, final int thisStart, | ||
| final CharSequence substring, final int start, final int length) { | ||
| if (cs instanceof String && substring instanceof String) { | ||
| return ((String) cs).regionMatches(ignoreCase, thisStart, (String) substring, start, length); | ||
| } | ||
| int index1 = thisStart; | ||
| int index2 = start; | ||
| int tmpLen = length; | ||
|
|
||
| // Extract these first so we detect NPEs the same as the java.lang.String version | ||
| final int srcLen = cs.length() - thisStart; | ||
| final int otherLen = substring.length() - start; | ||
|
|
||
| // Check for invalid parameters | ||
| if (thisStart < 0 || start < 0 || length < 0) { | ||
| return false; | ||
| } | ||
|
|
||
| // Check that the regions are long enough | ||
| if (srcLen < length || otherLen < length) { | ||
| return false; | ||
| } | ||
|
|
||
| while (tmpLen-- > 0) { | ||
| final char c1 = cs.charAt(index1++); | ||
| final char c2 = substring.charAt(index2++); | ||
|
|
||
| if (c1 == c2) { | ||
| continue; | ||
| } | ||
|
|
||
| if (!ignoreCase) { | ||
| return false; | ||
| } | ||
|
|
||
| // The real same check as in String#regionMatches(boolean, int, String, int, int): | ||
| final char u1 = Character.toUpperCase(c1); | ||
| final char u2 = Character.toUpperCase(c2); | ||
| if (u1 != u2 && Character.toLowerCase(u1) != Character.toLowerCase(u2)) { | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| /*- | ||
| * #%L | ||
| * TwinColGrid add-on | ||
| * %% | ||
| * Copyright (C) 2017 - 2025 Flowing Code | ||
| * %% | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * #L% | ||
| */ | ||
| package com.flowingcode.vaadin.addons.twincolgrid; | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| import lombok.experimental.UtilityClass; | ||
|
|
||
| @UtilityClass | ||
| class StringUtils { | ||
|
|
||
| public static boolean containsIgnoreCase(String str, String searchStr) { | ||
| if (str == null || searchStr == null) { | ||
| return false; | ||
| } | ||
| final int len = searchStr.length(); | ||
| final int max = str.length() - len; | ||
| for (int i = 0; i <= max; i++) { | ||
| if (CharSequenceUtils.regionMatches(str, true, i, searchStr, 0, len)) { | ||
| return true; | ||
| } | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| } |
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🧩 Analysis chain
🌐 Web query:
Jetty 11.0 Jakarta Servlet 6.0 compatibility💡 Result:
Short answer: Jetty 11 implements Jakarta Servlet 5.0 — it is not compatible with Jakarta Servlet 6.0. For Servlet 6.0 support you must use Jetty 12 (or later). [1][2]
Notes:
Sources:
🌐 Web query:
Jetty 12 Jakarta Servlet API version requirements💡 Result:
Short answer — Jetty 12 itself is servlet‑API agnostic; servlet support is provided by separate "EE environments." Jetty 12 ships/works with these environments and Servlet API versions:
Note: Jetty 12.1 adds Jakarta EE 11 / Jakarta Servlet 6.1 support if you need that. [4]
References: Jetty docs and release notes. [1] https://jetty.org/docs/jetty/12/index.html [2] https://webtide.com/introducing-jetty-12/ [3] https://jetty.org/docs/jetty/12/programming-guide/server/http.html [4] https://jetty.org/docs/jetty/12.1/programming-guide/migration/12.0-to-12.1.html
Jetty 11.x is incompatible with Jakarta Servlet 6.0 — upgrade to Jetty 12.x.
Jetty 11 supports only Jakarta Servlet 5.0 (Jakarta EE 9), but the pom.xml declares
jakarta.servlet-api:6.0.0(Jakarta EE 10). This mismatch will cause runtime failures. Use Jetty 12 with the ee10 modules for Jakarta Servlet 6.0 compatibility.Also applies to: 131-135, and the v25 profile (line 373+) which inherits the same jetty.version.
🤖 Prompt for AI Agents
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@coderabbitai Please create an issue about it, since we would have to apply the resolution in other add-ons.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🧩 Analysis chain
🏁 Script executed:
Length of output: 58
@javier-godoy I've created issue #207 to track the Jetty 12.x upgrade for Jakarta Servlet 6.0 compatibility:
🔗 https://github.com/FlowingCode/TwinColGridAddon/issues/207
The issue includes references to this PR and comment, and is assigned to you. It can serve as a tracking item for applying the same resolution across other FlowingCode add-ons.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Created https://github.com/FlowingCode/AddonsInternal/issues/142
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@javier-godoy Thank you for creating the broader tracking issue! That's the right approach to coordinate the Jetty 12.x upgrade across all affected add-ons. Issue #142 in AddonsInternal will ensure consistent resolution across the organization.