diff --git a/domismp-tests/domismp-tests-api/pom.xml b/domismp-tests/domismp-tests-api/pom.xml
index 9a27828ab7240c34eda94dadc49102e6f0b286d9..4b4fcf90620f0a411e68feb60f8078e771209155 100644
--- a/domismp-tests/domismp-tests-api/pom.xml
+++ b/domismp-tests/domismp-tests-api/pom.xml
@@ -16,11 +16,11 @@
<!-- the soap ui specific dependencies -->
<plugin.soapui-maven-plugin.version>5.7.2</plugin.soapui-maven-plugin.version>
- <plugin.maven-compiler-plugin.version>3.11.0</plugin.maven-compiler-plugin.version>
- <plugin.dependency-check-maven.version>9.0.7</plugin.dependency-check-maven.version>
+ <plugin.maven-compiler-plugin.version>3.13.0</plugin.maven-compiler-plugin.version>
+ <plugin.dependency-check-maven.version>9.2.0</plugin.dependency-check-maven.version>
<org.codehaus.groovy.version>2.9.2-01</org.codehaus.groovy.version>
- <org.codehaus.groovy.eclipse-batch.version>2.5.13-01</org.codehaus.groovy.eclipse-batch.version>
+ <org.codehaus.groovy.eclipse-batch.version>2.5.22-01</org.codehaus.groovy.eclipse-batch.version>
<com.jgoodies.version>1.0.7</com.jgoodies.version>
<http-builder.version>0.7.1</http-builder.version>
diff --git a/pom.xml b/pom.xml
index 6541db64ce0be5a7031d1108010b6c2a82f84c5e..4249974e2178e9087aa19c8feaf154e4d2b1cd33 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,24 +51,24 @@ See the Licence for the specific language governing permissions and limitations
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <edelivery.ssl-auth.version>1.15</edelivery.ssl-auth.version>
+ <edelivery.ssl-auth.version>1.16-SNAPSHOT</edelivery.ssl-auth.version>
<edelivery.dynamic-discovery-client.version>2.3</edelivery.dynamic-discovery-client.version>
<bdmsl-api.version>4.3</bdmsl-api.version>
<!-- plugin versions -->
- <maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
+ <maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
<plugin.dependency-check-maven.version>10.0.4</plugin.dependency-check-maven.version>
<plugin.jacoco-maven-plugin.version>0.8.11</plugin.jacoco-maven-plugin.version>
<plugin.license-maven-plugin.version>2.4.0</plugin.license-maven-plugin.version>
<plugin.maven-antrun-plugin.version>3.1.0</plugin.maven-antrun-plugin.version>
- <plugin.maven-assembly-plugin.version>3.6.0</plugin.maven-assembly-plugin.version>
- <plugin.maven-clean-plugin.version>3.3.2</plugin.maven-clean-plugin.version>
+ <plugin.maven-assembly-plugin.version>3.7.1</plugin.maven-assembly-plugin.version>
+ <plugin.maven-clean-plugin.version>3.4.0</plugin.maven-clean-plugin.version>
<plugin.maven-compiler-plugin.version>3.13.0</plugin.maven-compiler-plugin.version>
- <plugin.maven-dependency-plugin.version>3.6.1</plugin.maven-dependency-plugin.version>
- <plugin.maven-failsafe-plugin.version>3.1.2</plugin.maven-failsafe-plugin.version>
+ <plugin.maven-dependency-plugin.version>3.8.0</plugin.maven-dependency-plugin.version>
+ <plugin.maven-failsafe-plugin.version>3.5.1</plugin.maven-failsafe-plugin.version>
<plugin.maven-jar-plugin.version>3.3.0</plugin.maven-jar-plugin.version>
- <plugin.maven-release-plugin.version>3.0.1</plugin.maven-release-plugin.version>
+ <plugin.maven-release-plugin.version>3.1.1</plugin.maven-release-plugin.version>
<plugin.maven-resources-plugin.version>3.3.1</plugin.maven-resources-plugin.version>
- <plugin.maven-surefire-plugin.version>3.2.2</plugin.maven-surefire-plugin.version>
+ <plugin.maven-surefire-plugin.version>3.2.5</plugin.maven-surefire-plugin.version>
<plugin.maven-war-plugin.version>3.4.0</plugin.maven-war-plugin.version>
<aspectj.version>1.9.22.1</aspectj.version>
@@ -88,14 +88,14 @@ See the Licence for the specific language governing permissions and limitations
<hibernate.validator.version>7.0.5.Final</hibernate.validator.version>
<hibernate.version>5.6.15.Final</hibernate.version>
<httpclient.version>4.5.14</httpclient.version>
- <jackson.version>2.17.2</jackson.version>
+ <jackson.version>2.18.0</jackson.version>
<javaee-api.version>7.0</javaee-api.version>
<javax.annotation.version>1.3.2</javax.annotation.version>
<javax.mail.version>1.6.2</javax.mail.version>
<jaxb2-basics.version>1.11.1</jaxb2-basics.version>
<org.glassfish.jaxb.jaxb-runtime.version>2.3.9</org.glassfish.jaxb.jaxb-runtime.version>
<jakarta.xml.bind-api.version>2.3.3</jakarta.xml.bind-api.version>
- <junit-jupiter.version>5.11.0</junit-jupiter.version>
+ <junit-jupiter.version>5.11.2</junit-jupiter.version>
<junit-platform-surefire-provider.version>1.3.2</junit-platform-surefire-provider.version>
<junitparams.version>1.1.1</junitparams.version>
<!-- Use logback 1.2.x because is the one used by springboot 5.7. Changing to 1.3+ will break springboot logging. -->
@@ -104,11 +104,11 @@ See the Licence for the specific language governing permissions and limitations
<mysql.jdbc.version>8.4.0</mysql.jdbc.version>
<metro.version>2.2.1-1</metro.version>
<mockito.version>4.11.0</mockito.version>
- <jakarta.servlet-api.version>4.0.2</jakarta.servlet-api.version>
+ <jakarta.servlet-api.version>4.0.4</jakarta.servlet-api.version>
<spring-modules-jakarta-commons.version>0.8</spring-modules-jakarta-commons.version>
<spring-boot.version>2.7.18</spring-boot.version>
- <spring-boot.tomcat.version>9.0.95</spring-boot.tomcat.version>
+ <spring-boot.tomcat.version>9.0.96</spring-boot.tomcat.version>
<spring.security.version>5.8.14</spring.security.version>
<spring.version>5.3.39</spring.version>
<xmlunit.version>2.10.0</xmlunit.version>
@@ -141,8 +141,8 @@ See the Licence for the specific language governing permissions and limitations
**/*Types.java,
**/*Constants.java,
</sonar.coverage.exclusions>
- <!-- latest version compatible with SonarQube 5.6 is: 3.3.0.603-->
- <plugin.sonar-maven-plugin.version>3.5.0.1254</plugin.sonar-maven-plugin.version>
+
+ <plugin.sonar-maven-plugin.version>3.11.0.3922</plugin.sonar-maven-plugin.version>
<release.arguments>-Dmaven.javadoc.skip=true -Dmaven.test.skipTests=true -Dmaven.test.skip=true
</release.arguments>
<project.scm.id>edelivery-scm</project.scm.id>
diff --git a/smp-angular/src/app/common/dialogs/reference-document-dialog/reference-document-dialog.component.html b/smp-angular/src/app/common/dialogs/reference-document-dialog/reference-document-dialog.component.html
index 458142d968e8b15c9aa75d9704e9192f0586ae33..e697a7056af7386627430c823fb4c8f1b05e17eb 100644
--- a/smp-angular/src/app/common/dialogs/reference-document-dialog/reference-document-dialog.component.html
+++ b/smp-angular/src/app/common/dialogs/reference-document-dialog/reference-document-dialog.component.html
@@ -35,12 +35,13 @@
<mat-icon>search</mat-icon>
<span>{{ "reference.document.dialog.button.search" | translate }}</span>
</button>
- <button mat-raised-button id="resetbutton_id"
- [disabled]="filterForm"
+ <button mat-raised-button color="primary"
+ id="resetbutton_id"
+ [disabled]="!isDirty"
(click)="onResetButtonClicked()"
>
- <mat-icon>reset</mat-icon>
- <span>{{ "reference.document.dialog.button.reset" | translate }}</span>
+ <mat-icon>filter_alt_off</mat-icon>
+ <span>{{ "reference.document.dialog.button.reset.filters" | translate }}</span>
</button>
</mat-toolbar-row>
</div>
@@ -58,7 +59,7 @@
<!-- Weight Column -->
<ng-container matColumnDef="resourceScheme">
<th mat-header-cell
- *matHeaderCellDef>{{ "reference.document.dialog.column.resource.value" | translate }}
+ *matHeaderCellDef>{{ "reference.document.dialog.column.resource.scheme" | translate }}
</th>
<td mat-cell *matCellDef="let row">{{ row.resourceScheme }}</td>
</ng-container>
diff --git a/smp-angular/src/app/resource-search/resource-search.component.html b/smp-angular/src/app/resource-search/resource-search.component.html
index ed5a1c1ddc5aa581b22ac05af3938b0847aad8d7..42a2406faa1f7495bbbf438a5d63a4d715176039 100644
--- a/smp-angular/src/app/resource-search/resource-search.component.html
+++ b/smp-angular/src/app/resource-search/resource-search.component.html
@@ -1,5 +1,5 @@
<smp-search-table #searchTable
- page_id='search_id'
+ id='search_id'
[title]="'resource.search.title' | translate"
[columnPicker]="columnPicker"
[url]="baseUrl"
@@ -59,8 +59,8 @@
<ng-template #additionalSearchAreaButtons>
<button mat-raised-button color="primary" (click)="clearFilters()" id="clearallbutton_id">
- <mat-icon>search</mat-icon>
- <span>{{ "resource.search.button.clear.all" | translate }}</span>
+ <mat-icon>filter_alt_off</mat-icon>
+ <span>{{ "resource.search.button.reset.filters" | translate }}</span>
</button>
</ng-template>
diff --git a/smp-angular/src/app/user-settings/user-access-tokens/access-token-panel/access-token-panel.component.html b/smp-angular/src/app/user-settings/user-access-tokens/access-token-panel/access-token-panel.component.html
index 65e3e708dbceac65c84fad0566c3dc0b2483cd71..3a0c1ae3c913fa7a75445a73c203598411ac4251 100644
--- a/smp-angular/src/app/user-settings/user-access-tokens/access-token-panel/access-token-panel.component.html
+++ b/smp-angular/src/app/user-settings/user-access-tokens/access-token-panel/access-token-panel.component.html
@@ -74,7 +74,7 @@
[for]="picker"></mat-datepicker-toggle>
<mat-date-range-picker #picker></mat-date-range-picker>
<smp-field-error
- *ngIf="credentialForm.controls.activeFrom.hasError('matStartDateInvalid') || credentialForm.controls.activeFrom.hasError('required')">{{ "access.token.panel.error.invalid.start.date" | translate }}
+ *ngIf="credentialForm.controls.activeFrom.hasError('required')">{{ "access.token.panel.error.invalid.start.date" | translate }}
</smp-field-error>
<smp-field-error
*ngIf="credentialForm.controls.expireOn.hasError('matEndDateInvalid') || credentialForm.controls.expireOn.hasError('required')">{{ "access.token.panel.error.invalid.end.date" | translate }}
diff --git a/smp-angular/src/app/user-settings/user-access-tokens/access-token-panel/access-token-panel.component.ts b/smp-angular/src/app/user-settings/user-access-tokens/access-token-panel/access-token-panel.component.ts
index 285eb0024c1649fd2a03a697165bceda2795a7e9..a2d861aa76ea8eba95971dab72bbcc81647ed304 100644
--- a/smp-angular/src/app/user-settings/user-access-tokens/access-token-panel/access-token-panel.component.ts
+++ b/smp-angular/src/app/user-settings/user-access-tokens/access-token-panel/access-token-panel.component.ts
@@ -10,19 +10,6 @@ import {BeforeLeaveGuard} from "../../../window/sidenav/navigation-on-leave-guar
import {GlobalLookups} from "../../../common/global-lookups";
-export function notAfterCurrentDateValidator(): ValidatorFn {
- return (control: AbstractControl): { [key: string]: any } | null => {
- let date = control.value;
- if (date) {
- // make date mutable and the modification
- date = new Date(date);
- date.setHours(0, 0, 0, 0);
- }
- const forbidden = date && date > Date.now();
-
- return forbidden ? { 'matStartDateInvalid': { value: control.value } } : null;
- };
-}
export function notBeforeCurrentDateValidator(): ValidatorFn {
return (control: AbstractControl): { [key: string]: any } | null => {
@@ -62,7 +49,7 @@ export class AccessTokenPanelComponent implements BeforeLeaveGuard {
'name': new FormControl({value: '', disabled: true}),
'active': new FormControl({value: '', disabled: false}),
'description': new FormControl({value: '', disabled: false}),
- 'activeFrom': new FormControl({value: '', disabled: false}, [notAfterCurrentDateValidator()]),
+ 'activeFrom': new FormControl({value: '', disabled: false} ),
'expireOn': new FormControl({value: '', disabled: false}, [notBeforeCurrentDateValidator()])
});
diff --git a/smp-angular/src/assets/i18n/en.json b/smp-angular/src/assets/i18n/en.json
index e69bc9093e1e047c950336301d71453e08f45c40..2abfd49534e049a63666ff41ea163728482c7d27 100644
--- a/smp-angular/src/assets/i18n/en.json
+++ b/smp-angular/src/assets/i18n/en.json
@@ -455,7 +455,7 @@
"reference.document.dialog.button.save": "Save",
"reference.document.dialog.button.select": "Set selected document as reference",
"reference.document.dialog.label.select.page": "Page",
- "reference.document.dialog.button.reset": "Reset",
+ "reference.document.dialog.button.reset.filters": "Reset filters",
"review.edit.dialog.title": "Review tasks details",
"review.edit.panel.label.review": "Review",
@@ -568,7 +568,7 @@
"login.title.sso.login": "SSO Login:",
"login.success.confirmation.email.sent": "A confirmation email has been sent to your registered email address for user [{{userId}}]. Please follow the instructions in the email to complete the account reset process. If you did not receive mail try later or contact administrator",
- "resource.search.button.clear.all": "Clear All",
+ "resource.search.button.reset.filters": "Reset filters",
"resource.search.error.fetch.resource.metadata": "Error occurred while retrieving the resource metadata",
"resource.search.label.document.type": "Document Type",
"resource.search.label.domain": "Domain",
diff --git a/smp-examples/resource-spi-example/pom.xml b/smp-examples/resource-spi-example/pom.xml
index 9683404a07032d2675808f748c7b5a36e235c941..24eb0d5e3838f7b8284408c02cdc155b6806e824 100644
--- a/smp-examples/resource-spi-example/pom.xml
+++ b/smp-examples/resource-spi-example/pom.xml
@@ -22,7 +22,7 @@
</parent>
<properties>
<maven.deploy.skip>false</maven.deploy.skip>
- <org.glassfish.jaxb.jaxb-runtime.version>2.3.8</org.glassfish.jaxb.jaxb-runtime.version>
+ <org.glassfish.jaxb.jaxb-runtime.version>2.3.9</org.glassfish.jaxb.jaxb-runtime.version>
<jakarta.xml.bind-api.version>2.3.3</jakarta.xml.bind-api.version>
</properties>
<artifactId>resource-spi-example</artifactId>
diff --git a/smp-resource-extensions/oasis-cppa3-spi/pom.xml b/smp-resource-extensions/oasis-cppa3-spi/pom.xml
index ae13cc3e1bc218c74978712dbeaa69b00101b828..c3a7a1b8b67eee2fb92d601cc68fae979ad7f078 100644
--- a/smp-resource-extensions/oasis-cppa3-spi/pom.xml
+++ b/smp-resource-extensions/oasis-cppa3-spi/pom.xml
@@ -22,7 +22,7 @@
</parent>
<properties>
<maven.deploy.skip>false</maven.deploy.skip>
- <org.glassfish.jaxb.jaxb-runtime.version>2.3.8</org.glassfish.jaxb.jaxb-runtime.version>
+ <org.glassfish.jaxb.jaxb-runtime.version>2.3.9</org.glassfish.jaxb.jaxb-runtime.version>
<jakarta.xml.bind-api.version>2.3.3</jakarta.xml.bind-api.version>
</properties>
<artifactId>oasis-cppa3-spi</artifactId>