Skip to content

Commit dc3e21d

Browse files
authored
feat: adjust component analysis for java-api (#128)
* feature: deprecate crda cli and lsp * feature: perform component analysis with exhort-java-api by inspecting project manifest * feature: exclude the ignored dependencies * feature: support settings to exhort api * chore: update exhort-java-api version
1 parent 2b47610 commit dc3e21d

42 files changed

Lines changed: 1412 additions & 955 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ node('rhel7'){
1616
def isSnapshot = props['projectVersion'].contains('-SNAPSHOT')
1717
def version = isSnapshot?props['projectVersion'].replace('-SNAPSHOT', ".${env.BUILD_NUMBER}"):props['projectVersion'] + ".${env.BUILD_NUMBER}"
1818

19-
// github user and token are required for consuming the crda-java-api module from GHPR in build-time
19+
// github user and token are required for consuming the exhort-java-api module from GHPR in build-time
2020
withCredentials([[$class: 'StringBinding', credentialsId: 'rhdevelopersci-github-token', variable: 'GITHUB_TOKEN']]) {
2121
stage('Build') {
2222
sh "./gradlew assemble -PprojectVersion=${version} -Pgpr.username=rhdevelopers-ci -Pgpr.token=${GITHUB_TOKEN}"
@@ -44,7 +44,7 @@ node('rhel7'){
4444

4545
stage("Publish to Marketplace") {
4646
unstash 'zip'
47-
// github user and token are required for consuming the crda-java-api module from GHPR in build-time
47+
// github user and token are required for consuming the exhort-java-api module from GHPR in build-time
4848
withCredentials([[$class: 'StringBinding', credentialsId: 'rhdevelopersci-github-token', variable: 'GITHUB_TOKEN']]) {
4949
withCredentials([[$class: 'StringBinding', credentialsId: 'JetBrains marketplace token', variable: 'TOKEN']]) {
5050
sh "./gradlew publishPlugin -PjetBrainsToken=${TOKEN} -PprojectVersion=${version} -PjetBrainsChannel=${channel} -Pgpr.username=rhdevelopers-ci -Pgpr.token=${GITHUB_TOKEN}"

build.gradle

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ targetCompatibility = '11'
2929
intellij {
3030
version = ideaVersion //for a full list of IntelliJ IDEA releases please see https://www.jetbrains.com/intellij-repository/releases
3131
pluginName = 'org.jboss.tools.intellij.analytics'
32-
plugins = ['com.redhat.devtools.intellij.telemetry:0.0.3.33']
32+
plugins = ['com.redhat.devtools.intellij.telemetry:0.0.3.33', "org.jetbrains.idea.maven"]
3333
updateSinceUntilBuild = false
3434
}
3535

@@ -48,19 +48,11 @@ dependencies {
4848
resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
4949
}
5050

51-
// WATCH OUT - lsp4intellij version 0.95.1 breaks diagnostics for opened files
52-
implementation 'com.github.ballerina-platform:lsp4intellij:0.95.0'
53-
constraints {
54-
implementation('com.google.guava:guava:30.0-jre') {
55-
because 'version 27.1-jre introduced by lsp4intellij:0.95.0 reports vulnerabilities'
56-
}
57-
implementation('com.google.code.gson:gson:2.8.9') {
58-
because 'version 2.8.2 introduced by lsp4intellij:0.95.0 reports vulnerabilities'
59-
}
60-
}
6151
implementation 'org.kohsuke:github-api:1.314'
6252
implementation 'org.apache.commons:commons-compress:1.21'
63-
implementation 'com.redhat.exhort:exhort-java-api:0.0.1-SNAPSHOT'
53+
implementation 'com.redhat.exhort:exhort-java-api:0.0.2-SNAPSHOT'
54+
implementation 'com.github.ben-manes.caffeine:caffeine:3.1.8'
55+
6456
testImplementation('junit:junit:4.13.1')
6557
}
6658

src/main/java/org/jboss/tools/intellij/analytics/AnalyticsLanguageClient.java

Lines changed: 0 additions & 51 deletions
This file was deleted.

src/main/java/org/jboss/tools/intellij/analytics/AnalyticsLanguageServerDefinition.java

Lines changed: 0 additions & 53 deletions
This file was deleted.

src/main/java/org/jboss/tools/intellij/analytics/AnalyticsProcessStreamConnectionProvider.java

Lines changed: 0 additions & 22 deletions
This file was deleted.

src/main/java/org/jboss/tools/intellij/analytics/GitHubRelease.java

Lines changed: 0 additions & 31 deletions
This file was deleted.

src/main/java/org/jboss/tools/intellij/analytics/GitHubReleaseDownloader.java

Lines changed: 0 additions & 87 deletions
This file was deleted.

src/main/java/org/jboss/tools/intellij/analytics/ICookie.java

Lines changed: 0 additions & 11 deletions
This file was deleted.

src/main/java/org/jboss/tools/intellij/analytics/Platform.java

Lines changed: 0 additions & 42 deletions
This file was deleted.

src/main/java/org/jboss/tools/intellij/analytics/PlatformDetectionException.java

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)