Skip to content

Commit 63f7787

Browse files
committed
U fix #11
1 parent 11e3698 commit 63f7787

File tree

8 files changed

+165
-61
lines changed

8 files changed

+165
-61
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ And the following `plugin` tag to your `pom.xml`.
3838
<plugin>
3939
<groupId>fvarrui.maven</groupId>
4040
<artifactId>javapackager</artifactId>
41-
<version>0.8.5</version>
41+
<version>0.8.6</version>
4242
<executions>
4343
<execution>
4444
<phase>package</phase>

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>fvarrui.maven</groupId>
77
<artifactId>javapackager</artifactId>
8-
<version>0.8.5</version>
8+
<version>0.8.6</version>
99
<packaging>maven-plugin</packaging>
1010

1111
<name>JavaPackager Maven Plugin</name>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
2+
#Wed Jan 08 11:16:08 GMT 2020
3+
javapackager-0.8.6.jar>=
4+
javapackager-0.8.6.pom>=
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,153 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
6+
<groupId>fvarrui.maven</groupId>
7+
<artifactId>javapackager</artifactId>
8+
<version>0.8.6</version>
9+
<packaging>maven-plugin</packaging>
10+
11+
<name>JavaPackager Maven Plugin</name>
12+
13+
<url>https://github.com/fvarrui/javapackager</url>
14+
15+
<properties>
16+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
17+
<maven.compiler.source>1.8</maven.compiler.source>
18+
<maven.compiler.target>1.8</maven.compiler.target>
19+
</properties>
20+
21+
<dependencies>
22+
<dependency>
23+
<groupId>org.apache.maven</groupId>
24+
<artifactId>maven-plugin-api</artifactId>
25+
<version>3.6.0</version>
26+
</dependency>
27+
<dependency>
28+
<groupId>org.apache.maven.plugin-tools</groupId>
29+
<artifactId>maven-plugin-annotations</artifactId>
30+
<version>3.6.0</version>
31+
<scope>provided</scope>
32+
</dependency>
33+
<dependency>
34+
<groupId>org.codehaus.plexus</groupId>
35+
<artifactId>plexus-utils</artifactId>
36+
<version>3.1.1</version>
37+
</dependency>
38+
<dependency>
39+
<groupId>junit</groupId>
40+
<artifactId>junit</artifactId>
41+
<version>4.12</version>
42+
<scope>test</scope>
43+
</dependency>
44+
<dependency>
45+
<groupId>org.twdata.maven</groupId>
46+
<artifactId>mojo-executor</artifactId>
47+
<version>2.3.0</version>
48+
</dependency>
49+
<dependency>
50+
<groupId>org.apache.commons</groupId>
51+
<artifactId>commons-lang3</artifactId>
52+
<version>3.9</version>
53+
</dependency>
54+
<dependency>
55+
<groupId>commons-io</groupId>
56+
<artifactId>commons-io</artifactId>
57+
<version>2.6</version>
58+
</dependency>
59+
<dependency>
60+
<groupId>org.apache.velocity</groupId>
61+
<artifactId>velocity-engine-core</artifactId>
62+
<version>2.0</version>
63+
</dependency>
64+
</dependencies>
65+
66+
<build>
67+
<plugins>
68+
<plugin>
69+
<groupId>org.apache.maven.plugins</groupId>
70+
<artifactId>maven-plugin-plugin</artifactId>
71+
<version>3.6.0</version>
72+
<configuration>
73+
<goalPrefix>javapackager</goalPrefix>
74+
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
75+
</configuration>
76+
<executions>
77+
<execution>
78+
<id>help-goal</id>
79+
<goals>
80+
<goal>help</goal>
81+
</goals>
82+
</execution>
83+
</executions>
84+
</plugin>
85+
<plugin>
86+
<groupId>org.apache.maven.plugins</groupId>
87+
<artifactId>maven-install-plugin</artifactId>
88+
<version>3.0.0-M1</version>
89+
<configuration>
90+
<localRepositoryPath>releases</localRepositoryPath>
91+
<file>${project.build.directory}/${project.artifactId}-${project.version}.jar</file>
92+
</configuration>
93+
<executions>
94+
<execution>
95+
<id>release</id>
96+
<phase>install</phase>
97+
<goals>
98+
<goal>install-file</goal>
99+
</goals>
100+
</execution>
101+
</executions>
102+
</plugin>
103+
</plugins>
104+
</build>
105+
106+
<profiles>
107+
<profile>
108+
<id>run-its</id>
109+
<build>
110+
<plugins>
111+
<plugin>
112+
<groupId>org.apache.maven.plugins</groupId>
113+
<artifactId>maven-invoker-plugin</artifactId>
114+
<version>1.7</version>
115+
<configuration>
116+
<debug>true</debug>
117+
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
118+
<pomIncludes>
119+
<pomInclude>*/pom.xml</pomInclude>
120+
</pomIncludes>
121+
<postBuildHookScript>verify</postBuildHookScript>
122+
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
123+
<settingsFile>src/it/settings.xml</settingsFile>
124+
<goals>
125+
<goal>clean</goal>
126+
<goal>test-compile</goal>
127+
</goals>
128+
</configuration>
129+
<executions>
130+
<execution>
131+
<id>integration-test</id>
132+
<goals>
133+
<goal>install</goal>
134+
<goal>integration-test</goal>
135+
<goal>verify</goal>
136+
</goals>
137+
</execution>
138+
</executions>
139+
</plugin>
140+
</plugins>
141+
142+
</build>
143+
</profile>
144+
</profiles>
145+
146+
<distributionManagement>
147+
<repository>
148+
<id>repo</id>
149+
<url>file://${project.basedir}/releases</url>
150+
</repository>
151+
</distributionManagement>
152+
153+
</project>

