Skip to content

Commit

Permalink
UBO-372 Replace chosen with bootstrap-select
Browse files Browse the repository at this point in the history
  • Loading branch information
fluetze authored and kkrebs committed Nov 29, 2024
1 parent e4b4a5c commit a310259
Show file tree
Hide file tree
Showing 15 changed files with 105 additions and 470 deletions.
12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
<properties>
<MCR.AppName>ubo</MCR.AppName>
<axis1.version>1.4</axis1.version>
<bootstrap-select.version>1.13.18</bootstrap-select.version>
<bootstrap.version>4.4.1</bootstrap.version>
<chosen.version>1.8.7</chosen.version>
<font-awesome.version>5.13.0</font-awesome.version>
<jakarta.activation.version>2.0.1</jakarta.activation.version>
<jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
Expand Down Expand Up @@ -362,6 +362,11 @@
<artifactId>bootstrap</artifactId>
<version>${bootstrap.version}</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>bootstrap-select</artifactId>
<version>${bootstrap-select.version}</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>font-awesome</artifactId>
Expand All @@ -382,11 +387,6 @@
<artifactId>jquery-ui</artifactId>
<version>${jquery.ui.version}</version>
</dependency>
<dependency>
<groupId>org.webjars.npm</groupId>
<artifactId>chosen-js</artifactId>
<version>${chosen.version}</version>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
Expand Down
23 changes: 9 additions & 14 deletions ubo-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,11 @@
<configuration>
<target>
<echo append="true" file="${project.build.directory}/classes/config/${artifactId}/mycore.properties"># generated by ubo-common/pom.xml
UBO.Frontend.jquery.version = ${jquery.version}
UBO.Frontend.jquery-ui.version = ${jquery.ui.version}
UBO.Frontend.chosen.version = ${chosen.version}
UBO.Frontend.bootstrap.version = ${bootstrap.version}
UBO.Frontend.font-awesome.version = ${font-awesome.version}</echo>
UBO.Frontend.jquery.version = ${jquery.version}
UBO.Frontend.jquery-ui.version = ${jquery.ui.version}
UBO.Frontend.bootstrap.version = ${bootstrap.version}
UBO.Frontend.bootstrap-select.version = ${bootstrap-select.version}
UBO.Frontend.font-awesome.version = ${font-awesome.version}</echo>
</target>
</configuration>
</execution>
Expand Down Expand Up @@ -374,27 +374,22 @@
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>font-awesome</artifactId>
<artifactId>bootstrap-select</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>highcharts</artifactId>
<artifactId>font-awesome</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>jquery</artifactId>
<artifactId>highcharts</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>jquery-ui</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.webjars.npm</groupId>
<artifactId>chosen-js</artifactId>
<artifactId>jquery</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
Expand Down
Binary file not shown.
Loading

0 comments on commit a310259

Please sign in to comment.