Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit d92b7a1

Browse files
sampesonsampeson
authored
Merge pull request #10 from Hi-Fi/jmockitFix
Added javaagent explicitly (windows build failed without it)
2 parents 233a42f + 2e26868 commit d92b7a1

File tree

1 file changed

+176
-169
lines changed

1 file changed

+176
-169
lines changed

‎pom.xml

+176-169
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<version>0.5.3-SNAPSHOT</version>
2525
<properties>
2626
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
27+
<jmockit.version>1.44</jmockit.version>
2728
</properties>
2829

2930
<name>${project.groupId}:${project.artifactId}</name>
@@ -163,178 +164,184 @@
163164
</snapshotRepository>
164165
</distributionManagement>
165166

166-
<build>
167-
<plugins>
168-
<plugin>
167+
<build>
168+
<plugins>
169+
<plugin>
169170
<groupId>org.apache.maven.plugins</groupId>
170171
<artifactId>maven-surefire-plugin</artifactId>
171172
<version>3.0.0-M1</version>
173+
<configuration>
174+
<argLine>
175+
-javaagent:${settings.localRepository}/org/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar
176+
</argLine>
177+
</configuration>
172178
</plugin>
173-
<plugin>
174-
<groupId>org.sonatype.plugins</groupId>
175-
<artifactId>nexus-staging-maven-plugin</artifactId>
176-
<version>1.6.7</version>
177-
<extensions>true</extensions>
178-
<configuration>
179-
<serverId>ossrh</serverId>
180-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
181-
<autoReleaseAfterClose>false</autoReleaseAfterClose>
182-
</configuration>
183-
</plugin>
184-
<plugin>
185-
<artifactId>maven-compiler-plugin</artifactId>
186-
<version>3.6.1</version>
187-
<configuration>
188-
<source>1.8</source>
189-
<target>1.8</target>
190-
</configuration>
191-
</plugin>
192-
<plugin>
193-
<groupId>org.apache.maven.plugins</groupId>
194-
<artifactId>maven-jar-plugin</artifactId>
195-
<version>3.0.2</version>
196-
<configuration>
197-
<archive>
198-
<manifest>
199-
<addClasspath>true</addClasspath>
200-
<mainClass>JavaFXLibrary</mainClass>
201-
</manifest>
202-
</archive>
203-
</configuration>
204-
<executions>
205-
<execution>
206-
<goals>
207-
<goal>test-jar</goal>
208-
</goals>
209-
</execution>
210-
</executions>
211-
</plugin>
212-
<plugin>
213-
<artifactId>maven-assembly-plugin</artifactId>
214-
<version>3.0.0</version>
215-
<executions>
216-
<execution>
217-
<phase>package</phase>
218-
<goals>
219-
<goal>single</goal>
220-
</goals>
221-
</execution>
222-
</executions>
223-
<configuration>
224-
<archive>
225-
<manifest>
226-
<mainClass>JavaFXLibrary</mainClass>
227-
</manifest>
228-
</archive>
229-
<descriptorRefs>
230-
<descriptorRef>jar-with-dependencies</descriptorRef>
231-
</descriptorRefs>
232-
</configuration>
233-
</plugin>
234-
<plugin>
235-
<groupId>org.robotframework</groupId>
236-
<artifactId>robotframework-maven-plugin</artifactId>
237-
<version>1.4.7</version>
238-
<executions>
239-
<execution>
240-
<id>acceptance tests</id>
241-
<phase>integration-test</phase>
242-
<goals>
243-
<goal>run</goal>
244-
</goals>
245-
<configuration>
246-
<includes>
247-
<include>smoke</include>
248-
</includes>
249-
<excludes>
250-
<exclude>not-ready</exclude>
251-
</excludes>
252-
<logLevel>TRACE:INFO</logLevel>
253-
<dryrun>false</dryrun>
254-
<variables>
255-
<variable>appJar:${project.build.directory}/${project.artifactId}*tests.jar</variable>
256-
</variables>
257-
</configuration>
258-
</execution>
259-
<execution>
260-
<id>documentation</id>
261-
<phase>package</phase>
262-
<goals>
263-
<goal>libdoc</goal>
264-
</goals>
265-
<configuration>
266-
<libdoc>
267-
<outputDirectory>${project.build.directory}</outputDirectory>
268-
<outputFile>${project.artifactId}.html</outputFile>
269-
<libraryOrResourceFile>JavaFXLibrary</libraryOrResourceFile>
270-
<version>${project.version}</version>
271-
</libdoc>
272-
</configuration>
273-
</execution>
274-
<execution>
275-
<id>xml</id>
276-
<phase>package</phase>
277-
<goals>
278-
<goal>libdoc</goal>
279-
</goals>
280-
<configuration>
281-
<libdoc>
282-
<outputDirectory>${project.build.directory}</outputDirectory>
283-
<outputFile>${project.artifactId}.xml</outputFile>
284-
<libraryOrResourceFile>JavaFXLibrary</libraryOrResourceFile>
285-
<version>${project.version}</version>
286-
</libdoc>
287-
</configuration>
288-
</execution>
289-
</executions>
290-
</plugin>
291-
<plugin>
292-
<groupId>org.apache.maven.plugins</groupId>
293-
<artifactId>maven-shade-plugin</artifactId>
294-
<version>3.1.0</version>
295-
<executions>
296-
<execution>
297-
<phase>package</phase>
298-
<goals>
299-
<goal>shade</goal>
300-
</goals>
301-
<configuration>
302-
<transformers>
303-
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
304-
<mainClass>JavaFXLibrary</mainClass>
305-
</transformer>
306-
</transformers>
307-
<relocations>
308-
<relocation>
309-
<pattern>com.google.common</pattern>
310-
<shadedPattern>shaded.com.google.common</shadedPattern>
311-
</relocation>
312-
<relocation>
313-
<pattern>org.apache.commons</pattern>
314-
<shadedPattern>shaded.org.apache.commons</shadedPattern>
315-
</relocation>
316-
</relocations>
317-
<artifactSet>
318-
<includes>
319-
<include>*:*</include>
320-
</includes>
321-
</artifactSet>
322-
<filters>
323-
<filter>
324-
<artifact>*:*</artifact>
325-
<excludes>
326-
<exclude>META-INF/*.SF</exclude>
327-
<exclude>META-INF/*.DSA</exclude>
328-
<exclude>META-INF/*.RSA</exclude>
329-
</excludes>
330-
</filter>
331-
</filters>
332-
</configuration>
333-
</execution>
334-
</executions>
335-
</plugin>
336-
</plugins>
337-
</build>
179+
<plugin>
180+
<groupId>org.sonatype.plugins</groupId>
181+
<artifactId>nexus-staging-maven-plugin</artifactId>
182+
<version>1.6.7</version>
183+
<extensions>true</extensions>
184+
<configuration>
185+
<serverId>ossrh</serverId>
186+
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
187+
<autoReleaseAfterClose>false</autoReleaseAfterClose>
188+
</configuration>
189+
</plugin>
190+
<plugin>
191+
<artifactId>maven-compiler-plugin</artifactId>
192+
<version>3.6.1</version>
193+
<configuration>
194+
<source>1.8</source>
195+
<target>1.8</target>
196+
</configuration>
197+
</plugin>
198+
<plugin>
199+
<groupId>org.apache.maven.plugins</groupId>
200+
<artifactId>maven-jar-plugin</artifactId>
201+
<version>3.0.2</version>
202+
<configuration>
203+
<archive>
204+
<manifest>
205+
<addClasspath>true</addClasspath>
206+
<mainClass>JavaFXLibrary</mainClass>
207+
</manifest>
208+
</archive>
209+
</configuration>
210+
<executions>
211+
<execution>
212+
<goals>
213+
<goal>test-jar</goal>
214+
</goals>
215+
</execution>
216+
</executions>
217+
</plugin>
218+
<plugin>
219+
<artifactId>maven-assembly-plugin</artifactId>
220+
<version>3.0.0</version>
221+
<executions>
222+
<execution>
223+
<phase>package</phase>
224+
<goals>
225+
<goal>single</goal>
226+
</goals>
227+
</execution>
228+
</executions>
229+
<configuration>
230+
<archive>
231+
<manifest>
232+
<mainClass>JavaFXLibrary</mainClass>
233+
</manifest>
234+
</archive>
235+
<descriptorRefs>
236+
<descriptorRef>jar-with-dependencies</descriptorRef>
237+
</descriptorRefs>
238+
</configuration>
239+
</plugin>
240+
<plugin>
241+
<groupId>org.robotframework</groupId>
242+
<artifactId>robotframework-maven-plugin</artifactId>
243+
<version>1.4.7</version>
244+
<executions>
245+
<execution>
246+
<id>acceptance tests</id>
247+
<phase>integration-test</phase>
248+
<goals>
249+
<goal>run</goal>
250+
</goals>
251+
<configuration>
252+
<includes>
253+
<include>smoke</include>
254+
</includes>
255+
<excludes>
256+
<exclude>not-ready</exclude>
257+
</excludes>
258+
<logLevel>TRACE:INFO</logLevel>
259+
<dryrun>false</dryrun>
260+
<variables>
261+
<variable>appJar:${project.build.directory}/${project.artifactId}*tests.jar</variable>
262+
</variables>
263+
</configuration>
264+
</execution>
265+
<execution>
266+
<id>documentation</id>
267+
<phase>package</phase>
268+
<goals>
269+
<goal>libdoc</goal>
270+
</goals>
271+
<configuration>
272+
<libdoc>
273+
<outputDirectory>${project.build.directory}</outputDirectory>
274+
<outputFile>${project.artifactId}.html</outputFile>
275+
<libraryOrResourceFile>JavaFXLibrary</libraryOrResourceFile>
276+
<version>${project.version}</version>
277+
</libdoc>
278+
</configuration>
279+
</execution>
280+
<execution>
281+
<id>xml</id>
282+
<phase>package</phase>
283+
<goals>
284+
<goal>libdoc</goal>
285+
</goals>
286+
<configuration>
287+
<libdoc>
288+
<outputDirectory>${project.build.directory}</outputDirectory>
289+
<outputFile>${project.artifactId}.xml</outputFile>
290+
<libraryOrResourceFile>JavaFXLibrary</libraryOrResourceFile>
291+
<version>${project.version}</version>
292+
</libdoc>
293+
</configuration>
294+
</execution>
295+
</executions>
296+
</plugin>
297+
<plugin>
298+
<groupId>org.apache.maven.plugins</groupId>
299+
<artifactId>maven-shade-plugin</artifactId>
300+
<version>3.1.0</version>
301+
<executions>
302+
<execution>
303+
<phase>package</phase>
304+
<goals>
305+
<goal>shade</goal>
306+
</goals>
307+
<configuration>
308+
<transformers>
309+
<transformer
310+
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
311+
<mainClass>JavaFXLibrary</mainClass>
312+
</transformer>
313+
</transformers>
314+
<relocations>
315+
<relocation>
316+
<pattern>com.google.common</pattern>
317+
<shadedPattern>shaded.com.google.common</shadedPattern>
318+
</relocation>
319+
<relocation>
320+
<pattern>org.apache.commons</pattern>
321+
<shadedPattern>shaded.org.apache.commons</shadedPattern>
322+
</relocation>
323+
</relocations>
324+
<artifactSet>
325+
<includes>
326+
<include>*:*</include>
327+
</includes>
328+
</artifactSet>
329+
<filters>
330+
<filter>
331+
<artifact>*:*</artifact>
332+
<excludes>
333+
<exclude>META-INF/*.SF</exclude>
334+
<exclude>META-INF/*.DSA</exclude>
335+
<exclude>META-INF/*.RSA</exclude>
336+
</excludes>
337+
</filter>
338+
</filters>
339+
</configuration>
340+
</execution>
341+
</executions>
342+
</plugin>
343+
</plugins>
344+
</build>
338345

339346
<dependencies>
340347
<dependency>
@@ -346,7 +353,7 @@
346353
<groupId>org.jmockit</groupId>
347354
<artifactId>jmockit</artifactId>
348355
<scope>test</scope>
349-
<version>1.38</version>
356+
<version>${jmockit.version}</version>
350357
</dependency>
351358
<dependency>
352359
<groupId>junit</groupId>

0 commit comments

Comments
 (0)