Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ node('rhel7'){
def isSnapshot = props['projectVersion'].contains('-SNAPSHOT')
def version = isSnapshot?props['projectVersion'].replace('-SNAPSHOT', ".${env.BUILD_NUMBER}"):props['projectVersion'] + ".${env.BUILD_NUMBER}"

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

stage("Publish to Marketplace") {
unstash 'zip'
// github user and token are required for consuming the crda-java-api module from GHPR in build-time
// github user and token are required for consuming the exhort-java-api module from GHPR in build-time
withCredentials([[$class: 'StringBinding', credentialsId: 'rhdevelopersci-github-token', variable: 'GITHUB_TOKEN']]) {
withCredentials([[$class: 'StringBinding', credentialsId: 'JetBrains marketplace token', variable: 'TOKEN']]) {
sh "./gradlew publishPlugin -PjetBrainsToken=${TOKEN} -PprojectVersion=${version} -PjetBrainsChannel=${channel} -Pgpr.username=rhdevelopers-ci -Pgpr.token=${GITHUB_TOKEN}"
Expand Down
16 changes: 4 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ targetCompatibility = '11'
intellij {
version = ideaVersion //for a full list of IntelliJ IDEA releases please see https://www.jetbrains.com/intellij-repository/releases
pluginName = 'org.jboss.tools.intellij.analytics'
plugins = ['com.redhat.devtools.intellij.telemetry:0.0.3.33']
plugins = ['com.redhat.devtools.intellij.telemetry:0.0.3.33', "org.jetbrains.idea.maven"]
updateSinceUntilBuild = false
}

Expand All @@ -48,19 +48,11 @@ dependencies {
resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
}

// WATCH OUT - lsp4intellij version 0.95.1 breaks diagnostics for opened files
implementation 'com.github.ballerina-platform:lsp4intellij:0.95.0'
constraints {
implementation('com.google.guava:guava:30.0-jre') {
because 'version 27.1-jre introduced by lsp4intellij:0.95.0 reports vulnerabilities'
}
implementation('com.google.code.gson:gson:2.8.9') {
because 'version 2.8.2 introduced by lsp4intellij:0.95.0 reports vulnerabilities'
}
}
implementation 'org.kohsuke:github-api:1.314'
implementation 'org.apache.commons:commons-compress:1.21'
implementation 'com.redhat.exhort:exhort-java-api:0.0.1-SNAPSHOT'
implementation 'com.redhat.exhort:exhort-java-api:0.0.2-SNAPSHOT'
implementation 'com.github.ben-manes.caffeine:caffeine:3.1.8'

testImplementation('junit:junit:4.13.1')
}

Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

11 changes: 0 additions & 11 deletions src/main/java/org/jboss/tools/intellij/analytics/ICookie.java

This file was deleted.

42 changes: 0 additions & 42 deletions src/main/java/org/jboss/tools/intellij/analytics/Platform.java

This file was deleted.

This file was deleted.

Loading