Skip to content

Commit fb4b294

Browse files
authored
Fix default operation timeout (#1408)
* fix default operation timeout * make CI not update CVD database on PR
1 parent 8be2b03 commit fb4b294

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

.github/workflows/maven-build-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,4 @@ jobs:
7070
OWASP_OSS_INDEX_USERNAME: ${{ secrets.OWASP_OSS_INDEX_USERNAME }}
7171
OWASP_OSS_INDEX_APIKEY: ${{ secrets.OWASP_OSS_INDEX_APIKEY }}
7272
run: |
73-
mvn org.owasp:dependency-check-maven:aggregate -P owasp --settings maven-ci-settings.xml -Ddependency-check.autoUpdate=false -B
73+
mvn org.owasp:dependency-check-maven:aggregate -P owasp --settings maven-ci-settings.xml -Dmaven.plugin.dependency-check.autoUpdate=false -B

model/src/main/java/de/fraunhofer/iosb/ilt/faaast/service/model/api/request/submodel/InvokeOperationRequest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import java.util.ArrayList;
2424
import java.util.List;
2525
import java.util.Objects;
26-
import javax.xml.datatype.DatatypeFactory;
2726
import javax.xml.datatype.Duration;
2827
import org.eclipse.digitaltwin.aas4j.v3.model.OperationVariable;
2928

@@ -35,7 +34,6 @@
3534
*/
3635
public abstract class InvokeOperationRequest<T extends Response> extends AbstractSubmodelInterfaceRequest<T> {
3736

38-
private static final Duration DEFAULT_TIMEOUT = DatatypeFactory.newDefaultInstance().newDuration(3000);
3937
protected String path;
4038
protected List<OperationVariable> inputArguments;
4139
protected List<OperationVariable> inoutputArguments;
@@ -50,7 +48,7 @@ protected InvokeOperationRequest() {
5048
this.path = "";
5149
this.inputArguments = new ArrayList<>();
5250
this.inoutputArguments = new ArrayList<>();
53-
this.timeout = DEFAULT_TIMEOUT;
51+
this.timeout = null;
5452
}
5553

5654

pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@
108108
<maven.plugin.central-publishing.version>0.10.0</maven.plugin.central-publishing.version>
109109
<maven.plugin.checkstyle.version>3.6.0</maven.plugin.checkstyle.version>
110110
<maven.plugin.compiler.version>3.15.0</maven.plugin.compiler.version>
111+
<maven.plugin.dependency-check.autoUpdate>true</maven.plugin.dependency-check.autoUpdate>
111112
<maven.plugin.dependency.version>3.10.0</maven.plugin.dependency.version>
112113
<maven.plugin.failsafe.version>3.5.5</maven.plugin.failsafe.version>
113114
<maven.plugin.git.commit.id.version>10.0.0</maven.plugin.git.commit.id.version>
@@ -226,6 +227,7 @@
226227
<configuration>
227228
<nvdApiKey>${env.NIST_NVD_API_KEY}</nvdApiKey>
228229
<failBuildOnCVSS>6</failBuildOnCVSS>
230+
<autoUpdate>${maven.plugin.dependency-check.autoUpdate}</autoUpdate>
229231
<suppressionFiles>
230232
<suppressionFile>owaspSuppressions.xml</suppressionFile>
231233
</suppressionFiles>

0 commit comments

Comments
 (0)