Skip to content

Commit

Permalink
Freshen up dependencies (#15)
Browse files Browse the repository at this point in the history
[minor]
  • Loading branch information
goughy000 committed Nov 12, 2023
1 parent a2a084a commit e4ff082
Show file tree
Hide file tree
Showing 8 changed files with 270 additions and 169 deletions.
24 changes: 24 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Build

on:
push:

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout project sources
uses: actions/checkout@v4

- name: Setup Java
uses: actions/setup-java@v3
with:
java-version: 17
distribution: temurin

- name: Setup Gradle
uses: gradle/gradle-build-action@v2

- name: Build
run: ./gradlew clean build

33 changes: 33 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Publish

on:
release:
types: [created]

jobs:
publish:
runs-on: ubuntu-latest
steps:
- name: Checkout project sources
uses: actions/checkout@v4

- name: Setup Java
uses: actions/setup-java@v3
with:
java-version: 17
distribution: temurin

- name: Setup Gradle
uses: gradle/gradle-build-action@v2

- name: Publish
env:
PUBLISH_USERNAME: ${{ secrets.publishUsername }}
PUBLISH_PASSWORD: ${{ secrets.publishPassword }}
SIGNING_KEY: ${{ secrets.signingKey }}
run: |
./gradlew clean publish \
-PpublishUsername=$PUBLISH_USERNAME \
-PpublishPassword=$PUBLISH_PASSWORD \
-PsigningKey=$SIGNING_KEY
32 changes: 0 additions & 32 deletions Jenkinsfile

This file was deleted.

49 changes: 28 additions & 21 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,26 +1,24 @@
plugins {
id 'java-library'
id 'jvm-test-suite'
id 'maven-publish'
id 'signing'
id 'io.toolebox.git-versioner' version '1.6.5' apply false
id 'com.liferay.maven.plugin.builder' version '1.2.8' apply false
id 'com.diffplug.spotless' version '5.11.0' apply false
id 'com.liferay.maven.plugin.builder' version '2.0.2' apply false
id 'com.diffplug.spotless' version '6.22.0' apply false
}

dependencies {
compileOnly 'javax.jms:javax.jms-api:2.0'
implementation 'org.slf4j:slf4j-api:1.7.25'
implementation 'com.fasterxml.jackson.core:jackson-databind:2.12.2'
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.12.2'
implementation 'org.slf4j:slf4j-api:1.7.36'
implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.3'
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.3'
implementation 'commons-beanutils:commons-beanutils:1.9.4'

testImplementation 'org.slf4j:slf4j-log4j12:1.7.25'
testImplementation 'org.apache.activemq:artemis-server:2.6.4'
testImplementation 'org.apache.activemq:artemis-jms-server:2.6.4'
}

allprojects {
apply plugin: 'java-library'
apply plugin: 'jvm-test-suite'
apply plugin: 'maven-publish'
apply plugin: 'signing'
apply plugin: 'com.diffplug.spotless'
Expand All @@ -37,8 +35,21 @@ allprojects {
withSourcesJar()
}

test {
useJUnitPlatform()
testing {
suites {
test {
useJUnitJupiter()
dependencies {
implementation 'org.slf4j:slf4j-log4j12:1.7.36'
implementation 'org.apache.activemq:artemis-server:2.31.2'
implementation 'org.apache.activemq:artemis-jms-server:2.31.2'
implementation 'org.junit.jupiter:junit-jupiter-api:5.10.1'
implementation 'org.assertj:assertj-core:3.24.2'
implementation 'org.mockito:mockito-core:5.7.0'
runtimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.1'
}
}
}
}

spotless {
Expand All @@ -47,7 +58,7 @@ allprojects {
endWithNewline()
}
groovyGradle {
greclipse()
greclipse('4.27')
indentWithSpaces(2)
endWithNewline()
}
Expand All @@ -60,13 +71,6 @@ allprojects {
}
}

dependencies {
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.1'
testImplementation 'org.assertj:assertj-core:3.19.0'
testImplementation 'org.mockito:mockito-core:3.8.0'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.1'
}

publishing {
repositories {
maven {
Expand Down Expand Up @@ -118,14 +122,16 @@ project(':jms-responder-maven-plugin') {

dependencies {
implementation project(':')
api 'org.apache.maven:maven-plugin-api:3.3.9'
api 'org.apache.maven.plugin-tools:maven-plugin-annotations:3.5'
api 'org.apache.maven:maven-plugin-api:3.9.5'
api 'org.apache.maven.plugin-tools:maven-plugin-annotations:3.10.2'
}

buildPluginDescriptor {
goalPrefix = 'jms-responder'
pomGroupId = project.group
pomArtifactId = project.name
classesDir = sourceSets.main.java.classesDirectory
mavenPluginPluginVersion = '3.9.0'
}

afterEvaluate {
Expand All @@ -137,6 +143,7 @@ project(':jms-responder-maven-plugin') {
publishing.publications.mavenJava.pom.packaging = 'maven-plugin'

processResources.dependsOn('buildPluginDescriptor')
sourcesJar.dependsOn('buildPluginDescriptor')
}

def decode(encoded) {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit e4ff082

Please sign in to comment.