Merge commit '62c2d30faa9266341f6366573899d6820656ac17'

README.md

@@ -24,9 +24,9 @@ This is the plugin to translate [SonarQube](http://www.sonarqube.org/) web appli
 * then copy the `target\*.jar` into extensions dir of the SonarQube like it described in SonarQube docs
 
 ## Compatibility Matrix
-SonarQube     | 5.6.1 (LTS) | 6.0 |
---------------|-------------|-----|
-sonar-l10n-ru | 1.0         | 1.1 |
+SonarQube     | 5.6.x (LTS) | 6.0 | 6.1 |
+--------------|-------------|-----|-----|
+sonar-l10n-ru | 1.0         | 1.1 | 1.2 |
 
 ## Have questions or feedback?
 

pom.xml

@@ -10,7 +10,7 @@
 
   <groupId>org.sonarqube.l10n.ru</groupId>
   <artifactId>sonar-l10n-ru-plugin</artifactId>
-  <version>1.1</version>
+  <version>1.2</version>
   <packaging>sonar-plugin</packaging>
 
   <name>Russian Pack for SonarQube</name>
@@ -45,13 +45,13 @@
     <connection>scm:git:git://github.com/silverbulleters/sonar-l10n-ru.git</connection>
     <developerConnection>scm:git:[email protected]:silverbulleters/sonar-l10n-ru.git</developerConnection>
     <url>https://github.com/silverbulleters/sonar-l10n-ru</url>
-    <tag>1.1</tag>
+    <tag>1.2</tag>
   </scm>
 
   <properties>
     <sonar.pluginClass>org.silverbulleters.sonar.plugins.l10n.RussianPackPlugin</sonar.pluginClass>
     <sonar.pluginKey>l10nru</sonar.pluginKey>
-    <sonarqube.version>6.0</sonarqube.version>
+    <sonarqube.version>6.1</sonarqube.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <sonar.sslrVersion>1.21</sonar.sslrVersion>
     <sonar.sslrSquidBridgeVersion>2.6.1</sonar.sslrSquidBridgeVersion>

rebuild-and-restart.sh

@@ -4,6 +4,6 @@ echo "on MSWIN use msgit with linux extension sed,grep and others"
 
 mvn clean package -Dlicense.skip=true
 
-docker run -d --name=sq-develop -p 9000:9000 sonarqube:6.0-alpine || docker stop sq-develop
+docker run -d --name=sq-develop -p 9000:9000 sonarqube:6.1-alpine || docker stop sq-develop
 docker cp ./target/*.jar sq-develop:/opt/sonarqube/extensions/plugins/
 docker start sq-develop