Revision: 6403
http://sourceforge.net/p/jump-pilot/code/6403
Author: edso
Date: 2020-09-01 13:10:34 +0000 (Tue, 01 Sep 2020)
Log Message:
-----------
fix double inclusion of OJ-*.jar in distro zip
remove obsolete js:* exclusion
Modified Paths:
--------------
core/trunk/etc/mvn/cmp_core.xml
core/trunk/etc/mvn/cmp_plus.xml
Modified: core/trunk/etc/mvn/cmp_core.xml
===================================================================
--- core/trunk/etc/mvn/cmp_core.xml 2020-09-01 12:37:02 UTC (rev 6402)
+++ core/trunk/etc/mvn/cmp_core.xml 2020-09-01 13:10:34 UTC (rev 6403)
@@ -20,7 +20,6 @@
<exclude>com.vividsolutions:jts</exclude>
<!-- exclude batik and js which is a batik dependency from CORE build
-->
<exclude>batik:*</exclude>
- <exclude>js:*</exclude>
<!-- exclude junit and hamcrest from CORE build -->
<exclude>junit:*</exclude>
<exclude>hamcrest:*</exclude>
Modified: core/trunk/etc/mvn/cmp_plus.xml
===================================================================
--- core/trunk/etc/mvn/cmp_plus.xml 2020-09-01 12:37:02 UTC (rev 6402)
+++ core/trunk/etc/mvn/cmp_plus.xml 2020-09-01 13:10:34 UTC (rev 6403)
@@ -3,14 +3,15 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2
http://maven.apache.org/xsd/component-1.1.2.xsd";>
<dependencySets>
+ <!-- replaced by inclusion below
<dependencySet>
<outputDirectory>/lib</outputDirectory>
- <!-- include batik in PLUS build via copying jars from lib/ folder below
-->
- <excludes>
- <exclude>batik:*</exclude>
- <exclude>js:*</exclude>
- </excludes>
+ <includes>
+ <include>batik:*</include>
+ <include>js:*</include>
+ </includes>
</dependencySet>
+ -->
</dependencySets>
<fileSets>
<fileSet>
@@ -28,6 +29,8 @@
<directory>lib/plus</directory>
<outputDirectory>/lib/ext</outputDirectory>
</fileSet>
+ <!-- include batik in PLUS build via copying selected jars from lib/ folder
+ to minimize distro size, pom deps pull in more files -->
<fileSet>
<directory>lib/</directory>
<outputDirectory>/lib/</outputDirectory>
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
