Skip to content

Commit fdacdeb

Browse files
author
Laurent Gougeon
committed
Using ant fixcrlf rather than using dos2unix command.
1 parent 10af43e commit fdacdeb

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

.devcontainer/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LABEL maintainer="[email protected]"
88
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive && \
99
apt-get -y install --no-install-recommends \
1010
make rpm binutils joe file apt-transport-https \
11-
ca-certificates curl ftp gnupg-agent software-properties-common awscli iputils-ping telnet dos2unix
11+
ca-certificates curl ftp gnupg-agent software-properties-common awscli iputils-ping telnet
1212

1313
# Configure awscli (s3)
1414
RUN mkdir /root/.aws

pom.xml

+7-9
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<packager.name>Laurent Gougeon</packager.name>
2121
<packager.email>[email protected]</packager.email>
2222
<packager.distribution>OpenPDS</packager.distribution>
23-
<build.number>24102024</build.number>
23+
<build.number>14052024</build.number>
2424
</properties>
2525
<licenses>
2626
<license>
@@ -91,19 +91,17 @@
9191
<plugin>
9292
<groupId>org.apache.maven.plugins</groupId>
9393
<artifactId>maven-antrun-plugin</artifactId>
94-
<version>3.0.0</version>
94+
<version>3.1.0</version>
9595
<executions>
9696
<execution>
9797
<id>convert-eol</id>
9898
<phase>prepare-package</phase>
9999
<configuration>
100-
<tasks>
101-
<exec executable="dos2unix">
102-
<arg value="etc/master/sh/*" />
103-
<arg value="etc/monitor/sh/*" />
104-
<arg value="etc/mover/sh/*" />
105-
</exec>
106-
</tasks>
100+
<target>
101+
<fixcrlf
102+
srcdir="etc"
103+
eol="unix" includes="**/sh/*" />
104+
</target>
107105
</configuration>
108106
<goals>
109107
<goal>run</goal>

0 commit comments

Comments
 (0)