Skip to content

Commit

Permalink
Merge branch 'release/V2.26.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
gquerret committed Apr 22, 2024
2 parents 532f440 + d2b37a2 commit 240ab27
Show file tree
Hide file tree
Showing 380 changed files with 2,608 additions and 2,339 deletions.
5 changes: 2 additions & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pipeline {
agent { label 'Linux-Office' }
agent { label 'Linux-Office03' }
options {
buildDiscarder(logRotator(daysToKeepStr:'10'))
timeout(time: 15, unit: 'MINUTES')
Expand All @@ -14,7 +14,7 @@ pipeline {
checkout([$class: 'GitSCM', branches: scm.branches, extensions: scm.extensions + [[$class: 'CleanCheckout']], userRemoteConfigs: [[credentialsId: scm.userRemoteConfigs.credentialsId[0], url: scm.userRemoteConfigs.url[0], refspec: '+refs/heads/main:refs/remotes/origin/main']] ])
checkout([$class: 'GitSCM', branches: scm.branches, extensions: scm.extensions + [[$class: 'CleanCheckout']], userRemoteConfigs: [[credentialsId: scm.userRemoteConfigs.credentialsId[0], url: scm.userRemoteConfigs.url[0], refspec: '+refs/heads/develop:refs/remotes/origin/develop']] ])
script {
withEnv(["MVN_HOME=${tool name: 'Maven 3', type: 'hudson.tasks.Maven$MavenInstallation'}", "JAVA_HOME=${tool name: 'Corretto 11', type: 'jdk'}"]) {
withEnv(["MVN_HOME=${tool name: 'Maven 3', type: 'hudson.tasks.Maven$MavenInstallation'}", "JAVA_HOME=${tool name: 'JDK17', type: 'jdk'}"]) {
if ("main" == env.BRANCH_NAME) {
sh "$MVN_HOME/bin/mvn -P release clean deploy -Dgit.commit=\$(git rev-parse --short HEAD)"
mail body: "---", to: "[email protected]", subject: "Release artifact on Sonatype"
Expand All @@ -27,7 +27,6 @@ pipeline {
}
}
}
archiveArtifacts artifacts: 'openedge-plugin/target/sonar-openedge-plugin-*.jar'
step([$class: 'Publisher', reportFilenamePattern: '**/target/surefire-reports/testng-results.xml'])
}
}
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,7 @@ PCT is open-source and free, but if you want to rely on our consulting services,
## Build status

OpenEdge plugin - main branch: <br/> [![Build Status](http://ci.rssw.eu/job/sonar-openedge/job/main/badge/icon)](http://ci.rssw.eu/job/sonar-openedge/job/main/)

## IntelliJ support

Opening this repository in IntelliJ requires the [ANTLR 4 plugin](https://plugins.jetbrains.com/plugin/7358-antlr-v4). Once installed, open "ANTLR v4 default project settings", and add `src/main/antlr4/imports` to "Location of imported grammars".
16 changes: 8 additions & 8 deletions coverage-report/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.rssw</groupId>
<artifactId>sonar-openedge</artifactId>
<version>2.25.1</version>
<version>2.26.0</version>
</parent>
<groupId>eu.rssw.openedge.parsers</groupId>
<artifactId>coverage-report</artifactId>
Expand All @@ -21,37 +21,37 @@
<dependency>
<groupId>eu.rssw.openedge.rcode</groupId>
<artifactId>rcode-reader</artifactId>
<version>2.25.1</version>
<version>2.26.0</version>
</dependency>
<dependency>
<groupId>eu.rssw.sonar.openedge</groupId>
<artifactId>sonar-openedge-plugin</artifactId>
<version>2.25.1</version>
<version>2.26.0</version>
</dependency>
<dependency>
<groupId>eu.rssw.openedge.parsers</groupId>
<artifactId>proparse</artifactId>
<version>2.25.1</version>
<version>2.26.0</version>
</dependency>
<dependency>
<groupId>eu.rssw.openedge.parsers</groupId>
<artifactId>profiler-parser</artifactId>
<version>2.25.1</version>
<version>2.26.0</version>
</dependency>
<dependency>
<groupId>eu.rssw.openedge.parsers</groupId>
<artifactId>database-parser</artifactId>
<version>2.25.1</version>
<version>2.26.0</version>
</dependency>
<dependency>
<groupId>eu.rssw.openedge.parsers</groupId>
<artifactId>listing-parser</artifactId>
<version>2.25.1</version>
<version>2.26.0</version>
</dependency>
<dependency>
<groupId>eu.rssw.openedge.checks</groupId>
<artifactId>openedge-checks</artifactId>
<version>2.25.1</version>
<version>2.26.0</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion database-parser/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.rssw</groupId>
<artifactId>sonar-openedge</artifactId>
<version>2.25.1</version>
<version>2.26.0</version>
</parent>
<groupId>eu.rssw.openedge.parsers</groupId>
<artifactId>database-parser</artifactId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* OpenEdge plugin for SonarQube
* Copyright (c) 2015-2023 Riverside Software
* Copyright (c) 2015-2024 Riverside Software
* contact AT riverside DASH software DOT fr
*
* This program is free software; you can redistribute it and/or
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* OpenEdge plugin for SonarQube
* Copyright (c) 2015-2023 Riverside Software
* Copyright (c) 2015-2024 Riverside Software
* contact AT riverside DASH software DOT fr
*
* This program is free software; you can redistribute it and/or
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* OpenEdge plugin for SonarQube
* Copyright (c) 2015-2023 Riverside Software
* Copyright (c) 2015-2024 Riverside Software
* contact AT riverside DASH software DOT fr
*
* This program is free software; you can redistribute it and/or
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* OpenEdge plugin for SonarQube
* Copyright (c) 2015-2023 Riverside Software
* Copyright (c) 2015-2024 Riverside Software
* contact AT riverside DASH software DOT fr
*
* This program is free software; you can redistribute it and/or
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* OpenEdge plugin for SonarQube
* Copyright (c) 2015-2023 Riverside Software
* Copyright (c) 2015-2024 Riverside Software
* contact AT riverside DASH software DOT fr
*
* This program is free software; you can redistribute it and/or
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* OpenEdge plugin for SonarQube
* Copyright (c) 2015-2023 Riverside Software
* Copyright (c) 2015-2024 Riverside Software
* contact AT riverside DASH software DOT fr
*
* This program is free software; you can redistribute it and/or
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* OpenEdge plugin for SonarQube
* Copyright (c) 2015-2023 Riverside Software
* Copyright (c) 2015-2024 Riverside Software
* contact AT riverside DASH software DOT fr
*
* This program is free software; you can redistribute it and/or
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* OpenEdge plugin for SonarQube
* Copyright (c) 2015-2023 Riverside Software
* Copyright (c) 2015-2024 Riverside Software
* contact AT riverside DASH software DOT fr
*
* This program is free software; you can redistribute it and/or
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* OpenEdge plugin for SonarQube
* Copyright (c) 2015-2023 Riverside Software
* Copyright (c) 2015-2024 Riverside Software
* contact AT riverside DASH software DOT fr
*
* This program is free software; you can redistribute it and/or
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* OpenEdge plugin for SonarQube
* Copyright (c) 2015-2023 Riverside Software
* Copyright (c) 2015-2024 Riverside Software
* contact AT riverside DASH software DOT fr
*
* This program is free software; you can redistribute it and/or
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* OpenEdge plugin for SonarQube
* Copyright (c) 2015-2023 Riverside Software
* Copyright (c) 2015-2024 Riverside Software
* contact AT riverside DASH software DOT fr
*
* This program is free software; you can redistribute it and/or
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* OpenEdge plugin for SonarQube
* Copyright (c) 2015-2023 Riverside Software
* Copyright (c) 2015-2024 Riverside Software
* contact AT riverside DASH software DOT fr
*
* This program is free software; you can redistribute it and/or
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* OpenEdge plugin for SonarQube
* Copyright (c) 2015-2023 Riverside Software
* Copyright (c) 2015-2024 Riverside Software
* contact AT riverside DASH software DOT fr
*
* This program is free software; you can redistribute it and/or
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* OpenEdge plugin for SonarQube
* Copyright (c) 2015-2023 Riverside Software
* Copyright (c) 2015-2024 Riverside Software
* contact AT riverside DASH software DOT fr
*
* This program is free software; you can redistribute it and/or
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* OpenEdge plugin for SonarQube
* Copyright (c) 2015-2023 Riverside Software
* Copyright (c) 2015-2024 Riverside Software
* contact AT riverside DASH software DOT fr
*
* This program is free software; you can redistribute it and/or
Expand Down
2 changes: 1 addition & 1 deletion listing-parser/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.rssw</groupId>
<artifactId>sonar-openedge</artifactId>
<version>2.25.1</version>
<version>2.26.0</version>
</parent>
<groupId>eu.rssw.openedge.parsers</groupId>
<artifactId>listing-parser</artifactId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* OpenEdge plugin for SonarQube
* Copyright (c) 2015-2023 Riverside Software
* Copyright (c) 2015-2024 Riverside Software
* contact AT riverside DASH software DOT fr
*
* This program is free software; you can redistribute it and/or
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* OpenEdge plugin for SonarQube
* Copyright (c) 2015-2023 Riverside Software
* Copyright (c) 2015-2024 Riverside Software
* contact AT riverside DASH software DOT fr
*
* This program is free software; you can redistribute it and/or
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* OpenEdge plugin for SonarQube
* Copyright (c) 2015-2023 Riverside Software
* Copyright (c) 2015-2024 Riverside Software
* contact AT riverside DASH software DOT fr
*
* This program is free software; you can redistribute it and/or
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* OpenEdge plugin for SonarQube
* Copyright (c) 2015-2023 Riverside Software
* Copyright (c) 2015-2024 Riverside Software
* contact AT riverside DASH software DOT fr
*
* This program is free software; you can redistribute it and/or
Expand Down
6 changes: 3 additions & 3 deletions openedge-checks/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.rssw</groupId>
<artifactId>sonar-openedge</artifactId>
<version>2.25.1</version>
<version>2.26.0</version>
</parent>
<groupId>eu.rssw.openedge.checks</groupId>
<artifactId>openedge-checks</artifactId>
Expand All @@ -23,12 +23,12 @@
<dependency>
<groupId>eu.rssw.openedge.parsers</groupId>
<artifactId>database-parser</artifactId>
<version>2.25.1</version>
<version>2.26.0</version>
</dependency>
<dependency>
<groupId>eu.rssw.openedge.parsers</groupId>
<artifactId>proparse</artifactId>
<version>2.25.1</version>
<version>2.26.0</version>
</dependency>
<dependency>
<groupId>org.testng</groupId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* OpenEdge plugin for SonarQube
* Copyright (c) 2015-2023 Riverside Software
* Copyright (c) 2015-2024 Riverside Software
* contact AT riverside DASH software DOT fr
*
* This program is free software; you can redistribute it and/or
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* OpenEdge plugin for SonarQube
* Copyright (c) 2015-2023 Riverside Software
* Copyright (c) 2015-2024 Riverside Software
* contact AT riverside DASH software DOT fr
*
* This program is free software; you can redistribute it and/or
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* OpenEdge plugin for SonarQube
* Copyright (c) 2015-2023 Riverside Software
* Copyright (c) 2015-2024 Riverside Software
* contact AT riverside DASH software DOT fr
*
* This program is free software; you can redistribute it and/or
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* OpenEdge plugin for SonarQube
* Copyright (c) 2015-2023 Riverside Software
* Copyright (c) 2015-2024 Riverside Software
* contact AT riverside DASH software DOT fr
*
* This program is free software; you can redistribute it and/or
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* OpenEdge plugin for SonarQube
* Copyright (c) 2015-2023 Riverside Software
* Copyright (c) 2015-2024 Riverside Software
* contact AT riverside DASH software DOT fr
*
* This program is free software; you can redistribute it and/or
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* OpenEdge plugin for SonarQube
* Copyright (c) 2015-2019 Riverside Software
* Copyright (c) 2015-2024 Riverside Software
* contact AT riverside DASH software DOT fr
*
* This program is free software; you can redistribute it and/or
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* OpenEdge plugin for SonarQube
* Copyright (c) 2015-2023 Riverside Software
* Copyright (c) 2015-2024 Riverside Software
* contact AT riverside DASH software DOT fr
*
* This program is free software; you can redistribute it and/or
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* OpenEdge plugin for SonarQube
* Copyright (c) 2015-2023 Riverside Software
* Copyright (c) 2015-2024 Riverside Software
* contact AT riverside DASH software DOT fr
*
* This program is free software; you can redistribute it and/or
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* OpenEdge plugin for SonarQube
* Copyright (c) 2015-2023 Riverside Software
* Copyright (c) 2015-2024 Riverside Software
* contact AT riverside DASH software DOT fr
*
* This program is free software; you can redistribute it and/or
Expand Down Expand Up @@ -132,7 +132,7 @@ protected NewIssue createIssue(InputFile file, ProToken token, String msg, boole
}

/**
* Tries to create a new issue. Will return null if the issue can't be created.
* Create new issue. Will return null if issue can't be created (no-sonar annotation, appbuilder generated code, ...
*/
protected NewIssue createIssue(InputFile file, JPNode node, String msg, boolean exactLocation) {
if (!"".equals(getNoSonarKeyword()) && skipIssue(node)) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* OpenEdge plugin for SonarQube
* Copyright (c) 2015-2023 Riverside Software
* Copyright (c) 2015-2024 Riverside Software
* contact AT riverside DASH software DOT fr
*
* This program is free software; you can redistribute it and/or
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* OpenEdge plugin for SonarQube
* Copyright (c) 2015-2023 Riverside Software
* Copyright (c) 2015-2024 Riverside Software
* contact AT riverside DASH software DOT fr
*
* This program is free software; you can redistribute it and/or
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* OpenEdge plugin for SonarQube
* Copyright (c) 2015-2023 Riverside Software
* Copyright (c) 2015-2024 Riverside Software
* contact AT riverside DASH software DOT fr
*
* This program is free software; you can redistribute it and/or
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* OpenEdge plugin for SonarQube
* Copyright (c) 2015-2019 Riverside Software
* Copyright (c) 2015-2024 Riverside Software
* contact AT riverside DASH software DOT fr
*
* This program is free software; you can redistribute it and/or
Expand Down
Loading

0 comments on commit 240ab27

Please sign in to comment.