From 1c71606ac9d4cf64a89afbeace9ab280cede0579 Mon Sep 17 00:00:00 2001
From: serso <se.solovyev@gmail.com>
Date: Mon, 8 Sep 2014 21:25:38 +0200
Subject: [PATCH] POM dependency versions fixed

---
 .idea/modules.xml        |  3 ---
 android-app-core.iml     |  4 +---
 android-app-onscreen.iml |  4 +---
 android-app-widget.iml   |  4 +---
 android-app.iml          |  6 +-----
 core.iml                 |  2 +-
 pom.xml                  | 10 +++++-----
 7 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/.idea/modules.xml b/.idea/modules.xml
index e35ea293..75115f27 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -52,10 +52,7 @@
       <module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-wizard_1.1.15.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-wizard_1.1.15.iml" />
       <module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-wizard_1.1.15.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-wizard_1.1.15.iml" />
       <module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_calculatorpp-android-app-core_2.0.2.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_calculatorpp-android-app-core_2.0.2.iml" />
-      <module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_calculatorpp-android-app-core_2.0.2.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_calculatorpp-android-app-core_2.0.2.iml" />
       <module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_calculatorpp-android-app-onscreen_2.0.2.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_calculatorpp-android-app-onscreen_2.0.2.iml" />
-      <module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_calculatorpp-android-app-onscreen_2.0.2.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_calculatorpp-android-app-onscreen_2.0.2.iml" />
-      <module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_calculatorpp-android-app-widget_2.0.2.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_calculatorpp-android-app-widget_2.0.2.iml" />
       <module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_calculatorpp-android-app-widget_2.0.2.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_calculatorpp-android-app-widget_2.0.2.iml" />
     </modules>
   </component>
diff --git a/android-app-core.iml b/android-app-core.iml
index 398f2594..410b3290 100644
--- a/android-app-core.iml
+++ b/android-app-core.iml
@@ -28,13 +28,11 @@
       <sourceFolder url="file://$MODULE_DIR$/android-app-core/target/generated-sources/r" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/android-app-core/target/generated-sources/aidl" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/android-app-core/src/main/java" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/apidocs" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/classes" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/classes-instrumented" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/generated-sources/combined-assets" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/generated-sources/combined-resources" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/generated-sources/extracted-dependencies" />
-      <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/javadoc-bundle-options" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/maven-archiver" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/maven-status" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/unpack" />
@@ -47,7 +45,7 @@
     <orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:2.0.1" level="project" />
     <orderEntry type="library" name="Maven: org.solovyev:common-listeners:1.0.7" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:11.0.2" level="project" />
-    <orderEntry type="library" name="Maven: org.solovyev:jscl:1.0.7" level="project" />
+    <orderEntry type="library" name="Maven: org.solovyev:jscl:1.0.8" level="project" />
     <orderEntry type="library" name="Maven: org.solovyev:common-msg:1.0.5" level="project" />
     <orderEntry type="library" name="Maven: org.simpleframework:simple-xml:2.6.1" level="project" />
     <orderEntry type="library" name="Maven: stax:stax:1.2.0" level="project" />
diff --git a/android-app-onscreen.iml b/android-app-onscreen.iml
index 9076d784..d268f741 100644
--- a/android-app-onscreen.iml
+++ b/android-app-onscreen.iml
@@ -28,13 +28,11 @@
       <sourceFolder url="file://$MODULE_DIR$/android-app-onscreen/target/generated-sources/r" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/android-app-onscreen/target/generated-sources/aidl" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/android-app-onscreen/src/main/java" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/apidocs" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/classes" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/classes-instrumented" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/generated-sources/combined-assets" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/generated-sources/combined-resources" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/generated-sources/extracted-dependencies" />
-      <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/javadoc-bundle-options" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/maven-archiver" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/maven-status" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/unpack" />
@@ -47,7 +45,7 @@
     <orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:2.0.1" level="project" />
     <orderEntry type="library" name="Maven: org.solovyev:common-listeners:1.0.7" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:11.0.2" level="project" />
-    <orderEntry type="library" name="Maven: org.solovyev:jscl:1.0.7" level="project" />
+    <orderEntry type="library" name="Maven: org.solovyev:jscl:1.0.8" level="project" />
     <orderEntry type="library" name="Maven: org.solovyev:common-msg:1.0.5" level="project" />
     <orderEntry type="library" name="Maven: org.simpleframework:simple-xml:2.6.1" level="project" />
     <orderEntry type="library" name="Maven: stax:stax:1.2.0" level="project" />
diff --git a/android-app-widget.iml b/android-app-widget.iml
index 1d6b2d10..89a1878b 100644
--- a/android-app-widget.iml
+++ b/android-app-widget.iml
@@ -28,13 +28,11 @@
       <sourceFolder url="file://$MODULE_DIR$/android-app-widget/target/generated-sources/r" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/android-app-widget/target/generated-sources/aidl" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/android-app-widget/src/main/java" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/apidocs" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/classes" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/classes-instrumented" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/generated-sources/combined-assets" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/generated-sources/combined-resources" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/generated-sources/extracted-dependencies" />
