Merge pull request #5 from SBI-/master

Use tycho 1.2.0
jazz-community · Jul 5, 2018 · 7c5fe42 · 7c5fe42
2 parents 92694a0 + de954dc
commit 7c5fe42
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 14 deletions.
diff --git a/plugin/META-INF/MANIFEST.MF b/plugin/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Base
 Bundle-SymbolicName: com.siemens.bt.jazz.services.base;singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 3.0.1.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Export-Package: com.siemens.bt.jazz.services.base,
  com.siemens.bt.jazz.services.base.rest,

diff --git a/plugin/pom.xml b/plugin/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.siemens.bt.jazz.services.base</groupId>
         <artifactId>com.siemens.bt.jazz.services.base.parent</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>3.0.1-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 

diff --git a/plugin/src/main/java/com/siemens/bt/jazz/services/base/router/map/ServiceMap.java b/plugin/src/main/java/com/siemens/bt/jazz/services/base/router/map/ServiceMap.java
@@ -33,13 +33,10 @@ public void add(
             HttpConstants.HttpMethod method,
             String path,
             ServiceFactory factory) {
-
-        String pattern = path;
-
-        if (!services.containsKey(pattern)) {
-            services.put(pattern, new HashMap<HttpConstants.HttpMethod, ServiceFactory>());
+        if (!services.containsKey(path)) {
+            services.put(path, new HashMap<HttpConstants.HttpMethod, ServiceFactory>());
         }
 
-        services.get(pattern).put(method, factory);
+        services.get(path).put(method, factory);
     }
 }
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>com.siemens.bt.jazz.services.base</groupId>
     <artifactId>com.siemens.bt.jazz.services.base.parent</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.0.1-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -22,7 +22,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <tycho-version>1.0.0</tycho-version>
+        <tycho-version>1.2.0</tycho-version>
     </properties>
 
     <build>

diff --git a/test/META-INF/MANIFEST.MF b/test/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.siemens.bt.jazz.services.base
 Bundle-SymbolicName: com.siemens.bt.jazz.services.base.test;singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 3.0.1.qualifier
 Bundle-Vendor: VENDOR
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ClassPath: target/dependency/junit-4.12.jar,
  target/dependency/hamcrest-core-1.3.jar,
  target/dependency/gson-2.8.5.jar,
- target/dependency/com.siemens.bt.jazz.services.base-3.0.0-SNAPSHOT.jar,
+ target/dependency/com.siemens.bt.jazz.services.base-3.0.1-SNAPSHOT.jar,
  .
 Require-Bundle: com.ibm.team.repository.common,
  com.ibm.team.repository.service,

diff --git a/test/pom.xml b/test/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.siemens.bt.jazz.services.base</groupId>
         <artifactId>com.siemens.bt.jazz.services.base.parent</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>3.0.1-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.siemens.bt.jazz.services.base</groupId>
             <artifactId>com.siemens.bt.jazz.services.base</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
+            <version>3.0.1-SNAPSHOT</version>
         </dependency>
     </dependencies>