Merge branch 'master' into 1.0.X

Conflicts: CHANGELOG.md README.md hipster-all/pom.xml hipster-core/pom.xml hipster-examples/pom.xml hipster-extensions/pom.xml hipster-test/pom.xml hipster-third-party-graphs/pom.xml pom.xml
citiususc · May 16, 2016 · db2078b · db2078b
2 parents 4313cab + 21f04c0
commit db2078b
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Change Log
 
+## [1.0.1](https://github.com/citiususc/hipster/tree/1.0.1) (2016-05-16)
+[Full Changelog](https://github.com/citiususc/hipster/compare/v1.0.0...1.0.1)
+
+**Fixed bugs:**
+
+- open queue does not manage repeated elements [\#170](https://github.com/citiususc/hipster/issues/170)
+
+**Closed issues:**
+
+- Add heuristic to maze example [\#165](https://github.com/citiususc/hipster/issues/165)
+- Implementation of Annealing localsearch [\#158](https://github.com/citiususc/hipster/issues/158)
+
 ## [v1.0.0](https://github.com/citiususc/hipster/tree/v1.0.0) (2016-02-22)
 [Full Changelog](https://github.com/citiususc/hipster/compare/v1.0.0-rc2...v1.0.0)
 

diff --git a/README.md b/README.md
@@ -67,14 +67,14 @@ You can use the latest (unstable) version of Hipster under development. Just add
   <dependency>
     <groupId>es.usc.citius.hipster</groupId>
     <artifactId>hipster-all</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.2-SNAPSHOT</version>
   </dependency>
 </dependencies>
 ```
 
 #### Releases
 
-Current stable release is v1.0.0. See the [milestones](https://github.com/citiususc/hipster/milestones) to check the current development status.
+Current stable release is v1.0.1. See the [milestones](https://github.com/citiususc/hipster/milestones) to check the current development status.
 
 ```xml
 <dependencies>
@@ -86,7 +86,7 @@ Current stable release is v1.0.0. See the [milestones](https://github.com/citius
   <dependency>
     <groupId>es.usc.citius.hipster</groupId>
     <artifactId>hipster-all</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
   </dependency>
 </dependencies>
 ```

diff --git a/hipster-all/pom.xml b/hipster-all/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>es.usc.citius.hipster</groupId>
         <artifactId>hipster-pom</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>hipster-all</artifactId>

diff --git a/hipster-core/pom.xml b/hipster-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>es.usc.citius.hipster</groupId>
         <artifactId>hipster-pom</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>hipster-core</artifactId>

diff --git a/hipster-examples/pom.xml b/hipster-examples/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>es.usc.citius.hipster</groupId>
         <artifactId>hipster-pom</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>hipster-examples</artifactId>

diff --git a/hipster-extensions/pom.xml b/hipster-extensions/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>hipster-pom</artifactId>
         <groupId>es.usc.citius.hipster</groupId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/hipster-test/pom.xml b/hipster-test/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>es.usc.citius.hipster</groupId>
         <artifactId>hipster-pom</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>hipster-test</artifactId>

diff --git a/hipster-third-party-graphs/pom.xml b/hipster-third-party-graphs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>es.usc.citius.hipster</groupId>
         <artifactId>hipster-pom</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -15,13 +15,13 @@
         <!-- Site config -->
         <site.url>http://hipster4j.org</site.url>
         <!-- Hipster version -->
-        <hipster.version>1.0.1-SNAPSHOT</hipster.version>
+        <hipster.version>1.0.1</hipster.version>
     </properties>
 
     <groupId>es.usc.citius.hipster</groupId>
     <artifactId>hipster-pom</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.1</version>
 
     <name>hipster-pom</name>
     <url>${site.url}</url>