This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit dc287dc3e8813afff1062b9cbb01b1c9d0d1935d Author: jcouteau <couteau@codelutin.com> Date: Thu Jan 7 15:03:43 2021 +0100 :arrow_up: fixes #11132 : Permettre l'utilisation d'un Tomcat à jour --- faxtomail-ui-web/pom.xml | 16 +++--- .../WEB-INF/content/admin/import-archive-input.jsp | 2 +- .../main/webapp/WEB-INF/content/demand-detail.jsp | 6 +-- .../main/webapp/WEB-INF/content/search-input.jsp | 2 +- faxtomail-ui-web/src/main/webapp/WEB-INF/wro.xml | 31 ++++++++--- pom.xml | 60 +++++++++++++++++----- 6 files changed, 85 insertions(+), 32 deletions(-) diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index f0b86b73..e543b40c 100644 --- a/faxtomail-ui-web/pom.xml +++ b/faxtomail-ui-web/pom.xml @@ -211,13 +211,13 @@ </dependency> <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-jquery</artifactId> + <groupId>org.webjars</groupId> + <artifactId>jquery</artifactId> </dependency> <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-jquery-ui</artifactId> + <groupId>org.webjars</groupId> + <artifactId>jquery-ui</artifactId> </dependency> <dependency> @@ -247,13 +247,13 @@ </dependency> <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-angularjs</artifactId> + <groupId>org.webjars</groupId> + <artifactId>angularjs</artifactId> </dependency> <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-angular-ui-tree</artifactId> + <groupId>org.webjars</groupId> + <artifactId>angular-ui-tree</artifactId> </dependency> <dependency> diff --git a/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/import-archive-input.jsp b/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/import-archive-input.jsp index 0d265f7c..59b47f75 100644 --- a/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/import-archive-input.jsp +++ b/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/import-archive-input.jsp @@ -46,7 +46,7 @@ </div> <s:if test="importResult.getNbImportErrors() > 0"> - <s:url id="downloadErrorFile" value="download-import-archive-errorfile.action"> + <s:url var="downloadErrorFile" value="download-import-archive-errorfile.action"> <s:param name="fileName" value="%{importResult.errorFile.name}" /> </s:url> <div class="alert alert-danger"> diff --git a/faxtomail-ui-web/src/main/webapp/WEB-INF/content/demand-detail.jsp b/faxtomail-ui-web/src/main/webapp/WEB-INF/content/demand-detail.jsp index c95909f4..10578175 100644 --- a/faxtomail-ui-web/src/main/webapp/WEB-INF/content/demand-detail.jsp +++ b/faxtomail-ui-web/src/main/webapp/WEB-INF/content/demand-detail.jsp @@ -108,7 +108,7 @@ <li><span> <s:if test="#attachment.editedFileName != null"> <!-- edited attachment --> - <s:url id="editedAttachmentUrlId" value="attachment-download.action"> + <s:url var="editedAttachmentUrlId" value="attachment-download.action"> <s:param name="id" value="%{#attachment.topiaId}" /> <s:param name="original" value="false" /> </s:url> @@ -119,7 +119,7 @@ </s:else> <!-- original attachment --> - <s:url id="originalAttachmentUrlId" value="attachment-download.action"> + <s:url var="originalAttachmentUrlId" value="attachment-download.action"> <s:param name="id" value="%{#attachment.topiaId}" /> <s:param name="original" value="true" /> </s:url> @@ -146,7 +146,7 @@ <span class="margin-right-1-icon"><s:property value="#email.title"/></span> </s:if> <s:else> - <s:url id="detailUrlId" value="demand-detail.action"> + <s:url var="detailUrlId" value="demand-detail.action"> <s:param name="id" value="%{#email.topiaId}" /> </s:url> <s:a href="%{detailUrlId}" cssClass="fa fa-eye float-right" title="Ouvrir l'élément groupé"></s:a> diff --git a/faxtomail-ui-web/src/main/webapp/WEB-INF/content/search-input.jsp b/faxtomail-ui-web/src/main/webapp/WEB-INF/content/search-input.jsp index 60d5b63a..d7da02f9 100644 --- a/faxtomail-ui-web/src/main/webapp/WEB-INF/content/search-input.jsp +++ b/faxtomail-ui-web/src/main/webapp/WEB-INF/content/search-input.jsp @@ -70,7 +70,7 @@ <s:iterator value="results" var="result"> <tr> <td> - <s:url id="detailUrlId" value="demand-detail.action"> + <s:url var="detailUrlId" value="demand-detail.action"> <s:param name="id" value="%{topiaId}" /> </s:url> <s:a href="%{detailUrlId}"><span class="fa fa-eye"></span></s:a> diff --git a/faxtomail-ui-web/src/main/webapp/WEB-INF/wro.xml b/faxtomail-ui-web/src/main/webapp/WEB-INF/wro.xml index ea9172c2..fe6d0fc9 100644 --- a/faxtomail-ui-web/src/main/webapp/WEB-INF/wro.xml +++ b/faxtomail-ui-web/src/main/webapp/WEB-INF/wro.xml @@ -33,9 +33,28 @@ <js>classpath:META-INF/resources/webjars/angular-ui-sortable/0.12.7/sortable.min.js</js> </group> + <group name='webjar-jquery' abstract="true"> + <js>classpath:META-INF/resources/webjars/jquery/1.11.1/jquery.min.js</js> + </group> + + <group name='webjar-jquery-ui' abstract="true"> + <css>classpath:META-INF/resources/webjars/jquery-ui/1.11.1/jquery-ui.css</css> + <js>classpath:META-INF/resources/webjars/jquery-ui/1.11.1/jquery-ui.js</js> + <js>classpath:META-INF/resources/webjars/jquery-ui/1.11.1/jquery-ui.js</js> + </group> + + <group name='webjar-angular' abstract="true"> + <js>classpath:META-INF/resources/webjars/angularjs/1.2.25/angular.js</js> + </group> + + <group name='webjar-angular-ui-tree' abstract="true"> + <js>classpath:META-INF/resources/webjars/angular-ui-tree/2.1.4/angular-ui-tree.min.js</js> + <css>classpath:META-INF/resources/webjars/angular-ui-tree/2.1.4/angular-ui-tree.min.css</css> + </group> + <group name='webjar-angular-ui-bootstrap' abstract="true"> <group-ref>bootstrap</group-ref> - <group-ref>angular</group-ref> + <group-ref>webjar-angular</group-ref> <js>classpath:META-INF/resources/webjars/angular-ui-bootstrap/0.11.0/ui-bootstrap.js</js> <js>classpath:META-INF/resources/webjars/angular-ui-bootstrap/0.11.0/ui-bootstrap-tpls.js</js> </group> @@ -70,12 +89,12 @@ </group> <group name='faxtomail'> - <group-ref>jquery</group-ref> - <group-ref>jquery-ui</group-ref> + <group-ref>webjar-jquery</group-ref> + <group-ref>webjar-jquery-ui</group-ref> <group-ref>bootstrap</group-ref> - <group-ref>angular</group-ref> + <group-ref>webjar-angular</group-ref> <group-ref>webjar-angular-ui-bootstrap</group-ref> - <group-ref>angular-ui-tree</group-ref> + <group-ref>webjar-angular-ui-tree</group-ref> <group-ref>font-awesome</group-ref> <js>/js/faxtomail.js</js> </group> @@ -114,7 +133,7 @@ </group> <group name='faxtomail-detail-demand'> - <group-ref>angular-sanitize</group-ref> + <group-ref>webjar-angular-sanitize</group-ref> <js>/js/demand-detail.js</js> <css>/css/faxtomail.css</css> <css>/css/demand-detail.css</css> diff --git a/pom.xml b/pom.xml index 0fa6ada4..fafb2a72 100644 --- a/pom.xml +++ b/pom.xml @@ -120,7 +120,7 @@ <jaxxVersion>2.43</jaxxVersion> <!-- do not upgrade to 1.6.5-1 --> <swingXVersion>1.6.4</swingXVersion> - <struts2Version>2.5.20</struts2Version> + <struts2Version>2.5.26</struts2Version> <jqueryPluginVersion>3.7.1</jqueryPluginVersion> <bootstrapPluginVersion>2.0.0</bootstrapPluginVersion> <slf4jVersion>1.7.25</slf4jVersion> @@ -154,6 +154,8 @@ <animal.sniffer.skip>true</animal.sniffer.skip> + <cargoPluginVersion>1.7.1</cargoPluginVersion> + </properties> <repositories> @@ -577,9 +579,9 @@ </dependency> <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-jquery</artifactId> - <version>1.11.1-1</version> + <groupId>org.webjars</groupId> + <artifactId>jquery</artifactId> + <version>1.11.1</version> <scope>runtime</scope> </dependency> @@ -611,9 +613,9 @@ </dependency> <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-jquery-ui</artifactId> - <version>1.11.1-1</version> + <groupId>org.webjars</groupId> + <artifactId>jquery-ui</artifactId> + <version>1.11.1</version> <scope>runtime</scope> </dependency> @@ -651,9 +653,9 @@ </dependency> <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-angularjs</artifactId> - <version>1.2.25-1</version> + <groupId>org.webjars</groupId> + <artifactId>angularjs</artifactId> + <version>1.2.25</version> <scope>runtime</scope> </dependency> @@ -699,9 +701,9 @@ </dependency> <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-angular-ui-tree</artifactId> - <version>2.1.4-1</version> + <groupId>org.webjars</groupId> + <artifactId>angular-ui-tree</artifactId> + <version>2.1.4</version> <scope>runtime</scope> </dependency> @@ -879,6 +881,38 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-maven2-plugin</artifactId> + <version>${cargoPluginVersion}</version> + <configuration> + <container> + <containerId>tomcat8x</containerId> + <zipUrlInstaller> + <url>https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/9.0.41/tomcat-9.0.41.zip</url> + </zipUrlInstaller> + </container> + <configuration> + <type>standalone</type> + <properties> + <cargo.servlet.port>8080</cargo.servlet.port> + <cargo.start.jvmargs> + -Xmx2048m + -Xms2048m + -Xdebug + -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000 + -Xnoagent + -Djava.compiler=NONE + </cargo.start.jvmargs> + </properties> + </configuration> + <deployer> + </deployer> + <deployables> + <deployable type="war" file="target/ROOT.war" /> + </deployables> + </configuration> + </plugin> </plugins> <extensions> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.