Skip to content

Commit cc69437

Browse files
committed
Tidy up JTL POMs
1 parent 47c85c6 commit cc69437

File tree

2 files changed

+46
-214
lines changed
  • log4j-layout-template-json-test
  • log4j-layout-template-json

2 files changed

+46
-214
lines changed

log4j-layout-template-json-test/pom.xml

Lines changed: 31 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,97 +27,105 @@
2727
</parent>
2828

2929
<artifactId>log4j-layout-template-json-test</artifactId>
30-
<name>Apache Log4j Layout for JSON template Tests</name>
31-
<description>Apache Log4j Layout for JSON template test.</description>
30+
<name>Apache Log4j JSON Template Layout tests</name>
3231

3332
<properties>
33+
3434
<docLabel>Log4j Layout for JSON Template Documentation</docLabel>
3535
<projectDir>/log4j-layout-template-json</projectDir>
36+
<maven.deploy.skip>true</maven.deploy.skip>
3637

3738
<!--
3839
~ OSGi and JPMS options
3940
-->
4041
<bnd-module-name>org.apache.logging.log4j.layout.template.json.test</bnd-module-name>
4142
<Fragment-Host>org.apache.logging.log4j.core</Fragment-Host>
43+
4244
</properties>
4345

4446
<dependencies>
45-
<dependency>
46-
<groupId>org.apache.logging.log4j</groupId>
47-
<artifactId>log4j-core</artifactId>
48-
</dependency>
47+
4948
<dependency>
5049
<groupId>org.apache.logging.log4j</groupId>
5150
<artifactId>log4j-layout-template-json</artifactId>
5251
</dependency>
52+
5353
<dependency>
5454
<groupId>org.jctools</groupId>
5555
<artifactId>jctools-core</artifactId>
56-
<optional>true</optional>
56+
<scope>test</scope>
5757
</dependency>
58+
5859
<dependency>
5960
<groupId>org.apache.logging.log4j</groupId>
6061
<artifactId>log4j-1.2-api</artifactId>
6162
<scope>test</scope>
6263
</dependency>
64+
6365
<dependency>
6466
<groupId>org.apache.logging.log4j</groupId>
6567
<artifactId>log4j-core-test</artifactId>
6668
<scope>test</scope>
6769
</dependency>
70+
6871
<dependency>
6972
<groupId>org.assertj</groupId>
7073
<artifactId>assertj-core</artifactId>
7174
<scope>test</scope>
7275
</dependency>
76+
7377
<dependency>
7478
<groupId>org.awaitility</groupId>
7579
<artifactId>awaitility</artifactId>
7680
<scope>test</scope>
7781
</dependency>
82+
7883
<dependency>
7984
<groupId>org.elasticsearch.client</groupId>
8085
<artifactId>elasticsearch-rest-high-level-client</artifactId>
8186
<scope>test</scope>
8287
</dependency>
88+
8389
<dependency>
8490
<groupId>com.fasterxml.jackson.core</groupId>
8591
<artifactId>jackson-databind</artifactId>
8692
<scope>test</scope>
8793
</dependency>
94+
8895
<dependency>
8996
<groupId>com.google.code.java-allocation-instrumenter</groupId>
9097
<artifactId>java-allocation-instrumenter</artifactId>
9198
<scope>test</scope>
9299
</dependency>
100+
93101
<dependency>
94102
<groupId>org.junit.jupiter</groupId>
95103
<artifactId>junit-jupiter-engine</artifactId>
96104
<scope>test</scope>
97105
</dependency>
106+
98107
<dependency>
99108
<groupId>org.junit.jupiter</groupId>
100109
<artifactId>junit-jupiter-params</artifactId>
101110
<scope>test</scope>
102111
</dependency>
112+
103113
<dependency>
104114
<groupId>co.elastic.logging</groupId>
105115
<artifactId>log4j2-ecs-layout</artifactId>
106116
<scope>test</scope>
107117
</dependency>
118+
108119
</dependencies>
109120

110121
<build>
111122
<plugins>
123+
124+
<!-- Modules that contain `log4j-core` plugins, must be compiled with: `org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor` -->
112125
<plugin>
113126
<groupId>org.apache.maven.plugins</groupId>
114127
<artifactId>maven-compiler-plugin</artifactId>
115128
<configuration>
116-
<!--
117-
~ Modules that contain `log4j-core` plugins, must be compiled with:
118-
~
119-
~ org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor
120-
-->
121129
<annotationProcessorPaths combine.children="append">
122130
<path>
123131
<groupId>org.apache.logging.log4j</groupId>
@@ -127,6 +135,7 @@
127135
</annotationProcessorPaths>
128136
</configuration>
129137
</plugin>
138+
130139
<!-- Disable ITs, which are Docker-dependent, by default. -->
131140
<plugin>
132141
<groupId>org.apache.maven.plugins</groupId>
@@ -143,6 +152,7 @@
143152
</execution>
144153
</executions>
145154
</plugin>
155+
146156
<plugin>
147157
<groupId>org.apache.maven.plugins</groupId>
148158
<artifactId>maven-surefire-plugin</artifactId>
@@ -158,17 +168,22 @@
158168
</systemPropertyVariables>
159169
</configuration>
160170
</plugin>
171+
161172
</plugins>
162173
</build>
163174

164175
<profiles>
165176
<profile>
177+
166178
<id>docker</id>
179+
167180
<activation>
168181
<activeByDefault>false</activeByDefault>
169182
</activation>
183+
170184
<build>
171185
<plugins>
186+
172187
<plugin>
173188
<groupId>io.fabric8</groupId>
174189
<artifactId>docker-maven-plugin</artifactId>
@@ -299,6 +314,7 @@
299314
</execution>
300315
</executions>
301316
</plugin>
317+
302318
<plugin>
303319
<groupId>org.apache.maven.plugins</groupId>
304320
<artifactId>maven-failsafe-plugin</artifactId>
@@ -316,8 +332,11 @@
316332
</execution>
317333
</executions>
318334
</plugin>
335+
319336
</plugins>
320337
</build>
338+
321339
</profile>
322340
</profiles>
341+
323342
</project>

0 commit comments

Comments
 (0)