Skip to content

SED-4408 updates/consistent versions everywhere #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cl-exense wants to merge 3 commits into
base: master
Choose a base branch
from
Open

SED-4408 updates/consistent versions everywhere #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0bfc077
SED-4408 Add upper bounds version enforcement
cl-exense Nov 28, 2025
d27ec7b
SED-4408 Increase delays because of test failures on build server
cl-exense Nov 28, 2025
8a6c9f2
SED-4408 bump deps
cl-exense Dec 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 43 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@
<maven.compiler.release>11</maven.compiler.release>

<!-- internal dependencies -->
<dependencies.version>2025.6.25</dependencies.version>
<exense-commons.version>2.1.0</exense-commons.version>
<step-api.version>1.5.0</step-api.version>
<dependencies.version>2025.11.28-6929c90d11ea7b7be5b14369</dependencies.version>
<exense-commons.version>2025.12.2-692eafc711ea7b7be5aeb998</exense-commons.version>
<step-api.version>2025.12.2-692eb36d11ea7b7be5bb841e</step-api.version>

<!-- maven build dependencies -->
<dep.mvn.jacoco.version>0.8.12</dep.mvn.jacoco.version>
Expand All @@ -69,6 +69,7 @@
<dep.mvn.surefire.version>2.19.1</dep.mvn.surefire.version>
<dep.mvn.source.version>3.0.1</dep.mvn.source.version>
<dep.mvn.gpg.version>1.6</dep.mvn.gpg.version>
<dep.mvn.enforcer.version>3.1.0</dep.mvn.enforcer.version>
<dep.mvn.dependency-check.version>9.2.0</dep.mvn.dependency-check.version>

</properties>
Expand Down Expand Up @@ -114,7 +115,7 @@

<dependency>
<groupId>ch.exense.dependencies</groupId>
<artifactId>dependencies-guava</artifactId>
<artifactId>dependencies-google</artifactId>
<version>${dependencies.version}</version>
<type>pom</type>
<scope>import</scope>
Expand Down Expand Up @@ -284,6 +285,11 @@
<artifactId>jacoco-maven-plugin</artifactId>
<version>${dep.mvn.jacoco.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>${dep.mvn.enforcer.version}</version>
</plugin>
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
Expand All @@ -292,6 +298,28 @@
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-policies</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireUpperBoundDeps>
<excludes>
<exclude>jakarta.xml.bind:jakarta.xml.bind-api</exclude>
</excludes>
</requireUpperBoundDeps>
</rules>
<fail>true</fail>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
Expand Down Expand Up @@ -373,6 +401,17 @@
</activation>
<!-- Local compilation - no signature -->
</profile>

<profile>
<id>SkipJavadoc</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
</properties>
</profile>

<profile>
<id>DependencyCheck</id>
<activation>
Expand Down
6 changes: 3 additions & 3 deletions step-grid-tests/src/test/java/step/grid/agent/AgentTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,15 +158,15 @@ public void testInterruption() throws Exception {

private void testInterruption(boolean createSession) throws Exception {
TokenWrapper token = client.getTokenHandle(null, Map.of(), createSession);
// Interrupt the execution in 4s. We have to wait that long because the start of the execution may take some time with the forked agent
CompletableFuture.delayedExecutor(4000, TimeUnit.MILLISECONDS).execute(() -> {
// Interrupt the execution in 7s. We have to wait that long because the start of the execution may take some time with the forked agent
CompletableFuture.delayedExecutor(7000, TimeUnit.MILLISECONDS).execute(() -> {
try {
client.interruptTokenExecution(token.getID());
} catch (GridClientException | AbstractGridClientImpl.AgentCommunicationException e) {
throw new RuntimeException(e);
}
});
JsonNode o = new ObjectMapper().createObjectNode().put("delay", 5000);
JsonNode o = new ObjectMapper().createObjectNode().put("delay", 10000);
try {
OutputMessage outputMessage = client.call(token.getID(), o, TestTokenHandler.class.getName(), null, null, 10_000);
Assert.assertEquals("{\"status\":\"interrupted\"}", outputMessage.getPayload().toString());
Expand Down