From b7aaecfc65149184e6d4bb48cae965c732e5604d Mon Sep 17 00:00:00 2001
From: Tilen Faganel <tilen.faganel@me.com>
Date: Sat, 9 Sep 2017 00:19:03 +0200
Subject: [PATCH 1/3] Updated the main KumuluzEE version to 2.4.0

---
 pom.xml                                       | 20 ++++---------------
 .../com/kumuluz/ee/cors/CorsExtension.java    |  2 +-
 .../kumuluz/ee/cors/utils/CorsConfigUtil.java |  3 ++-
 3 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7a4da45..2e287b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,11 +18,13 @@
     <url>https://ee.kumuluz.com</url>
 
     <properties>
-        <kumuluzee.version>2.4.0-SNAPSHOT</kumuluzee.version>
-        <cors-filter.version>2.5</cors-filter.version>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+        <kumuluzee.version>2.4.0</kumuluzee.version>
+        <cors-filter.version>2.5</cors-filter.version>
+
         <maven-compiler-plugin.version>3.6.1</maven-compiler-plugin.version>
         <nexus.staging.plugin.version>1.6.8</nexus.staging.plugin.version>
         <gpg.plugin.version>1.6</gpg.plugin.version>
@@ -122,20 +124,6 @@
                 </executions>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>3.0.1</version>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
             <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
diff --git a/src/main/java/com/kumuluz/ee/cors/CorsExtension.java b/src/main/java/com/kumuluz/ee/cors/CorsExtension.java
index 303a3f0..37babee 100644
--- a/src/main/java/com/kumuluz/ee/cors/CorsExtension.java
+++ b/src/main/java/com/kumuluz/ee/cors/CorsExtension.java
@@ -22,7 +22,7 @@
  * @author Zvone Gazvoda
  */
 @EeExtensionDef(name = "Cors", group = EeExtensionGroup.CORS)
-@EeComponentDependencies({@EeComponentDependency(EeComponentType.SERVLET)})
+@EeComponentDependency(EeComponentType.SERVLET)
 public class CorsExtension implements Extension {
 
     private static final Logger log = Logger.getLogger(CorsExtension.class.getName());
diff --git a/src/main/java/com/kumuluz/ee/cors/utils/CorsConfigUtil.java b/src/main/java/com/kumuluz/ee/cors/utils/CorsConfigUtil.java
index c0f162a..347c349 100644
--- a/src/main/java/com/kumuluz/ee/cors/utils/CorsConfigUtil.java
+++ b/src/main/java/com/kumuluz/ee/cors/utils/CorsConfigUtil.java
@@ -13,11 +13,12 @@
 public class CorsConfigUtil {
 
     static void updateCorsConfig(CorsConfig config, CrossOrigin annotation, Class clazz, Method method) {
+
         if (annotation == null) {
             return;
         }
 
-        String key = null;
+        String key;
 
         if (annotation.name().length() != 0) {
             key = annotation.name();

From 79026f476f6ef86b047b7cef1e137b6e89fefb35 Mon Sep 17 00:00:00 2001
From: Tilen Faganel <tilen.faganel@me.com>
Date: Sat, 9 Sep 2017 00:24:52 +0200
Subject: [PATCH 2/3] Release v1.0.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2e287b1..b95b63e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.kumuluz.ee.cors</groupId>
     <artifactId>kumuluzee-cors</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.0</version>
 
     <name>KumuluzEE CORS</name>
 

From 93b0f0e9989bf3fcaf1e1a2785c40e9d6d517191 Mon Sep 17 00:00:00 2001
From: Tilen Faganel <tilen.faganel@me.com>
Date: Sat, 9 Sep 2017 00:24:57 +0200
Subject: [PATCH 3/3] Updated to next SNAPSHOT version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b95b63e..2e287b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.kumuluz.ee.cors</groupId>
     <artifactId>kumuluzee-cors</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.0-SNAPSHOT</version>
 
     <name>KumuluzEE CORS</name>