Skip to content
This repository has been archived by the owner on Jun 22, 2022. It is now read-only.

Commit

Permalink
Merge pull request #26 from imsweb/dep-updates
Browse files Browse the repository at this point in the history
Various dependency updates
  • Loading branch information
ctmay4 committed Apr 26, 2022
2 parents 0abdcf9 + 86be988 commit cddc9eb
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 13 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ Download [the latest JAR][1] or grab via Maven:
<dependency>
<groupId>com.imsweb</groupId>
<artifactId>staging-algorithm-eod-public</artifactId>
<version>2.1.1</version>
<version>2.1.2</version>
</dependency>
```

or via Gradle:

```groovy
compile 'com.imsweb.com:staging-algorithm-eod-public:2.1.1'
compile 'com.imsweb.com:staging-algorithm-eod-public:2.1.2'
```

## Usage
Expand Down
33 changes: 23 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
plugins {
id 'java-library'
id 'checkstyle'
id "com.github.spotbugs" version "4.7.2"
id "com.github.spotbugs" version "5.0.6"
id 'maven-publish'
id 'signing'
id 'io.codearte.nexus-staging' version '0.30.0' // logs into Sonotype OSS and does a "Close" and "Release"
id 'com.adarshr.test-logger' version '3.1.0'
id 'com.github.ben-manes.versions' version '0.41.0'
id 'org.sonatype.gradle.plugins.scan' version '2.2.2'
id 'com.adarshr.test-logger' version '3.2.0'
id 'com.github.ben-manes.versions' version '0.42.0'
id 'org.sonatype.gradle.plugins.scan' version '2.2.3'
}

group = 'com.imsweb'
version = '2.1.1'
version = '2.1.2'
description = 'EOD algorithm for the java-staging-client'

tasks.withType(JavaCompile) {
Expand All @@ -35,12 +35,12 @@ repositories {
}

dependencies {
spotbugs 'com.github.spotbugs:spotbugs:4.3.0'
spotbugs 'com.github.spotbugs:spotbugs:4.6.0'

api 'com.imsweb:staging-client-java:6.2.0'
api 'com.imsweb:staging-client-java:6.3.0'

testImplementation 'org.slf4j:slf4j-api:1.7.32'
testImplementation 'org.slf4j:slf4j-simple:1.7.32'
testImplementation 'org.slf4j:slf4j-api:1.7.36'
testImplementation 'org.slf4j:slf4j-simple:1.7.36'

testImplementation('com.imsweb:staging-client-java:6.2.0-SNAPSHOT') {
capabilities {
Expand Down Expand Up @@ -85,6 +85,19 @@ spotbugs {
excludeFilter = file('config/spotbugs/spotbugs-exclude.xml')
}

def isNonStable = { String version ->
def stableKeyword = ['RELEASE', 'FINAL', 'GA'].any { qualifier -> version.toUpperCase().contains(qualifier) }
def regex = /^[0-9,.v-]+$/
return !stableKeyword && !(version ==~ regex)
}

dependencyUpdates {
// ignore alpha, beta, etc. versions
rejectVersionIf { selection ->
isNonStable(selection.candidate.version)
}
}

// don't try to release a snapshot to a non-snapshot repository, that won't work anyway
if (version.endsWith('-SNAPSHOT')) {
gradle.startParameter.excludedTaskNames += 'signMavenJavaPublication'
Expand Down Expand Up @@ -171,6 +184,6 @@ nexusStaging {
}

wrapper {
gradleVersion = '7.3.3'
gradleVersion = '7.4.2'
distributionType = Wrapper.DistributionType.ALL
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit cddc9eb

Please sign in to comment.