Skip to content

Commit

Permalink
Merge pull request #162 from samply/release-7.6.1
Browse files Browse the repository at this point in the history
Release 7.6.1
  • Loading branch information
djuarezgf authored Mar 1, 2022
2 parents 265f904 + c68e285 commit d851780
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 1 deletion.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## [7.6.1 - 2022-02-28]
### Fixed
- Add Jersey 1 libraries for JSF 2

## [7.6.0 - 2022-02-25]
### Changed
- Use api key for the communication with cts instead of username and password
Expand Down
16 changes: 15 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</parent>

<artifactId>share-client</artifactId>
<version>7.6.0</version>
<version>7.6.1</version>
<packaging>war</packaging>

<name>Connector</name>
Expand Down Expand Up @@ -79,6 +79,7 @@
<omnifaces.version>1.14.1</omnifaces.version>
<simple-xml-safe.version>2.7.1</simple-xml-safe.version>
<jbcrypt.version>0.4</jbcrypt.version>
<jersey.version>1.19.4</jersey.version>

<!-- webjar dependencies -->
<jquery.version>3.6.0</jquery.version>
Expand Down Expand Up @@ -346,6 +347,19 @@
<version>${jbcrypt.version}</version>
</dependency>

<!--Jersey 1-->
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-servlet</artifactId>
<version>${jersey.version}</version>
</dependency>


<!--Webjars from webjars.org-->
<!-- Due to a dependency with the standard JSF (com.sun.faces), some of this bootstrap
libraries cannot be longer upgraded. Use another implementation of JSF or another frontend
Expand Down
1 change: 1 addition & 0 deletions src/main/webapp/WEB-INF/templates/globalTemplate.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<h:outputStylesheet library="webjars" name="font-awesome/5.15.4/css/fontawesome.min-jsf.css"/>
<h:outputStylesheet library="webjars" name="font-awesome/5.15.4/css/all-jsf.css" />
<h:outputStylesheet library="webjars" name="font-awesome/5.15.4/css/v4-shims.min-jsf.css" />
<h:outputStylesheet library="webjars" name="bootstrap/3.3.7-1/css/bootstrap-jsf.css"/>

<h:outputStylesheet name="webjars/lato/0.3.0/css/lato.min.css"/>
<h:outputStylesheet name="css/samply-share.css"/>
Expand Down
1 change: 1 addition & 0 deletions src/main/webapp/user/inquiries_list.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<ui:define name="additional-css">
<h:outputStylesheet library="webjars"
name="datatables/1.11.3/css/dataTables.bootstrap.min.css"/>
<h:outputStylesheet library="webjars" name="bootstrap/3.3.7-1/css/bootstrap-jsf.css"/>
</ui:define>

<ui:define name="additional-js">
Expand Down

0 comments on commit d851780

Please sign in to comment.