Merge pull request TooTallNate#445 from marci4/master

marci4 · web-flow · commit 627516d94c2c · 2017-03-27T09:43:14.000+02:00
Update versions
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
- Copyright (c) 2010-2012 Nathan Rajlich
+ Copyright (c) 2010-2017 Nathan Rajlich
 
  Permission is hereby granted, free of charge, to any person
  obtaining a copy of this software and associated documentation
diff --git a/build.gradle b/build.gradle
@@ -9,7 +9,7 @@ repositories {
 }
 
 group = 'org.java_websocket'
-version = '1.3.1-snapshot'
+version = '1.3.1'
 sourceCompatibility = 1.6
 targetCompatibility = 1.6
 
diff --git a/pom.xml b/pom.xml
@@ -13,7 +13,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.java-websocket</groupId>
     <artifactId>Java-WebSocket</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.3.1</version>
     <packaging>jar</packaging>
     <name>Java WebSocket</name>
     <url>http://java-websocket.org/</url>
@@ -103,6 +103,15 @@
                 <role>maintainer</role>
             </roles>
         </developer>
+        <developer>
+            <id>marci4</id>
+            <name>Marcel Prestel</name>
+            <email>admin@marci4.de</email>
+            <url>https://github.com/marci4</url>
+            <roles>
+                <role>maintainer</role>
+            </roles>
+        </developer>
     </developers>
     <licenses>
         <license>
@@ -132,7 +141,7 @@
                 </execution>                                                                                                        
               </executions>                                                                                                         
               <configuration>                                                                                                       
-                <keyname>rohmer.david@gmail.com</keyname>                                                                                          
+                <keyname>rohmer.david@gmail.com</keyname>
               </configuration>                                                                                                      
             </plugin>                                                                                                               
           </plugins>                                                                                                                
diff --git a/project.clj b/project.clj
@@ -1,4 +1,4 @@
-(defproject org.java-websocket/java-websocket "1.3.1-snapshot"
+(defproject org.java-websocket/java-websocket "1.3.1"
   :description "A barebones WebSocket client and server implementation written 100% in Java"
   :url "http://java-websocket.org/"
   :scm {:name "git"
@@ -17,6 +17,10 @@
                              [:developer
                                [:name "David Rohmer"]
                                [:url "https://github.com/Davidiusdadi"]
-                               [:email "rohmer.david@gmail.com"]]])
+                               [:email "rohmer.david@gmail.com"]]
+                             [:developer
+                               [:name "Marcel Prestel"]
+                               [:url "https://github.com/marci4"]
+                               [:email "admin@marci4.de"]]])
 
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`- Copyright (c) 2010-2012 Nathan Rajlich`
	`1`	`+ Copyright (c) 2010-2017 Nathan Rajlich`
`2`	`2`
`3`	`3`	`Permission is hereby granted, free of charge, to any person`
`4`	`4`	`obtaining a copy of this software and associated documentation`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ repositories {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`group = 'org.java_websocket'`
`12`		`-version = '1.3.1-snapshot'`
	`12`	`+version = '1.3.1'`
`13`	`13`	`sourceCompatibility = 1.6`
`14`	`14`	`targetCompatibility = 1.6`
`15`	`15`