Skip to content
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.

Sign up for GitHub

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

Update bootstrap italia to version 2.8.7 #1143

Merged
merged 13 commits into from
Sep 13, 2024
Merged

Update bootstrap italia to version 2.8.7 #1143

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
db0f05a
update bootstrap italia to version 2.8.7
r1gm Sep 10, 2024
181af71
typo fix
r1gm Sep 10, 2024
d9c98f7
exclude dependency, use current wicket-bootstrap webjar version
r1gm Sep 10, 2024
410a67d
Bump org.webjars.npm:eonasdan__tempus-dominus from 6.9.9 to 6.9.10 (#…
dependabot[bot] Sep 13, 2024
ff7be79
Bump ch.qos.logback:logback-classic from 1.5.7 to 1.5.8 (#1141)
dependabot[bot] Sep 13, 2024
e2e9cf0
Bump jetty.version from 11.0.23 to 11.0.24 (#1139)
dependabot[bot] Sep 13, 2024
81e793f
Bump org.webjars:jquery-ui from 1.13.3 to 1.14.0 (#1140)
dependabot[bot] Sep 13, 2024
0c403ce
Bump org.apache.commons:commons-lang3 from 3.16.0 to 3.17.0 (#1137)
dependabot[bot] Sep 13, 2024
2c25f07
Bump maven-surefire-plugin.version from 3.4.0 to 3.5.0 (#1136)
dependabot[bot] Sep 13, 2024
ce1f068
Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.8.0 to 3.10…
dependabot[bot] Sep 13, 2024
5210837
Bump org.apache.maven.plugins:maven-failsafe-plugin from 3.4.0 to 3.5…
dependabot[bot] Sep 13, 2024
f5001e5
Bump org.mockito:mockito-core from 5.12.0 to 5.13.0 (#1133)
dependabot[bot] Sep 13, 2024
7c73d1c
Exclude org,webjars.npm:design-tokens-italia for bootstrap-italia theme
martin-g Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions bootstrap-themes/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
<name>bootstrap-themes</name>

<properties>
<bootstrap-italia.version>1.6.2</bootstrap-italia.version>
<splide.version>3.6.12</splide.version>
<bootstrap-italia.version>2.8.7</bootstrap-italia.version>
</properties>

<dependencies>
Expand All @@ -40,16 +39,21 @@
</dependency>

<dependency>
<groupId>org.webjars</groupId>
<groupId>org.webjars.npm</groupId>
<artifactId>bootstrap-italia</artifactId>
<version>${bootstrap-italia.version}</version>
<exclusions>
<exclusion> <!-- exclude dependency, because causing dependency conflict -->
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What kind of conflict does it cause ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Output :

Failed to execute goal on project wicket-bootstrap-themes: Could not resolve dependencies for project de.agilecoders.wicket:wicket-bootstrap-themes:bundle:7.0.7-SNAPSHOT: Failed to collect dependencies for de.agilecoders.wicket:wicket-bootstrap-themes:jar:7.0.7-SNAPSHOT: Could not resolve version conflict among [org.webjars.npm:bootstrap-italia:jar:2.8.7 -> org.webjars.npm:video.js:jar:[8.0.4,9.0.0-0) -> org.webjars.npm:m3u8-parser:jar:[7.1.0,8.0.0-0) -> org.webjars.npm:videojs__vhs-utils:jar:[3.0.5,4), org.webjars.npm:bootstrap-italia:jar:2.8.7 -> org.webjars.npm:video.js:jar:[8.0.4,9.0.0-0) -> org.webjars.npm:mpd-parser:jar:[1.2.2,2.0.0-0) -> org.webjars.npm:videojs__vhs-utils:jar:[4.0.0,5.0.0-0), org.webjars.npm:bootstrap-italia:jar:2.8.7 -> org.webjars.npm:video.js:jar:[8.0.4,9.0.0-0) -> org.webjars.npm:videojs__vhs-utils:jar:[4.0.0,5.0.0-0), org.webjars.npm:bootstrap-italia:jar:2.8.7 -> org.webjars.npm:video.js:jar:[8.0.4,9.0.0-0) -> org.webjars.npm:videojs__http-streaming:jar:3.13.1 -> org.webjars.npm:videojs__vhs-utils:jar:4.0.0, org.webjars.npm:bootstrap-italia:jar:2.8.7 -> org.webjars.npm:video.js:jar:[8.0.4,9.0.0-0) -> org.webjars.npm:aes-decrypter:jar:[4.0.1,5.0.0-0) -> org.webjars.npm:videojs__vhs-utils:jar:[3.0.5,4)] -> [Help 1]

<groupId>org.webjars.npm</groupId>
<artifactId>video.js</artifactId>
</exclusion>
<exclusion> <!-- exclude dependency, no versions availablet -->
<groupId>org.webjars.npm</groupId>
<artifactId>design-tokens-italia</artifactId>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How <artifactId>bootstrap-italia</artifactId> got promoted to Maven Central if its dependencies are not available ?!

Copy link
Contributor Author

@r1gm r1gm Sep 10, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Magic ?

Output :

Failed to execute goal on project wicket-bootstrap-themes: Could not resolve dependencies for project
 de.agilecoders.wicket:wicket-bootstrap-themes:bundle:7.0.7-SNAPSHOT: Failed to collect dependencies at 
org.webjars.npm:bootstrap-italia:jar:2.8.7 -> org.webjars.npm:design-tokens-italia:jar:[1.1.1,2.0.0-0): No versions 
available for org.webjars.npm:design-tokens-italia:jar:[1.1.1,2.0.0-0) within specified range -> [Help 1]

Try to add new webjar from https://www.webjars.org/ but failed

Deploy Log

Starting Deploy
The metadata was missing a required field: /repository/url

issue report created
italia/design-tokens-italia#5

</exclusion>
</exclusions>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we exclude bootstrap also ?, forcing bootstrap version using current wicket-bootstrap webjar version.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I think this is a good idea!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

</dependency>

<dependency>
<groupId>org.webjars</groupId>
<artifactId>splide</artifactId>
<version>${splide.version}</version>
</dependency>

</dependencies>

<build>
Expand Down
8 changes: 4 additions & 4 deletions ...rap-themes/src/main/java/de/agilecoders/wicket/themes/markup/html/italia/ItaliaTheme.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,16 @@ public ItaliaTheme() {
public List<HeaderItem> getDependencies() {
List<HeaderItem> references = new ArrayList<>();
references.add(
CssHeaderItem.forReference(new WebjarsCssResourceReference("splide/current/css/splide-core.min.css")));
CssHeaderItem.forReference(new WebjarsCssResourceReference("splidejs__splide/current/dist/css/splide-core.min.css")));
references.add(CssHeaderItem
.forReference(
new WebjarsCssResourceReference("bootstrap-italia/current/css/bootstrap-italia.min.css"))
new WebjarsCssResourceReference("bootstrap-italia/current/dist/css/bootstrap-italia.min.css"))
.setId(BOOTSTRAP_THEME_MARKUP_ID));
references.add(new PriorityHeaderItem(JavaScriptHeaderItem
.forReference(Application.get().getJavaScriptLibrarySettings().getJQueryReference())));
references.add(JavaScriptHeaderItem.forReference(new WebjarsJavaScriptResourceReference("splide/current/js/splide.js")));
references.add(JavaScriptHeaderItem.forReference(new WebjarsJavaScriptResourceReference("splidejs__splide/current/dist/js/splide.min.js")));

WebjarsJavaScriptResourceReference italiaJsReference = new WebjarsJavaScriptResourceReference("bootstrap-italia/current/js/bootstrap-italia.min.js");
WebjarsJavaScriptResourceReference italiaJsReference = new WebjarsJavaScriptResourceReference("bootstrap-italia/current/dist/js/bootstrap-italia.min.js");

CharSequence urlForJs = RequestCycle.get().urlFor(italiaJsReference, null);

Expand Down