Merge pull request #660 from guwirth/release/0.9.4

prepare 0.9.4 release
SonarOpenCommunity · Oct 24, 2015 · 87924c9 · 87924c9
2 parents 94adcd5 + f2fee6c
commit 87924c9
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 8 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -32,8 +32,8 @@ cache:
   - C:\maven\
   - C:\Users\appveyor\.m2
 artifacts:
-  - path: 'sonar-cxx-plugin\target\sonar-cxx-plugin-0.9.4-SNAPSHOT.jar'
-  - path: 'sslr-cxx-toolkit\target\sslr-cxx-toolkit-0.9.4-SNAPSHOT.jar'
+  - path: 'sonar-cxx-plugin\target\sonar-cxx-plugin-0.9.4.jar'
+  - path: 'sslr-cxx-toolkit\target\sslr-cxx-toolkit-0.9.4.jar'
 on_failure:
   - ps: Get-ChildItem cxx-squid\target\surefire-reports\*.txt | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
   - ps: Get-ChildItem cxx-checks\target\surefire-reports\*.txt | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }

diff --git a/cxx-checks/pom.xml b/cxx-checks/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.codehaus.sonar-plugins.cxx</groupId>
     <artifactId>cxx</artifactId>
-    <version>0.9.4-SNAPSHOT</version>
+    <version>0.9.4</version>
   </parent>
 
   <artifactId>cxx-checks</artifactId>

diff --git a/cxx-squid/pom.xml b/cxx-squid/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.codehaus.sonar-plugins.cxx</groupId>
     <artifactId>cxx</artifactId>
-    <version>0.9.4-SNAPSHOT</version>
+    <version>0.9.4</version>
   </parent>
 
   <artifactId>cxx-squid</artifactId>

diff --git a/integration-tests/features/environment.py b/integration-tests/features/environment.py
@@ -37,6 +37,7 @@
 BASEDIR = os.path.dirname(os.path.realpath(__file__))
 JARPATTERN1 = os.path.join(BASEDIR, "../../sonar-cxx-plugin/target/*SNAPSHOT.jar")
 JARPATTERN2 = os.path.join(BASEDIR, "../../sonar-cxx-plugin/target/*RC?.jar")
+JARPATTERN3 = os.path.join(BASEDIR, "../../sonar-cxx-plugin/target/*-?.?.?.jar")
 RELPATH_PLUGINS = "extensions/plugins"
 didstartsonar = False
 
@@ -144,6 +145,9 @@ def jarpath():
     jars = glob(JARPATTERN2)
     if jars:
         return os.path.normpath(jars[0])
+    jars = glob(JARPATTERN3)
+    if jars:
+        return os.path.normpath(jars[0])        
     return None
 
 

diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>org.codehaus.sonar-plugins.cxx</groupId>
   <artifactId>cxx</artifactId>
-  <version>0.9.4-SNAPSHOT</version>
+  <version>0.9.4</version>
   <packaging>pom</packaging>
 
   <name>Cxx</name>
@@ -97,7 +97,12 @@
     <developer>
       <id>Zetten</id>
       <name>Peter van Zetten</name>
-      <email>[email protected]</email>
+      <email>[email protected]</email>
+    </developer>
+    <developer>
+      <id>cbagwell</id>
+      <name>Chris Bagwell</name>
+      <email>[email protected]</email>
     </developer>
   </developers>
 

diff --git a/sonar-cxx-plugin/pom.xml b/sonar-cxx-plugin/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.codehaus.sonar-plugins.cxx</groupId>
     <artifactId>cxx</artifactId>
-    <version>0.9.4-SNAPSHOT</version>
+    <version>0.9.4</version>
   </parent>
 
   <artifactId>sonar-cxx-plugin</artifactId>

diff --git a/sslr-cxx-toolkit/pom.xml b/sslr-cxx-toolkit/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.codehaus.sonar-plugins.cxx</groupId>
     <artifactId>cxx</artifactId>
-    <version>0.9.4-SNAPSHOT</version>
+    <version>0.9.4</version>
   </parent>
 
   <artifactId>sslr-cxx-toolkit</artifactId>