| ... |
... |
@@ -23,7 +23,7 @@ |
|
23
|
23
|
<parent>
|
|
24
|
24
|
<groupId>io.ultreia.maven</groupId>
|
|
25
|
25
|
<artifactId>pom</artifactId>
|
|
26
|
|
- <version>2022.98</version>
|
|
|
26
|
+ <version>2022.101</version>
|
|
27
|
27
|
</parent>
|
|
28
|
28
|
<groupId>fr.ird.observe</groupId>
|
|
29
|
29
|
<artifactId>ird-observe</artifactId>
|
| ... |
... |
@@ -169,17 +169,6 @@ |
|
169
|
169
|
</properties>
|
|
170
|
170
|
<dependencyManagement>
|
|
171
|
171
|
<dependencies>
|
|
172
|
|
- <dependency>
|
|
173
|
|
- <groupId>net.sourceforge.saxon</groupId>
|
|
174
|
|
- <artifactId>saxon</artifactId>
|
|
175
|
|
- <version>${lib.version.saxon}</version>
|
|
176
|
|
- </dependency>
|
|
177
|
|
- <dependency>
|
|
178
|
|
- <groupId>net.sourceforge.saxon</groupId>
|
|
179
|
|
- <artifactId>saxon</artifactId>
|
|
180
|
|
- <version>${lib.version.saxon}</version>
|
|
181
|
|
- <classifier>dom</classifier>
|
|
182
|
|
- </dependency>
|
|
183
|
172
|
<dependency>
|
|
184
|
173
|
<groupId>com.esotericsoftware.yamlbeans</groupId>
|
|
185
|
174
|
<artifactId>yamlbeans</artifactId>
|
| ... |
... |
@@ -264,13 +253,23 @@ |
|
264
|
253
|
<groupId>commons-beanutils</groupId>
|
|
265
|
254
|
<artifactId>commons-beanutils</artifactId>
|
|
266
|
255
|
<version>${lib.version.commons-beanutils}</version>
|
|
|
256
|
+ <exclusions>
|
|
|
257
|
+ <exclusion>
|
|
|
258
|
+ <groupId>commons-collections</groupId>
|
|
|
259
|
+ <artifactId>commons-collections</artifactId>
|
|
|
260
|
+ </exclusion>
|
|
|
261
|
+ </exclusions>
|
|
|
262
|
+ </dependency>
|
|
|
263
|
+ <dependency>
|
|
|
264
|
+ <groupId>commons-codec</groupId>
|
|
|
265
|
+ <artifactId>commons-codec</artifactId>
|
|
|
266
|
+ <version>${lib.version.commons-codec}</version>
|
|
267
|
267
|
</dependency>
|
|
268
|
268
|
<!--We don't use it, but we want to use only one version-->
|
|
269
|
269
|
<dependency>
|
|
270
|
270
|
<groupId>commons-collections</groupId>
|
|
271
|
271
|
<artifactId>commons-collections</artifactId>
|
|
272
|
|
- <!-- <version>3.2.2</version>-->
|
|
273
|
|
- <version>20040616</version>
|
|
|
272
|
+ <version>3.2.2</version>
|
|
274
|
273
|
</dependency>
|
|
275
|
274
|
<dependency>
|
|
276
|
275
|
<groupId>commons-configuration</groupId>
|
| ... |
... |
@@ -409,7 +408,12 @@ |
|
409
|
408
|
</dependency>
|
|
410
|
409
|
<dependency>
|
|
411
|
410
|
<groupId>io.ultreia.java4all.http</groupId>
|
|
412
|
|
- <artifactId>http-maven-plugin</artifactId>
|
|
|
411
|
+ <artifactId>http-spi</artifactId>
|
|
|
412
|
+ <version>${lib.version.java4all.http}</version>
|
|
|
413
|
+ </dependency>
|
|
|
414
|
+ <dependency>
|
|
|
415
|
+ <groupId>io.ultreia.java4all.http</groupId>
|
|
|
416
|
+ <artifactId>http-spi-processor</artifactId>
|
|
413
|
417
|
<version>${lib.version.java4all.http}</version>
|
|
414
|
418
|
</dependency>
|
|
415
|
419
|
<dependency>
|
| ... |
... |
@@ -507,6 +511,17 @@ |
|
507
|
511
|
</exclusion>
|
|
508
|
512
|
</exclusions>
|
|
509
|
513
|
</dependency>
|
|
|
514
|
+ <dependency>
|
|
|
515
|
+ <groupId>net.sourceforge.saxon</groupId>
|
|
|
516
|
+ <artifactId>saxon</artifactId>
|
|
|
517
|
+ <version>${lib.version.saxon}</version>
|
|
|
518
|
+ </dependency>
|
|
|
519
|
+ <dependency>
|
|
|
520
|
+ <groupId>net.sourceforge.saxon</groupId>
|
|
|
521
|
+ <artifactId>saxon</artifactId>
|
|
|
522
|
+ <version>${lib.version.saxon}</version>
|
|
|
523
|
+ <classifier>dom</classifier>
|
|
|
524
|
+ </dependency>
|
|
510
|
525
|
<dependency>
|
|
511
|
526
|
<groupId>ognl</groupId>
|
|
512
|
527
|
<artifactId>ognl</artifactId>
|
| ... |
... |
@@ -1197,11 +1212,11 @@ |
|
1197
|
1212
|
<phase>pre-site</phase>
|
|
1198
|
1213
|
<configuration>
|
|
1199
|
1214
|
<target>
|
|
1200
|
|
- <copy failonerror="true" file="CHANGELOG.md" overwrite="true" todir="${project.basedir}/src/site/markdown" />
|
|
1201
|
|
- <copy failonerror="true" file="${project.basedir}/client/runner/src/main/assembly/dist/config/observe-client.md" overwrite="true" todir="${project.basedir}/src/site/markdown/" />
|
|
1202
|
|
- <copy failonerror="true" file="${project.basedir}/client/runner/src/main/assembly/dist/config/observe-client.conf" overwrite="true" todir="${project.basedir}/src/site/resources/" />
|
|
1203
|
|
- <copy failonerror="true" file="${project.basedir}/server/runner/src/main/assembly/dist/config/observe-server.md" overwrite="true" todir="${project.basedir}/src/site/markdown/" />
|
|
1204
|
|
- <copy failonerror="true" file="${project.basedir}/server/runner/src/main/assembly/dist/config/observe-server.conf" overwrite="true" todir="${project.basedir}/src/site/resources/" />
|
|
|
1215
|
+ <copy failonerror="true" file="CHANGELOG.md" overwrite="true" todir="${project.basedir}/src/site/markdown"/>
|
|
|
1216
|
+ <copy failonerror="true" file="${project.basedir}/client/runner/src/main/assembly/dist/config/observe-client.md" overwrite="true" todir="${project.basedir}/src/site/markdown/"/>
|
|
|
1217
|
+ <copy failonerror="true" file="${project.basedir}/client/runner/src/main/assembly/dist/config/observe-client.conf" overwrite="true" todir="${project.basedir}/src/site/resources/"/>
|
|
|
1218
|
+ <copy failonerror="true" file="${project.basedir}/server/runner/src/main/assembly/dist/config/observe-server.md" overwrite="true" todir="${project.basedir}/src/site/markdown/"/>
|
|
|
1219
|
+ <copy failonerror="true" file="${project.basedir}/server/runner/src/main/assembly/dist/config/observe-server.conf" overwrite="true" todir="${project.basedir}/src/site/resources/"/>
|
|
1205
|
1220
|
</target>
|
|
1206
|
1221
|
</configuration>
|
|
1207
|
1222
|
</execution>
|