Updated the main KumuluzEE version to 2.4.0

kumuluz · Sep 8, 2017 · b7aaecf · b7aaecf
1 parent d4141ab
commit b7aaecf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 18 deletions.
diff --git 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
@@ -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
@@ -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();