Skip to content
This repository was archived by the owner on Sep 13, 2023. It is now read-only.

Commit 851b299

Browse files
lsimonslsimons
committed
Updating pom, cleaning up build, upgrading plugins.
1 parent 7d8ff68 commit 851b299

File tree

1 file changed

+17
-162
lines changed

1 file changed

+17
-162
lines changed

‎pom.xml‎

Lines changed: 17 additions & 162 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,7 @@
1818
<!--
1919
Usage notes:
2020
21-
To build NTEventLogAppender.dll using MinGW, place mingw\bin on path for Windows or install mingw
22-
package on other platforms. Build will execute gcc and windres on Windows and
23-
i586-mingw32msvc-gcc and i586-mingw32msvc-windres on other platforms.
24-
25-
To build NTEventLogAppender.dll using Microsoft tools, run the appropriate vcvars for the
26-
target platform and specify -Dntdll_target=msbuild on the mvn command line.
21+
Building of NTEventLogappender.dll is disabled. Use an older log4j to get it.
2722
2823
-->
2924
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -99,13 +94,14 @@ target platform and specify -Dntdll_target=msbuild on the mvn command line.
9994
<plugin>
10095
<groupId>org.apache.maven.plugins</groupId>
10196
<artifactId>maven-resources-plugin</artifactId>
97+
<version>3.2.0</version>
10298
<configuration>
10399
<encoding>UTF-8</encoding>
104100
</configuration>
105101
</plugin>
106102
<plugin>
107103
<artifactId>maven-surefire-plugin</artifactId>
108-
<version>2.5</version>
104+
<version>2.22.2</version>
109105
<configuration>
110106
<workingDirectory>tests</workingDirectory>
111107
<reportFormat>plain</reportFormat>
@@ -150,14 +146,14 @@ target platform and specify -Dntdll_target=msbuild on the mvn command line.
150146
<include>org/apache/log4j/RFATestCase.java</include>
151147
<include>org/apache/log4j/varia/ERFATestCase.java</include>
152148
<include>org/apache/log4j/net/SyslogAppenderTest</include>
153-
<include>org/apache/log4j/nt/NTEventLogAppenderTest</include>
149+
<!--<include>org/apache/log4j/nt/NTEventLogAppenderTest</include>-->
154150
<include>org/apache/log4j/net/SocketAppenderTest</include>
155151
</includes>
156152
</configuration>
157153
</plugin>
158154
<plugin>
159155
<artifactId>maven-compiler-plugin</artifactId>
160-
<version>2.1</version>
156+
<version>3.8.1</version>
161157
<configuration>
162158
<source>1.4</source>
163159
<target>1.4</target>
@@ -185,185 +181,44 @@ target platform and specify -Dntdll_target=msbuild on the mvn command line.
185181
</plugin>
186182
<plugin>
187183
<artifactId>maven-antrun-plugin</artifactId>
188-
<version>1.2</version>
184+
<version>3.0.0</version>
189185
<executions>
190-
<!-- generate NTEventLogAppender.dll -->
191-
<execution>
192-
<phase>process-classes</phase>
193-
<id>ntdll</id>
194-
<configuration>
195-
<tasks>
196-
<ant antfile="src/ntdll/build.xml" target="${ntdll_target}">
197-
<property name="target.dir" location="target" />
198-
<property name="classes.dir" location="target/classes" />
199-
<property name="src.dir" location="src/ntdll" />
200-
<property name="jni.include.dir" location="${java.home}/../include" />
201-
</ant>
202-
</tasks>
203-
</configuration>
204-
<goals>
205-
<goal>run</goal>
206-
</goals>
207-
</execution>
208-
<!-- create tests/output prior to test run -->
209-
<!--
210-
211-
TODO: several tests are run from tests/build.xml,
212-
for example longUnit
213-
214-
Refactor these tests to run with Surefire
215-
216-
217-
<execution>
218-
<phase>test-compile</phase>
219-
<id>mkdir_tests_output</id>
220-
<configuration>
221-
<tasks>
222-
<mkdir dir="tests/output" />
223-
</tasks>
224-
</configuration>
225-
<goals>
226-
<goal>run</goal>
227-
</goals>
228-
</execution>
229-
<execution>
230-
<phase>clean</phase>
231-
<id>rmdir_tests_output</id>
232-
<configuration>
233-
<tasks>
234-
<delete dir="tests/output" />
235-
<delete dir="tests/classes" />
236-
</tasks>
237-
</configuration>
238-
<goals>
239-
<goal>run</goal>
240-
</goals>
241-
</execution>
242-
<execution>
243-
<phase>test</phase>
244-
<id>runAll</id>
245-
<configuration>
246-
<tasks>
247-
<ant dir="tests" target="runAll">
248-
<property name="m2_repo" location="${m2_repo}" />
249-
<property name="log4j.jar" location="target/classes" />
250-
<property name="project.lib.home" location="target" />
251-
</ant>
252-
</tasks>
253-
</configuration>
254-
<goals>
255-
<goal>run</goal>
256-
</goals>
257-
</execution>
258-
-->
259186
<!-- release builds will put SVN tags into the SCM page, this changes it back to trunk -->
260187
<execution>
261188
<phase>site</phase>
262189
<id>untag-site</id>
263190
<configuration>
264-
<tasks>
191+
<target>
265192
<taskdef name="replaceregexp" classname="org.apache.tools.ant.taskdefs.optional.ReplaceRegExp" />
266193
<replaceregexp file="target/site/source-repository.html" match="/tags/[^ &quot;'&lt;]*"
267194
replace="/trunk" flags="g" />
268195
<replaceregexp match="-- Generated by (.*) on .*--" replace="-- Generated by \1 --" flags="g">
269196
<fileset dir="target/site/apidocs" includes="**/*.html" />
270197
</replaceregexp>
271-
</tasks>
198+
</target>
272199
</configuration>
273200
<goals>
274201
<goal>run</goal>
275202
</goals>
276203
</execution>
277-
278-
<!--
279-
280-
TODO: checks out a site from svn. Is that necessary?
281-
282-
<execution>
283-
<phase>post-site</phase>
284-
<id>post-site</id>
285-
<configuration>
286-
<tasks>
287-
<ant target="post-site" />
288-
</tasks>
289-
</configuration>
290-
<goals>
291-
<goal>run</goal>
292-
</goals>
293-
</execution>
294-
295-
-->
296-
297-
298-
<!--
299-
300-
TODO: this is doable from maven
301-
302-
<execution>
303-
<phase>site-deploy</phase>
304-
<id>site-deploy</id>
305-
<configuration>
306-
<tasks>
307-
<ant target="site-deploy" />
308-
</tasks>
309-
</configuration>
310-
<goals>
311-
<goal>run</goal>
312-
</goals>
313-
</execution>
314-
-->
315-
316204
<execution>
317205
<id>javadoc.resources</id>
318-
<phase>generate-sources</phase>
206+
<phase>pre-site</phase>
319207
<goals>
320208
<goal>run</goal>
321209
</goals>
322210
<configuration>
323-
<tasks>
211+
<target>
324212
<copy todir="${project.build.directory}/apidocs/META-INF">
325213
<fileset dir="${basedir}">
326214
<include name="LICENSE" />
327215
<include name="NOTICE" />
328216
</fileset>
329217
</copy>
330-
</tasks>
218+
</target>
331219
</configuration>
332220
</execution>
333221
</executions>
334-
<dependencies>
335-
<dependency>
336-
<groupId>ant</groupId>
337-
<artifactId>ant-nodeps</artifactId>
338-
<version>1.6.5</version>
339-
</dependency>
340-
<dependency>
341-
<groupId>ant-contrib</groupId>
342-
<artifactId>ant-contrib</artifactId>
343-
<version>1.0b2</version>
344-
</dependency>
345-
<dependency>
346-
<groupId>ant</groupId>
347-
<artifactId>ant-junit</artifactId>
348-
<version>1.6.5</version>
349-
</dependency>
350-
<dependency>
351-
<groupId>junit</groupId>
352-
<artifactId>junit</artifactId>
353-
<version>3.8.1</version>
354-
<scope>compile</scope>
355-
</dependency>
356-
<!--
357-
does not seem to be needed if not rebuilding .dll
358-
359-
<dependency>
360-
<groupId>sun.jdk</groupId>
361-
<artifactId>tools</artifactId>
362-
<version>1.4.2</version>
363-
<scope>system</scope>
364-
<systemPath>${tools.jar}</systemPath>
365-
</dependency>-->
366-
</dependencies>
367222
</plugin>
368223
<plugin>
369224
<artifactId>maven-assembly-plugin</artifactId>
@@ -381,11 +236,10 @@ target platform and specify -Dntdll_target=msbuild on the mvn command line.
381236
</goals>
382237
</execution>
383238
</executions>
384-
385239
</plugin>
386240
<plugin>
387241
<artifactId>maven-javadoc-plugin</artifactId>
388-
<version>2.7</version>
242+
<version>3.3.1</version>
389243
<configuration>
390244
<docfilessubdirs>true</docfilessubdirs>
391245
<excludedocfilessubdir>.svn</excludedocfilessubdir>
@@ -452,7 +306,7 @@ target platform and specify -Dntdll_target=msbuild on the mvn command line.
452306
<plugin>
453307
<groupId>org.apache.felix</groupId>
454308
<artifactId>maven-bundle-plugin</artifactId>
455-
<version>2.1.0</version>
309+
<version>5.1.1</version>
456310
<extensions>true</extensions>
457311
<configuration>
458312
<instructions>
@@ -472,7 +326,10 @@ target platform and specify -Dntdll_target=msbuild on the mvn command line.
472326
</plugin>
473327
<plugin>
474328
<artifactId>maven-site-plugin</artifactId>
475-
<version>3.1</version>
329+
<version>3.9.1</version>
330+
<configuration>
331+
<templateFile>${basedir}/src/site/site-template.vm</templateFile>
332+
</configuration>
476333
<executions>
477334
<execution>
478335
<phase>package</phase>
@@ -534,7 +391,6 @@ target platform and specify -Dntdll_target=msbuild on the mvn command line.
534391
</os>
535392
</activation>
536393
<properties>
537-
<tools.jar>${java.home}/../Classes/classes.jar</tools.jar>
538394
<m2_repo>${user.home}/.m2/repository</m2_repo>
539395
<ntdll_target>build</ntdll_target>
540396
</properties>
@@ -545,7 +401,6 @@ target platform and specify -Dntdll_target=msbuild on the mvn command line.
545401
<activeByDefault>true</activeByDefault>
546402
</activation>
547403
<properties>
548-
<tools.jar>${java.home}/../lib/tools.jar</tools.jar>
549404
<m2_repo>${user.home}/.m2/repository</m2_repo>
550405
<ntdll_target>build</ntdll_target>
551406
</properties>

0 commit comments

Comments
 (0)