Skip to content

Commit

Permalink
Bumping version and using new app bundler.
Browse files Browse the repository at this point in the history
  • Loading branch information
johnmay committed Mar 1, 2015
1 parent 1c88fd3 commit 3e9f5e7
Show file tree
Hide file tree
Showing 15 changed files with 69 additions and 79 deletions.
2 changes: 1 addition & 1 deletion action/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
25 changes: 10 additions & 15 deletions app/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
51 changes: 0 additions & 51 deletions app/src/main/resources/uk/ac/ebi/metingear/Info.plist

This file was deleted.

46 changes: 46 additions & 0 deletions app/src/main/resources/uk/ac/ebi/metingear/MyInfo.plist.template
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion edit/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion extensions/annotation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion extensions/extension/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion extensions/link/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion extensions/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion extensions/structure/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion import/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion optimise/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>
Expand Down

0 comments on commit 3e9f5e7

Please sign in to comment.