releases/fvarrui/maven/javapackager/maven-metadata-local.xml

+4-3
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<groupId>fvarrui.maven</groupId>
44
<artifactId>javapackager</artifactId>
55
<versioning>
6-
<latest>0.8.5</latest>
7-
<release>0.8.5</release>
6+
<latest>0.8.6</latest>
7+
<release>0.8.6</release>
88
<versions>
99
<version>0.4.0</version>
1010
<version>0.5.0</version>
@@ -15,7 +15,8 @@
1515
<version>0.8.3</version>
1616
<version>0.8.4</version>
1717
<version>0.8.5</version>
18+
<version>0.8.6</version>
1819
</versions>
19-
<lastUpdated>20191229103943</lastUpdated>
20+
<lastUpdated>20200108111608</lastUpdated>
2021
</versioning>
2122
</metadata>

src/main/resources/mac/Info.plist.vtl

+1-42
Original file line numberDiff line numberDiff line change
@@ -1,42 +1 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3-
<plist version="1.0">
4-
<dict>
5-
<key>CFBundleGetInfoString</key>
6-
<string>${info.displayName} ${info.version}</string>
7-
<key>CFBundleDevelopmentRegion</key>
8-
<string>English</string>
9-
<key>CFBundleExecutable</key>
10-
<string>startup</string>
11-
<key>CFBundleIconFile</key>
12-
<string>${info.name}.icns</string>
13-
<key>CFBundleIdentifier</key>
14-
<string>${info.mainClass}</string>
15-
<key>CFBundleDisplayName</key>
16-
<string>${info.displayName}</string>
17-
<key>CFBundleInfoDictionaryVersion</key>
18-
<string>6.0</string>
19-
<key>CFBundleName</key>
20-
<string>${info.name}</string>
21-
<key>CFBundlePackageType</key>
22-
<string>APPL</string>
23-
<key>CFBundleShortVersionString</key>
24-
<string>${info.version}</string>
25-
<key>CFBundleSignature</key>
26-
<string>????</string>
27-
<key>CFBundleVersion</key>
28-
<string>1.0</string>
29-
<key>NSHumanReadableCopyright</key>
30-
<string>${info.organizationName}</string>
31-
<key>NSHighResolutionCapable</key>
32-
<true />
33-
<key>NSSupportsAutomaticGraphicsSwitching</key>
34-
<true />
35-
<key>JVMRuntime</key>
36-
<key>jre</key>
37-
<key>JVMMainClassName</key>
38-
<string>${info.mainClass}</string>
39-
<key>JVMOptions</key>
40-
<array />
41-
</dict>
42-
</plist>
1+
<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"><plist version="1.0"> <dict> <key>CFBundleGetInfoString</key> <string>${info.displayName} ${info.version}</string> <key>CFBundleDevelopmentRegion</key> <string>English</string> <key>CFBundleExecutable</key> <string>startup</string> <key>CFBundleIconFile</key> <string>${info.name}.icns</string> <key>CFBundleIdentifier</key> <string>${info.mainClass}</string> <key>CFBundleDisplayName</key> <string>${info.displayName}</string> <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundleName</key> <string>${info.name}</string> <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> <string>${info.version}</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> <string>1.0</string> <key>NSHumanReadableCopyright</key> <string>${info.organizationName}</string> <key>NSHighResolutionCapable</key> <true /> <key>NSSupportsAutomaticGraphicsSwitching</key> <true /> <key>JVMRuntime</key> <key>jre</key> <key>JVMMainClassName</key> <string>${info.mainClass}</string> <key>JVMOptions</key> <array /> </dict></plist>

