Skip to content

Commit

Permalink
Merge pull request #705 from molgenis/chore/add-update-tool
Browse files Browse the repository at this point in the history
chore: add update tool
  • Loading branch information
clemens-tolboom authored Mar 18, 2024
2 parents 545fa4d + 08cad8a commit f90fe1d
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 22 deletions.
17 changes: 17 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,23 @@ As we now have the option to download the logfile from the application we need t
./gradlew test
```

## Upgrade plugins

Use the commands listed below.

```bash
./gradlew useLatestVersions
./gradlew useLatestVersionsCheck
```

Some plugins need manually editing the build files.

To help find the right `build.gradle` use the command below with your keyword.

```bash
find . -type f -name "build.gradle" -exec echo {} \; -exec grep YOUR_KEY_WORD {} \;
```

## Upgrading gradle

```bash
Expand Down
22 changes: 11 additions & 11 deletions armadillo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id 'io.spring.dependency-management'
id "jacoco"
id "java"
id "com.diffplug.spotless" version "6.15.0"
id "com.diffplug.spotless" version "6.25.0"
}

repositories {
Expand All @@ -29,7 +29,7 @@ dependencies {
implementation 'org.springframework.security:spring-security-oauth2-jose'
implementation 'org.springframework.security:spring-security-oauth2-resource-server'
implementation 'org.springframework.boot:spring-boot-starter-actuator'
implementation 'io.micrometer:micrometer-registry-prometheus'
implementation 'io.micrometer:micrometer-registry-prometheus:1.12.4'
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-validation'
implementation 'org.springframework:spring-aspects'
Expand All @@ -46,19 +46,19 @@ dependencies {
implementation 'org.rosuda.REngine:Rserve:1.8.1'
implementation 'io.swagger.core.v3:swagger-annotations:2.2.20'
implementation 'com.google.auto.value:auto-value-annotations:1.10.4'
implementation 'org.obiba.datashield:ds4j-core:2.0.0'
implementation 'org.obiba.datashield:ds4j-r:2.0.0'
implementation 'com.github.docker-java:docker-java:3.3.4'
implementation 'com.github.docker-java:docker-java-transport-zerodep:3.3.4'
implementation 'net.logstash.logback:logstash-logback-encoder:7.2'
implementation 'org.apache.parquet:parquet-hadoop:1.12.3'
implementation 'org.obiba.datashield:ds4j-core:2.1.0'
implementation 'org.obiba.datashield:ds4j-r:2.1.0'
implementation 'com.github.docker-java:docker-java:3.3.6'
implementation 'com.github.docker-java:docker-java-transport-zerodep:3.3.6'
implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
implementation 'org.apache.parquet:parquet-hadoop:1.13.1'
implementation 'org.apache.hadoop:hadoop-client:3.3.6'
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.1.0'
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.4.0'

//Overrides docker-java's sub-dependency to fix compatibility issues with apple ARM chips
//https://github.com/docker-java/docker-java/issues/1876 -->
implementation 'com.kohlschutter.junixsocket:junixsocket-common:2.3.3'
implementation 'com.kohlschutter.junixsocket:junixsocket-native-common:2.3.3'
implementation 'com.kohlschutter.junixsocket:junixsocket-common:2.9.0'
implementation 'com.kohlschutter.junixsocket:junixsocket-native-common:2.9.0'

//test outside spring
testImplementation 'com.c4-soft.springaddons:spring-security-oauth2-test-webmvc-addons:4.5.1'
Expand Down
9 changes: 5 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,16 @@
* - ui/build.gradle
*/
plugins {
id 'org.springframework.boot' version '3.1.5'
id 'org.springframework.boot' version '3.2.3'
id "io.spring.dependency-management" version "1.1.4"
id "java"
id "org.sonarqube" version "3.5.0.2730"
id "org.sonarqube" version "4.4.1.3373"
id 'maven-publish'
id 'application'
id "jacoco"
id 'com.palantir.docker' version '0.35.0'
id 'com.github.ben-manes.versions' version '0.50.0'
id 'com.palantir.docker' version '0.36.0'
id 'se.patrikerdes.use-latest-versions' version '0.2.18'
id 'com.github.ben-manes.versions' version '0.51.0'
}

targetCompatibility = '17'
Expand Down
12 changes: 6 additions & 6 deletions r/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id "jacoco"
id "java"
id "com.diffplug.spotless" version "6.15.0"
id "com.diffplug.spotless" version "6.25.0"
id 'org.springframework.boot'
id 'io.spring.dependency-management'
}
Expand All @@ -18,7 +18,7 @@ bootJar.enabled = false
dependencies {
//spring
implementation 'org.springframework.boot:spring-boot-starter'
implementation 'jakarta.validation:jakarta.validation-api'
implementation 'jakarta.validation:jakarta.validation-api:3.1.0-M1'
implementation 'org.springframework.boot:spring-boot-starter-json'
implementation 'org.springframework.retry:spring-retry'
annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'
Expand All @@ -28,13 +28,13 @@ dependencies {
implementation 'org.springframework.security:spring-security-oauth2-jose'

//other
implementation 'commons-io:commons-io:2.11.0'
implementation 'commons-io:commons-io:2.15.1'
implementation 'org.rosuda.REngine:REngine:2.1.0'
implementation 'org.rosuda.REngine:Rserve:1.8.1'
implementation 'com.google.guava:guava:31.1-jre'
implementation 'com.google.guava:guava:33.1.0-jre'
implementation 'com.google.auto.value:auto-value-annotations:1.10.4'
implementation 'org.apache.commons:commons-text:1.10.0'
implementation 'org.json:json:20230227'
implementation 'org.apache.commons:commons-text:1.11.0'
implementation 'org.json:json:20240303'

//test
testImplementation('org.springframework.boot:spring-boot-starter-test') {
Expand Down
2 changes: 1 addition & 1 deletion ui/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id "base"
id "com.github.node-gradle.node" version "3.5.1"
id "com.github.node-gradle.node" version "7.0.2"
}

def nodeSpec = {
Expand Down

0 comments on commit f90fe1d

Please sign in to comment.