You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2018/01/29 14:02:00 UTC

[2/3] cayenne git commit: New version of JApp plugin with new launchers for Mac and Windows

New version of JApp plugin with new launchers for Mac and Windows


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/29ef71cd
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/29ef71cd
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/29ef71cd

Branch: refs/heads/master
Commit: 29ef71cd6ad72a80c9e1ef5a0b11b4a85dbb2586
Parents: 9a33f10
Author: Nikita Timofeev <st...@gmail.com>
Authored: Mon Jan 29 16:58:20 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Mon Jan 29 16:58:20 2018 +0300

----------------------------------------------------------------------
 assembly/pom.xml                    | 2 +-
 modeler/cayenne-modeler-mac/pom.xml | 4 ++--
 pom.xml                             | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/29ef71cd/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 7c2101d..48884e0 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -367,7 +367,7 @@
 									<executable>/bin/chmod</executable>
 									<arguments>
 										<argument>755</argument>
-										<argument>target/cayenne-${project.version}-macosx/CayenneModeler.app/Contents/MacOS/JavaAppLauncher</argument>
+										<argument>target/cayenne-${project.version}-macosx/CayenneModeler.app/Contents/MacOS/CayenneModeler</argument>
 									</arguments>
 								</configuration>
 							</execution>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/29ef71cd/modeler/cayenne-modeler-mac/pom.xml
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler-mac/pom.xml b/modeler/cayenne-modeler-mac/pom.xml
index aea09d5..03c2a11 100644
--- a/modeler/cayenne-modeler-mac/pom.xml
+++ b/modeler/cayenne-modeler-mac/pom.xml
@@ -103,8 +103,8 @@
 							<mainClass>org.apache.cayenne.modeler.osx.OSXMain</mainClass>
 							<icon>src/japplication/resources/CayenneModeler.icns</icon>
 							<os>mac</os>
-							<jvm>1.7+</jvm>
-							<jvmOptions>-Xmx500m -Dapple.laf.useScreenMenuBar=true -Xdock:name=CayenneModeler</jvmOptions>
+							<jvm>1.8+</jvm>
+							<jvmOptions>-Xmx500m -Dapple.laf.useScreenMenuBar=true</jvmOptions>
 						</configuration>
 						<executions>
 							<execution>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/29ef71cd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 91639b5..0d2bd8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -822,7 +822,7 @@
 				<plugin>
 					<groupId>org.objectstyle.japp</groupId>
 					<artifactId>japp-maven-plugin</artifactId>
-					<version>3.0</version>
+					<version>3.1</version>
 				</plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>