src/main/resources/mac/startup.vtl

+1-14
Original file line numberDiff line numberDiff line change
@@ -1,14 +1 @@
1-
#!/bin/sh
2-
# Mac OS X startup script generated by JavaPackager Maven Plugin
3-
SCRIPTPATH=`cd "$(dirname "$0")" ; pwd`
4-
#if($info.bundleJre)
5-
JAVA=$SCRIPTPATH/../PlugIns/jre/Contents/Home/bin/java
6-
#else
7-
JAVA=`/usr/libexec/java_home`/bin/java
8-
#end
9-
BINARY=$SCRIPTPATH/../Resources/Java/${info.jarFile}
10-
#if($info.administratorRequired)
11-
/usr/bin/osascript -e "do shell script \"$JAVA -Dapple.laf.useScreenMenuBar=true -Xdock:name='${info.displayName}' -Xdock:icon=$SCRIPTPATH/../Resources/${info.name}.icns -jar $BINARY $@\" with administrator privileges"
12-
#else
13-
$JAVA -Dapple.laf.useScreenMenuBar=true -Xdock:name="${info.displayName}" -Xdock:icon=$SCRIPTPATH/../Resources/${info.name}.icns -jar $BINARY $@
14-
#end
1+
#!/bin/sh# Mac OS X startup script generated by JavaPackager Maven PluginSCRIPTPATH=`cd "$(dirname "$0")" ; pwd`#if($info.bundleJre)JAVA=$SCRIPTPATH/../PlugIns/jre/Contents/Home/bin/java#elseJAVA=`/usr/libexec/java_home`/bin/java#endBINARY=$SCRIPTPATH/../Resources/Java/${info.jarFile}export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin#if($info.administratorRequired)/usr/bin/osascript -e "do shell script \"$JAVA -Dapple.laf.useScreenMenuBar=true -Xdock:name='${info.displayName}' -Xdock:icon=$SCRIPTPATH/../Resources/${info.name}.icns -jar $BINARY $@\" with administrator privileges"#else$JAVA -Dapple.laf.useScreenMenuBar=true -Xdock:name="${info.displayName}" -Xdock:icon=$SCRIPTPATH/../Resources/${info.name}.icns -jar $BINARY $@#end

0 commit comments

Comments
 (0)