Merge pull request #1139 from swagger-api/develop_2.0

merge from develop 2.0 for release

Author: fehguy

.gitignore

@@ -10,4 +10,5 @@ samples/scala-play2/logs
 .cache
 atlassian-ide-plugin.xml
 *.iml
-.java-version
+.java-version
+sonar-project.properties

README.md

@@ -29,7 +29,7 @@ The Swagger Specification has undergone 3 revisions since initial creation in 20
 
 Swagger core Version      | Release Date | Swagger Spec compatibility | Notes | Status
 ------------------------- | ------------ | -------------------------- | ----- | ----
-1.5.2-M2                  | 2015-04-05   | 2.0           | [master](https://github.com/swagger-api/swagger-core) | Supported
+1.5.0                     | 2015-06-06   | 2.0           | [master](https://github.com/swagger-api/swagger-core) | Supported
 1.3.12                    | 2014-12-23   | 1.2           | [tag v1.3.12](https://github.com/swagger-api/swagger-core/tree/v1.3.12) | Supported
 1.2.4                     | 2013-06-19   | 1.1           | [tag swagger-project_2.10.0-1.2.4](https://github.com/swagger-api/swagger-core/tree/swagger-project_2.10.0-1.2.4) | Deprecated
 1.0.0                     | 2011-10-16   | 1.0           | [tag v1.0](https://github.com/swagger-api/swagger-core/tree/v1.0) | Deprecated
@@ -43,7 +43,6 @@ This is a project to build the swagger-core library, which is required for the S
 ### Change History
 If you're interested in the change history of swagger and the swagger-core framework, see [here](https://github.com/swagger-api/swagger-core/wiki/Changelog).
 
-
 ### Prerequisites
 You need the following installed and available in your $PATH:
 
@@ -52,7 +51,7 @@ You need the following installed and available in your $PATH:
 * Jackson 2.4.2 or greater
 
 
-### To build from source (currently 1.5.2-M2)
+### To build from source (currently 1.5.0)
 ```
 # first time building locally
 mvn -N
@@ -63,24 +62,19 @@ Subsequent builds:
 mvn install
 ```
 
-This will build the modules.  To build sample apps, activate the `samples` profile:
-
-```
-mvn install -Psamples
-```
+This will build the modules.
 
 Of course if you don't want to build locally you can grab artifacts from maven central:
 
-`http://repo1.maven.org/maven2/com/wordnik/`
+`http://repo1.maven.org/maven2/io/swagger/`
 
-## Sample Apps
-There are a number of sample apps in the [samples](https://github.com/swagger-api/swagger-core/blob/master/samples) folder.
+## Sample Apps - *UPDATED*
+The samples have moved to [a new repository](https://github.com/swagger-api/swagger-samples) and contain various integrations and configurations.
 
-```
 
-License
--------
+## License
 
+```
 Copyright 2015 SmartBear Software
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -92,4 +86,4 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-
+```

modules/swagger-annotations/pom.xml

@@ -1,34 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <groupId>com.wordnik</groupId>
-    <artifactId>swagger-project</artifactId>
-    <version>1.5.2-M2</version>
-    <relativePath>../..</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.wordnik</groupId>
-  <artifactId>swagger-annotations</artifactId>
-  <version>1.5.2-M2</version>
-  <packaging>bundle</packaging>
-  <name>swagger-annotations</name>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>io.swagger</groupId>
+        <artifactId>swagger-project</artifactId>
+        <version>1.5.0</version>
+        <relativePath>../..</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>io.swagger</groupId>
+    <artifactId>swagger-annotations</artifactId>
+    <version>1.5.0</version>
+    <packaging>bundle</packaging>
+    <name>swagger-annotations</name>
 
-  <build>
-    <sourceDirectory>src/main/java</sourceDirectory>
-    <defaultGoal>install</defaultGoal>
+    <build>
+        <sourceDirectory>src/main/java</sourceDirectory>
+        <defaultGoal>install</defaultGoal>
 
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Export-Package>com.wordnik.swagger.annotations</Export-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Export-Package>io.swagger.annotations</Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
 
-  </build>
+    </build>
 </project>