Skip to content

Commit

Permalink
chore: Updated ChangeLog and version numbers.
Browse files Browse the repository at this point in the history
  • Loading branch information
kdmurthy committed Jun 30, 2016
1 parent 5900054 commit abc6544
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 8 deletions.
8 changes: 4 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ marathon-java/marathon-java-agent/.settings/
marathon-java/marathon-java-agent/build/
marathon-java/marathon-java-agent/marathon-java-agent.xml
marathon-java/marathon-java-agent/.gitignore
marathon-java/marathon-java-agent/marathon-java-agent-4.2.0.0.jar
marathon-java/marathon-java-agent/marathon-java-agent-4.2.1.0.jar
marathon-java/marathon-java-driver/.classpath
marathon-java/marathon-java-driver/.project
marathon-java/marathon-java-driver/.settings/
Expand All @@ -24,7 +24,7 @@ marathon-java/marathon-java-recorder/.settings/
marathon-java/marathon-java-recorder/build/
marathon-java/marathon-java-recorder/marathon-java-recorder.xml
marathon-java/marathon-java-recorder/.gitignore
marathon-java/marathon-java-recorder/marathon-java-recorder-4.2.0.0.jar
marathon-java/marathon-java-recorder/marathon-java-recorder-4.2.1.0.jar
marathon-java/marathon-java-runtime/.classpath
marathon-java/marathon-java-runtime/.project
marathon-java/marathon-java-runtime/.settings/
Expand Down Expand Up @@ -70,14 +70,14 @@ marathon-javafx/marathon-javafx-agent/.settings/
marathon-javafx/marathon-javafx-agent/build/
marathon-javafx/marathon-javafx-agent/marathon-javafx-agent.xml
marathon-javafx/marathon-javafx-agent/.gitignore
marathon-javafx/marathon-javafx-agent/marathon-javafx-agent-4.2.0.0.jar
marathon-javafx/marathon-javafx-agent/marathon-javafx-agent-4.2.1.0.jar
marathon-javafx/marathon-javafx-recorder/.classpath
marathon-javafx/marathon-javafx-recorder/.project
marathon-javafx/marathon-javafx-recorder/.settings/
marathon-javafx/marathon-javafx-recorder/build/
marathon-javafx/marathon-javafx-recorder/marathon-javafx-recorder.xml
marathon-javafx/marathon-javafx-recorder/.gitignore
marathon-javafx/marathon-javafx-recorder/marathon-javafx-recorder-4.2.0.0.jar
marathon-javafx/marathon-javafx-recorder/marathon-javafx-recorder-4.2.1.0.jar
marathon-javafx/marathon-javafx-agent/.externalToolBuilders/
marathon-javafx/marathon-javafx-recorder/.externalToolBuilders/
marathon-javafx/marathon-javafx-agent/test-output/
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ext.appName = "Marathon (OSS) (Java Version)"
subprojects {
apply plugin: 'java'
apply plugin: 'eclipse'
version = '4.2.0.0'
version = '4.2.1.0'
task allDependencies(type: DependencyReportTask) {}

tasks.withType(JavaCompile) {
Expand Down
5 changes: 5 additions & 0 deletions marathon-core/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Marathon Version 4.2.1.0 (June 30 2016)

1. Fixed: execute_script printing the output instead of returning.
2. Chore: get_title returns nil if there is no focused window.

Marathon Version 4.2.0.0 (Apr 11 2016)

1. Single application to support both Java/Swing and Java/FX.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ end

Gem::Specification.new do |s|
s.name = "marathon-javadriver"
s.version = "4.2.0.0"
s.version = "4.2.1.0"

s.authors = ["Jalian Systems Pvt. Ltd."]
s.email = "[email protected]"
Expand Down
2 changes: 1 addition & 1 deletion marathon/Marathon (FX).launch
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="net.sourceforge.marathon.Main"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="marathon"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms128m -Xmx512m -Dmarathon.agent.file=${resource_loc:/marathon-javafx-agent/marathon-javafx-agent-4.2.0.0.jar} -Dmarathon.recorder.file=${resource_loc:/marathon-javafx-recorder/marathon-javafx-recorder-4.2.0.0.jar}"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms128m -Xmx512m -Dmarathon.agent.file=${resource_loc:/marathon-javafx-agent/marathon-javafx-agent-4.2.1.0.jar} -Dmarathon.recorder.file=${resource_loc:/marathon-javafx-recorder/marathon-javafx-recorder-4.2.1.0.jar}"/>
</launchConfiguration>
2 changes: 1 addition & 1 deletion marathon/Marathon (Swing).launch
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="net.sourceforge.marathon.Main"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="marathon"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms128m -Xmx512m -Dmarathon.agent.file=${resource_loc:/marathon-java-agent/marathon-java-agent-4.2.0.0.jar} -Dmarathon.recorder.file=${resource_loc:/marathon-java-recorder/marathon-java-recorder-4.2.0.0.jar}"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms128m -Xmx512m -Dmarathon.agent.file=${resource_loc:/marathon-java-agent/marathon-java-agent-4.2.1.0.jar} -Dmarathon.recorder.file=${resource_loc:/marathon-java-recorder/marathon-java-recorder-4.2.1.0.jar}"/>
</launchConfiguration>

0 comments on commit abc6544

Please sign in to comment.