Bumping version and using new app bundler.

johnmay · Mar 1, 2015 · 3e9f5e7 · 3e9f5e7
1 parent 1c88fd3
commit 3e9f5e7
Show file tree

Hide file tree

Showing 15 changed files with 69 additions and 79 deletions.
diff --git a/action/pom.xml b/action/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>metingear</artifactId>
         <groupId>uk.ac.ebi.metingear</groupId>
-        <version>1.1.5</version>
+        <version>1.1.6</version>
     </parent>
 
     <artifactId>metingear-action</artifactId>

diff --git a/api/pom.xml b/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>metingear</artifactId>
         <groupId>uk.ac.ebi.metingear</groupId>
-        <version>1.1.5</version>
+        <version>1.1.6</version>
     </parent>
     <artifactId>metingear-api</artifactId>
     <packaging>jar</packaging>

diff --git a/app/pom.xml b/app/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <artifactId>metingear</artifactId>
         <groupId>uk.ac.ebi.metingear</groupId>
-        <version>1.1.5</version>
+        <version>1.1.6</version>
     </parent>
 
     <artifactId>metingear-app</artifactId>
@@ -404,22 +404,17 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>osxappbundle-maven-plugin</artifactId>
-                        <version>1.0-alpha-2</version>
+                        <groupId>sh.tak.appbundler</groupId>
+                        <artifactId>appbundle-maven-plugin</artifactId>
+                        <version>1.0.1</version>
                         <configuration>
-                            <bundleName>Metingear ${project.version}
-                            </bundleName>
+                            <bundleName>Metingear ${project.version}</bundleName>
                             <mainClass>uk.ac.ebi.metingear.Main</mainClass>
-                            <iconFile>
-                                ${basedir}/src/main/resources/uk/ac/ebi/metingear/mnb.icns
-                            </iconFile>
-                            <buildDirectory>
-                                /Users/johnmay/Applications/Metingear
-                            </buildDirectory>
-                            <dictionaryFile>
-                                ${basedir}/src/main/resources/uk/ac/ebi/metingear/Info.plist
-                            </dictionaryFile>
+                            <iconFile>${basedir}/src/main/resources/uk/ac/ebi/metingear/mnb.icns</iconFile>
+                            <buildDirectory>/Users/johnmay/Applications/Metingear</buildDirectory>
+                            <!--<dictionaryFile>-->
+                                <!--uk/ac/ebi/metingear/MyInfo.plist.template-->
+                            <!--</dictionaryFile>-->
                         </configuration>
                         <executions>
                             <execution>

diff --git a/app/src/main/resources/uk/ac/ebi/metingear/Info.plist b/app/src/main/resources/uk/ac/ebi/metingear/Info.plist
diff --git a/app/src/main/resources/uk/ac/ebi/metingear/MyInfo.plist.template b/app/src/main/resources/uk/ac/ebi/metingear/MyInfo.plist.template
@@ -0,0 +1,46 @@
+<?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>CFBundleDevelopmentRegion</key>
+    <string>English</string>
+    <key>CFBundleExecutable</key>
+    <string>${cfBundleExecutable}</string>
+    <key>CFBundleIconFile</key>
+    <string>${iconFile}</string>
+    <key>CFBundleIdentifier</key>
+    <string>${mainClass}</string>
+    <key>CFBundleDisplayName</key>
+    <string>${bundleName}</string>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+    <key>CFBundleName</key>
+    <string>${bundleName}</string>
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+    <key>CFBundleShortVersionString</key>
+    <string>${version}</string>
+    <key>CFBundleSignature</key>
+    <string>????</string>
+    <key>CFBundleVersion</key>
+    <string>1</string>
+    <key>NSHumanReadableCopyright</key>
+    <string></string>
+    <key>NSHighResolutionCapable</key>
+    <true/>
+    <key>JVMMainClassName</key>
+    <string>${mainClass}</string>
+    <key>JVMClassPaths</key>
+    ${classpath}
+    <key>JVMVersion</key>
+    <string>${jvmVersion}</string>
+    <key>JVMOptions</key>
+    <array>
+      <string>-Dapple.laf.useScreenMenuBar=true</string>
+      <string>-Xms512m</string>
+      <string>-Xmx1G</string>
+    </array>
+    <key>JVMArguments</key>
+    <array/>
+  </dict>
+</plist>
diff --git a/core/pom.xml b/core/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>metingear</artifactId>
         <groupId>uk.ac.ebi.metingear</groupId>
-        <version>1.1.5</version>
+        <version>1.1.6</version>
     </parent>
 
     <artifactId>metingear-core</artifactId>

diff --git a/edit/pom.xml b/edit/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>metingear</artifactId>
         <groupId>uk.ac.ebi.metingear</groupId>
-        <version>1.1.5</version>
+        <version>1.1.6</version>
     </parent>
     <artifactId>metingear-edit</artifactId>
     <packaging>jar</packaging>

diff --git a/extensions/annotation/pom.xml b/extensions/annotation/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>metingear-extensions</artifactId>
         <groupId>uk.ac.ebi.metingear</groupId>
-        <version>1.1.5</version>
+        <version>1.1.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/extensions/extension/pom.xml b/extensions/extension/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>metingear-extensions</artifactId>
         <groupId>uk.ac.ebi.metingear</groupId>
-        <version>1.1.5</version>
+        <version>1.1.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/extensions/link/pom.xml b/extensions/link/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>metingear-extensions</artifactId>
         <groupId>uk.ac.ebi.metingear</groupId>
-        <version>1.1.5</version>
+        <version>1.1.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/extensions/pom.xml b/extensions/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>metingear</artifactId>
         <groupId>uk.ac.ebi.metingear</groupId>
-        <version>1.1.5</version>
+        <version>1.1.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/extensions/structure/pom.xml b/extensions/structure/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>metingear-extensions</artifactId>
         <groupId>uk.ac.ebi.metingear</groupId>
-        <version>1.1.5</version>
+        <version>1.1.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/import/pom.xml b/import/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>metingear</artifactId>
         <groupId>uk.ac.ebi.metingear</groupId>
-        <version>1.1.5</version>
+        <version>1.1.6</version>
     </parent>
     <artifactId>metingear-import</artifactId>
     <url>http://maven.apache.org</url>

diff --git a/optimise/pom.xml b/optimise/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>metingear</artifactId>
         <groupId>uk.ac.ebi.metingear</groupId>
-        <version>1.1.5</version>
+        <version>1.1.6</version>
     </parent>
     <packaging>jar</packaging>
     <artifactId>metingear-optimise</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>uk.ac.ebi.metingear</groupId>
     <artifactId>metingear</artifactId>
-    <version>1.1.5</version>
+    <version>1.1.6</version>
     <packaging>pom</packaging>
     <name>Metingear</name>
 
@@ -31,7 +31,7 @@
     <!-- versions for some core libraries changing here will affect all child modules -->
     <properties>
         <caf.version>0.8.7-SNAPSHOT</caf.version>
-        <mdk.version>1.5.1-SNAPSHOT</mdk.version>
+        <mdk.version>1.5.2</mdk.version>
         <cdk.version>1.5.10</cdk.version>
         <jchempaint.version>3.4-SNAPSHOT</jchempaint.version>
     </properties>