Skip to content

Commit 5409133

Browse files
committed
ST6RI-823 Corrects fix for incorrect removal of templating-maven-plugin
The templating-maven-plugin, used to copy the resources into the target directory `kernel`, was causing the kernel zips recursively containing earlier builds as well, causing its size to balloon (mostly because maven considered a target folder as a source folder). However, simply removing broke clean builds, as the installer and other metadata were missing from the output folder. This commit uses the maven-resources-plugin to copy the required files to the installer, thus avoiding the original issue.
1 parent 2e0b534 commit 5409133

1 file changed

Lines changed: 10 additions & 7 deletions

File tree

  • org.omg.sysml.jupyter.kernel

org.omg.sysml.jupyter.kernel/pom.xml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<version>${revision}</version>
99
</parent>
1010
<artifactId>jupyter-sysml-kernel</artifactId>
11-
11+
1212
<dependencies>
1313
<dependency>
1414
<groupId>org.omg.sysml</groupId>
@@ -35,8 +35,8 @@
3535
</exclusion>
3636
</exclusions>
3737
</dependency>
38-
<!--
39-
Dependencies needed for m2e
38+
<!--
39+
Dependencies needed for m2e
4040
we need to add these manually so the Eclipse IDE can see the classpath
4141
-->
4242
<dependency>
@@ -119,7 +119,7 @@
119119
</execution>
120120
</executions>
121121
</plugin>
122-
122+
123123
<plugin>
124124
<groupId>org.apache.maven.plugins</groupId>
125125
<artifactId>maven-jar-plugin</artifactId>
@@ -138,7 +138,7 @@
138138
</execution>
139139
</executions>
140140
</plugin>
141-
141+
142142
<plugin>
143143
<groupId>org.apache.maven.plugins</groupId>
144144
<artifactId>maven-shade-plugin</artifactId>
@@ -200,7 +200,7 @@
200200
</execution>
201201
</executions>
202202
</plugin>
203-
203+
204204
<plugin>
205205
<groupId>org.apache.maven.plugins</groupId>
206206
<artifactId>maven-resources-plugin</artifactId>
@@ -222,6 +222,9 @@
222222
<include>${project.artifactId}-${project.version}-all.jar</include>
223223
</includes>
224224
</resource>
225+
<resource>
226+
<directory>${basedir}/src/main/resources</directory>
227+
</resource>
225228
<resource>
226229
<directory>..</directory>
227230
<targetPath>sysml</targetPath>
@@ -236,7 +239,7 @@
236239
</execution>
237240
</executions>
238241
</plugin>
239-
242+
240243
<plugin>
241244
<groupId>org.apache.maven.plugins</groupId>
242245
<artifactId>maven-assembly-plugin</artifactId>

0 commit comments

Comments
 (0)