Skip to content

Port pr 3901 to main with es version 9.1.5 #3951

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
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Port pr 3901 to main with es version 9.1.5 #3951

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2964c2f
Bump elasticsearch-java to version 9.x #3663
ramanathan1504 Aug 27, 2025
6291390
reverted back to elastic.version to 8.17.3 and add maven-toolchains-p…
ramanathan1504 Sep 5, 2025
9453ddc
#3663 Update elastic.version to 9.1.3 and add maven-toolchains-plugin…
ramanathan1504 Sep 6, 2025
df693d1
fix conflict
ramanathan1504 Sep 6, 2025
b5c1ec1
pom fix for conflict
ramanathan1504 Sep 12, 2025
7b5e0a9
pom fix for conflict
ramanathan1504 Sep 30, 2025
8001aa2
Remove redundant dependencies and changes
vy Oct 3, 2025
eeb557d
#3901 Refactor LogstashIT.java by removing unused constants and metho…
ramanathan1504 Oct 10, 2025
4f914bc
Update elastic.version to 9.1.5 in pom.xml
ramanathan1504 Oct 10, 2025
a4a3069
Refactor pom.xml by improving comment formatting and updating elastic…
ramanathan1504 Oct 10, 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
33 changes: 27 additions & 6 deletions log4j-layout-template-json-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
<sign.skip>true</sign.skip>

<!--
~ OSGi and JPMS options
-->
~ OSGi and JPMS options
-->
<bnd-module-name>org.apache.logging.log4j.layout.template.json.test</bnd-module-name>
<Fragment-Host>org.apache.logging.log4j.core</Fragment-Host>

Expand All @@ -49,7 +49,7 @@
2. The Docker image version of the ELK-stack

As of 2024-09-16, these all (Maven artifacts and Elastic products) get released with the same version. -->
<elastic.version>8.17.3</elastic.version>
<elastic.version>9.1.5</elastic.version>

</properties>

Expand Down Expand Up @@ -97,6 +97,13 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>elasticsearch-rest-client</artifactId>
<version>${elastic.version}</version>
<scope>test</scope>
</dependency>

<!-- Needed by elasticsearch-java for testing -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand All @@ -105,6 +112,13 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<version>${jackson2.test.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.google.code.java-allocation-instrumenter</groupId>
<artifactId>java-allocation-instrumenter</artifactId>
Expand All @@ -123,6 +137,13 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>co.elastic.logging</groupId>
<artifactId>log4j2-ecs-layout</artifactId>
<version>1.7.0</version>
<scope>test</scope>
</dependency>

</dependencies>

<build>
Expand Down Expand Up @@ -153,8 +174,8 @@
<id>docker</id>

<!--
~ Only the `ubuntu` CI runners have access to Docker
-->
~ Only the `ubuntu` CI runners have access to Docker
-->
<activation>
<os>
<family>linux</family>
Expand All @@ -172,7 +193,7 @@
<docker.verbose>false</docker.verbose>

<!-- `docker run elasticsearch:<TAG>` exists with code 137 due to insufficient memory.
We limit the used JVM memory to avoid this OOM failure. -->
We limit the used JVM memory to avoid this OOM failure. -->
<elastic.javaOpts>-Xms750m -Xmx750m</elastic.javaOpts>

</properties>
Expand Down