Merge branch 'release/V2.7'

Riverside-Software · Mar 26, 2020 · 044267d · 044267d
2 parents b2bc401 + 84cf217
commit 044267d
Show file tree

Hide file tree

Showing 328 changed files with 7,875 additions and 1,207 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -16,27 +16,27 @@ pipeline {
               // Maven Central deployment:  'mvn -P release clean package verify deploy'
               sh "git rev-parse HEAD > current-commit"
               def currCommit = readFile('current-commit').replace("\n", "").replace("\r", "")
-              sh "mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install -Dmaven.test.failure.ignore=true -Dgit.commit=${currCommit}"
+              sh "mvn clean javadoc:javadoc install -Dmaven.test.failure.ignore=true -Dgit.commit=${currCommit}"
             } else {
-              sh "mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package -Dmaven.test.failure.ignore=true"
+              sh "mvn clean package -Dmaven.test.failure.ignore=true"
             }
           }
         }
         archiveArtifacts artifacts: 'openedge-plugin/target/sonar-openedge-plugin-*.jar'
         step([$class: 'Publisher', reportFilenamePattern: '**/target/surefire-reports/testng-results.xml'])
       }
     }
+
     stage ('SonarQube analysis') {
       steps {
         script {
           withEnv(["PATH+MAVEN=${tool name: 'Maven 3', type: 'hudson.tasks.Maven$MavenInstallation'}/bin"]) {
-            withCredentials([string(credentialsId: 'AdminTokenSonarQube', variable: 'SQ_TOKEN')]) {
+            withSonarQubeEnv(credentialsId: 'SQToken', installationName: 'RSSW') {
               if (("master" == env.BRANCH_NAME) || ("develop" == env.BRANCH_NAME)) {
-                sh "mvn -Dsonar.host.url=http://sonar.riverside-software.fr -Dsonar.login=${env.SQ_TOKEN} -Dsonar.branch.name=${env.BRANCH_NAME} org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
-              } else if (env.BRANCH_NAME.startsWith("release") || env.BRANCH_NAME.startsWith("hotfix")) {
-                sh "mvn -Dsonar.host.url=http://sonar.riverside-software.fr -Dsonar.login=${env.SQ_TOKEN} -Dsonar.branch.name=${env.BRANCH_NAME} -Dsonar.branch.target=master org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
+                sh "mvn -Dsonar.branch.name=${env.BRANCH_NAME} sonar:sonar"
               } else {
-                sh "mvn -Dsonar.host.url=http://sonar.riverside-software.fr -Dsonar.login=${env.SQ_TOKEN} -Dsonar.branch.name=${env.BRANCH_NAME} -Dsonar.branch.target=develop org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
+                def targetBranch = env.BRANCH_NAME.startsWith("release") ? "master" : "develop"
+                sh "mvn -Dsonar.branch.name=${env.BRANCH_NAME} -Dsonar.branch.target=${targetBranch} sonar:sonar"
               }
             }
           }

diff --git a/database-parser/pom.xml b/database-parser/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>eu.rssw.openedge.parsers</groupId>
   <artifactId>database-parser</artifactId>
-  <version>2.6.4</version>
+  <version>2.7.0</version>
 
   <name>OpenEdge database definition lexer and parser</name>
   <description>OpenEdge dump files parser</description>
@@ -77,7 +77,37 @@
   </dependencies>
 
   <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.sonarsource.scanner.maven</groupId>
+          <artifactId>sonar-maven-plugin</artifactId>
+          <version>3.7.0.1746</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+
     <plugins>
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <version>0.8.5</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>prepare-agent</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>report</id>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>report</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
       <plugin>
         <groupId>org.antlr</groupId>
         <artifactId>antlr4-maven-plugin</artifactId>

diff --git a/database-parser/src/main/java/eu/rssw/antlr/database/DescriptiveErrorListener.java b/database-parser/src/main/java/eu/rssw/antlr/database/DescriptiveErrorListener.java
@@ -1,6 +1,6 @@
 /*
  * OpenEdge plugin for SonarQube
- * Copyright (c) 2015-2019 Riverside Software
+ * Copyright (c) 2015-2020 Riverside Software
  * contact AT riverside DASH software DOT fr
  * 
  * This program is free software; you can redistribute it and/or

diff --git a/database-parser/src/main/java/eu/rssw/antlr/database/DumpFileReleaseDescriptor.java b/database-parser/src/main/java/eu/rssw/antlr/database/DumpFileReleaseDescriptor.java
@@ -1,6 +1,6 @@
 /*
  * OpenEdge plugin for SonarQube
- * Copyright (c) 2015-2019 Riverside Software
+ * Copyright (c) 2015-2020 Riverside Software
  * contact AT riverside DASH software DOT fr
  * 
  * This program is free software; you can redistribute it and/or

diff --git a/database-parser/src/main/java/eu/rssw/antlr/database/DumpFileUtils.java b/database-parser/src/main/java/eu/rssw/antlr/database/DumpFileUtils.java
@@ -1,6 +1,6 @@
 /*
  * OpenEdge plugin for SonarQube
- * Copyright (c) 2015-2019 Riverside Software
+ * Copyright (c) 2015-2020 Riverside Software
  * contact AT riverside DASH software DOT fr
  * 
  * This program is free software; you can redistribute it and/or

diff --git a/database-parser/src/main/java/eu/rssw/antlr/database/DumpFileVisitor.java b/database-parser/src/main/java/eu/rssw/antlr/database/DumpFileVisitor.java
@@ -1,6 +1,6 @@
 /*
  * OpenEdge plugin for SonarQube
- * Copyright (c) 2015-2019 Riverside Software
+ * Copyright (c) 2015-2020 Riverside Software
  * contact AT riverside DASH software DOT fr
  * 
  * This program is free software; you can redistribute it and/or

diff --git a/database-parser/src/main/java/eu/rssw/antlr/database/objects/DatabaseDescription.java b/database-parser/src/main/java/eu/rssw/antlr/database/objects/DatabaseDescription.java
@@ -1,6 +1,6 @@
 /*
  * OpenEdge plugin for SonarQube
- * Copyright (c) 2015-2019 Riverside Software
+ * Copyright (c) 2015-2020 Riverside Software
  * contact AT riverside DASH software DOT fr
  * 
  * This program is free software; you can redistribute it and/or

diff --git a/database-parser/src/main/java/eu/rssw/antlr/database/objects/Field.java b/database-parser/src/main/java/eu/rssw/antlr/database/objects/Field.java
@@ -1,6 +1,6 @@
 /*
  * OpenEdge plugin for SonarQube
- * Copyright (c) 2015-2019 Riverside Software
+ * Copyright (c) 2015-2020 Riverside Software
  * contact AT riverside DASH software DOT fr
  * 
  * This program is free software; you can redistribute it and/or

diff --git a/database-parser/src/main/java/eu/rssw/antlr/database/objects/Index.java b/database-parser/src/main/java/eu/rssw/antlr/database/objects/Index.java
@@ -1,6 +1,6 @@
 /*
  * OpenEdge plugin for SonarQube
- * Copyright (c) 2015-2019 Riverside Software
+ * Copyright (c) 2015-2020 Riverside Software
  * contact AT riverside DASH software DOT fr
  * 
  * This program is free software; you can redistribute it and/or

diff --git a/database-parser/src/main/java/eu/rssw/antlr/database/objects/IndexField.java b/database-parser/src/main/java/eu/rssw/antlr/database/objects/IndexField.java
@@ -1,6 +1,6 @@
 /*
  * OpenEdge plugin for SonarQube
- * Copyright (c) 2015-2019 Riverside Software
+ * Copyright (c) 2015-2020 Riverside Software
  * contact AT riverside DASH software DOT fr
  * 
  * This program is free software; you can redistribute it and/or

diff --git a/database-parser/src/main/java/eu/rssw/antlr/database/objects/Sequence.java b/database-parser/src/main/java/eu/rssw/antlr/database/objects/Sequence.java
@@ -1,6 +1,6 @@
 /*
  * OpenEdge plugin for SonarQube
- * Copyright (c) 2015-2019 Riverside Software
+ * Copyright (c) 2015-2020 Riverside Software
  * contact AT riverside DASH software DOT fr
  * 
  * This program is free software; you can redistribute it and/or

diff --git a/database-parser/src/main/java/eu/rssw/antlr/database/objects/Table.java b/database-parser/src/main/java/eu/rssw/antlr/database/objects/Table.java
@@ -1,6 +1,6 @@
 /*
  * OpenEdge plugin for SonarQube
- * Copyright (c) 2015-2019 Riverside Software
+ * Copyright (c) 2015-2020 Riverside Software
  * contact AT riverside DASH software DOT fr
  * 
  * This program is free software; you can redistribute it and/or

diff --git a/database-parser/src/main/java/eu/rssw/antlr/database/objects/Trigger.java b/database-parser/src/main/java/eu/rssw/antlr/database/objects/Trigger.java
@@ -1,6 +1,6 @@
 /*
  * OpenEdge plugin for SonarQube
- * Copyright (c) 2015-2019 Riverside Software
+ * Copyright (c) 2015-2020 Riverside Software
  * contact AT riverside DASH software DOT fr
  * 
  * This program is free software; you can redistribute it and/or

diff --git a/database-parser/src/main/java/eu/rssw/antlr/database/objects/TriggerType.java b/database-parser/src/main/java/eu/rssw/antlr/database/objects/TriggerType.java
@@ -1,6 +1,6 @@
 /*
  * OpenEdge plugin for SonarQube
- * Copyright (c) 2015-2019 Riverside Software
+ * Copyright (c) 2015-2020 Riverside Software
  * contact AT riverside DASH software DOT fr
  * 
  * This program is free software; you can redistribute it and/or

diff --git a/database-parser/src/test/java/eu/rssw/antlr/database/TestDumpFile.java b/database-parser/src/test/java/eu/rssw/antlr/database/TestDumpFile.java
@@ -1,6 +1,6 @@
 /*
  * OpenEdge plugin for SonarQube
- * Copyright (c) 2015-2019 Riverside Software
+ * Copyright (c) 2015-2020 Riverside Software
  * contact AT riverside DASH software DOT fr
  * 
  * This program is free software; you can redistribute it and/or

diff --git a/deploy.bat b/deploy.bat
@@ -1 +1 @@
-mvn -DsonarHome=%SONAR_HOME% org.codehaus.sonar:sonar-dev-maven-plugin::upload
+xcopy openedge-plugin\target\sonar-openedge-plugin-*.jar %SONAR_HOME%\extensions\downloads /y
diff --git a/deploy.sh b/deploy.sh
@@ -0,0 +1,3 @@
+#! /bin/sh
+cp -v openedge-plugin/target/sonar-openedge-plugin-*.jar ${SONAR_HOME}/extensions/downloads
+
diff --git a/listing-parser/pom.xml b/listing-parser/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>eu.rssw.openedge.parsers</groupId>
   <artifactId>listing-parser</artifactId>
-  <version>2.6.4</version>
+  <version>2.7.0</version>
 
   <name>OpenEdge listing so-called parser</name>
   <description>OpenEdge listing files parser</description>
@@ -69,6 +69,40 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.sonarsource.scanner.maven</groupId>
+          <artifactId>sonar-maven-plugin</artifactId>
+          <version>3.7.0.1746</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+
+    <plugins>
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <version>0.8.5</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>prepare-agent</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>report</id>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>report</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
   <profiles>
     <profile>
       <id>release</id>

diff --git a/listing-parser/src/main/java/eu/rssw/listing/BlockType.java b/listing-parser/src/main/java/eu/rssw/listing/BlockType.java
@@ -1,6 +1,6 @@
 /*
  * OpenEdge plugin for SonarQube
- * Copyright (c) 2015-2019 Riverside Software
+ * Copyright (c) 2015-2020 Riverside Software
  * contact AT riverside DASH software DOT fr
  * 
  * This program is free software; you can redistribute it and/or

diff --git a/listing-parser/src/main/java/eu/rssw/listing/CodeBlock.java b/listing-parser/src/main/java/eu/rssw/listing/CodeBlock.java
@@ -1,6 +1,6 @@
 /*
  * OpenEdge plugin for SonarQube
- * Copyright (c) 2015-2019 Riverside Software
+ * Copyright (c) 2015-2020 Riverside Software
  * contact AT riverside DASH software DOT fr
  * 
  * This program is free software; you can redistribute it and/or

diff --git a/listing-parser/src/main/java/eu/rssw/listing/ListingParser.java b/listing-parser/src/main/java/eu/rssw/listing/ListingParser.java
@@ -1,6 +1,6 @@
 /*
  * OpenEdge plugin for SonarQube
- * Copyright (c) 2015-2019 Riverside Software
+ * Copyright (c) 2015-2020 Riverside Software
  * contact AT riverside DASH software DOT fr
  * 
  * This program is free software; you can redistribute it and/or

diff --git a/listing-parser/src/test/java/eu/rssw/listing/TestListing.java b/listing-parser/src/test/java/eu/rssw/listing/TestListing.java
@@ -1,6 +1,6 @@
 /*
  * OpenEdge plugin for SonarQube
- * Copyright (c) 2015-2019 Riverside Software
+ * Copyright (c) 2015-2020 Riverside Software
  * contact AT riverside DASH software DOT fr
  * 
  * This program is free software; you can redistribute it and/or

diff --git a/openedge-checks/pom.xml b/openedge-checks/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>eu.rssw.openedge.checks</groupId>
   <artifactId>openedge-checks</artifactId>
-  <version>2.6.4</version>
+  <version>2.7.0</version>
 
   <name>OpenEdge checks</name>
   <description>OpenEdge checks</description>
@@ -48,18 +48,18 @@
     <dependency>
       <groupId>org.sonarsource.sonarqube</groupId>
       <artifactId>sonar-plugin-api</artifactId>
-      <version>6.6</version>
+      <version>7.9</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>database-parser</artifactId>
-      <version>2.6.4</version>
+      <version>2.7.0</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>proparse</artifactId>
-      <version>2.6.4</version>
+      <version>2.7.0</version>
     </dependency>
     <dependency>
       <groupId>org.testng</groupId>
@@ -75,6 +75,40 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.sonarsource.scanner.maven</groupId>
+          <artifactId>sonar-maven-plugin</artifactId>
+          <version>3.7.0.1746</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+
+    <plugins>
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <version>0.8.5</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>prepare-agent</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>report</id>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>report</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
   <profiles>
     <profile>
       <id>release</id>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		mvn -DsonarHome=%SONAR_HOME% org.codehaus.sonar:sonar-dev-maven-plugin::upload
		xcopy openedge-plugin\target\sonar-openedge-plugin-*.jar %SONAR_HOME%\extensions\downloads /y
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#! /bin/sh
		cp -v openedge-plugin/target/sonar-openedge-plugin-*.jar ${SONAR_HOME}/extensions/downloads