-      <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/javadoc-bundle-options" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/maven-archiver" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/maven-status" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/unpack" />
@@ -47,7 +45,7 @@
     <orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:2.0.1" level="project" />
     <orderEntry type="library" name="Maven: org.solovyev:common-listeners:1.0.7" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:11.0.2" level="project" />
-    <orderEntry type="library" name="Maven: org.solovyev:jscl:1.0.7" level="project" />
+    <orderEntry type="library" name="Maven: org.solovyev:jscl:1.0.8" level="project" />
     <orderEntry type="library" name="Maven: org.solovyev:common-msg:1.0.5" level="project" />
     <orderEntry type="library" name="Maven: org.simpleframework:simple-xml:2.6.1" level="project" />
     <orderEntry type="library" name="Maven: stax:stax:1.2.0" level="project" />
diff --git a/android-app.iml b/android-app.iml
index f149f25b..e5068c13 100644
--- a/android-app.iml
+++ b/android-app.iml
@@ -28,17 +28,13 @@
       <sourceFolder url="file://$MODULE_DIR$/android-app/target/generated-sources/aidl" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/android-app/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/android-app/src/test/java" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/android-app/target/apidocs" />
       <excludeFolder url="file://$MODULE_DIR$/android-app/target/classes" />
       <excludeFolder url="file://$MODULE_DIR$/android-app/target/classes-instrumented" />
       <excludeFolder url="file://$MODULE_DIR$/android-app/target/generated-sources/combined-assets" />
       <excludeFolder url="file://$MODULE_DIR$/android-app/target/generated-sources/combined-resources" />
       <excludeFolder url="file://$MODULE_DIR$/android-app/target/generated-sources/extracted-dependencies" />
-      <excludeFolder url="file://$MODULE_DIR$/android-app/target/gpg" />
-      <excludeFolder url="file://$MODULE_DIR$/android-app/target/javadoc-bundle-options" />
       <excludeFolder url="file://$MODULE_DIR$/android-app/target/maven-archiver" />
       <excludeFolder url="file://$MODULE_DIR$/android-app/target/maven-status" />
-      <excludeFolder url="file://$MODULE_DIR$/android-app/target/proguard" />
       <excludeFolder url="file://$MODULE_DIR$/android-app/target/surefire-reports" />
       <excludeFolder url="file://$MODULE_DIR$/android-app/target/test-classes" />
       <excludeFolder url="file://$MODULE_DIR$/android-app/target/unpack" />
@@ -51,7 +47,7 @@
     <orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:2.0.1" level="project" />
     <orderEntry type="library" name="Maven: org.solovyev:common-listeners:1.0.7" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:11.0.2" level="project" />
-    <orderEntry type="library" name="Maven: org.solovyev:jscl:1.0.7" level="project" />
+    <orderEntry type="library" name="Maven: org.solovyev:jscl:1.0.8" level="project" />
     <orderEntry type="library" name="Maven: org.solovyev:common-msg:1.0.5" level="project" />
     <orderEntry type="library" name="Maven: org.simpleframework:simple-xml:2.6.1" level="project" />
     <orderEntry type="library" name="Maven: stax:stax:1.2.0" level="project" />
diff --git a/core.iml b/core.iml
index 060e8a30..0cd77e3a 100644
--- a/core.iml
+++ b/core.iml
@@ -22,7 +22,7 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.0" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:11.0.2" level="project" />
-    <orderEntry type="library" name="Maven: org.solovyev:jscl:1.0.7" level="project" />
+    <orderEntry type="library" name="Maven: org.solovyev:jscl:1.0.8" level="project" />
     <orderEntry type="library" name="Maven: org.solovyev:common-msg:1.0.5" level="project" />
     <orderEntry type="library" name="Maven: org.simpleframework:simple-xml:2.6.1" level="project" />
     <orderEntry type="library" name="Maven: stax:stax:1.2.0" level="project" />
diff --git a/pom.xml b/pom.xml
index eaa827ce..0b2daf99 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
 		<connection>scm:git:git@github.com:serso/android-calculatorpp.git</connection>
 		<developerConnection>scm:git:git@github.com:serso/android-calculatorpp.git</developerConnection>
 		<url>http://github.com/serso/android-calculatorpp</url>
-		<tag>release-2.0.1</tag>
+		<tag>release-2.0.5</tag>
 	</scm>
 
 	<pluginRepositories>
@@ -82,27 +82,27 @@
 			<dependency>
 				<groupId>org.solovyev.android</groupId>
 				<artifactId>calculatorpp-core</artifactId>
-				<version>2.0.2</version>
+				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
 				<groupId>org.solovyev.android</groupId>
 				<artifactId>calculatorpp-android-app-core</artifactId>
-				<version>2.0.2</version>
+				<version>${project.version}</version>
 				<type>apklib</type>
 			</dependency>
 
 			<dependency>
 				<groupId>org.solovyev.android</groupId>
 				<artifactId>calculatorpp-android-app-widget</artifactId>
-				<version>2.0.2</version>
+				<version>${project.version}</version>
 				<type>apklib</type>
 			</dependency>
 
 			<dependency>
 				<groupId>org.solovyev.android</groupId>
 				<artifactId>calculatorpp-android-app-onscreen</artifactId>
-				<version>2.0.2</version>
+				<version>${project.version}</version>
 				<type>apklib</type>
 			</dependency>