Merge pull request #20 from kemitix/upgrade-dependencies
Upgrade dependencies
This commit is contained in:
commit
1e3ffb6f2c
6 changed files with 60 additions and 28 deletions
2
.mvn/wrapper/maven-wrapper.properties
vendored
2
.mvn/wrapper/maven-wrapper.properties
vendored
|
@ -1 +1 @@
|
||||||
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip
|
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.2/apache-maven-3.5.2-bin.zip
|
||||||
|
|
|
@ -4,7 +4,12 @@ CHANGELOG
|
||||||
0.5.0
|
0.5.0
|
||||||
-----
|
-----
|
||||||
|
|
||||||
*
|
* Add `Before`, `After` and `Around` combinators
|
||||||
|
* Use `kemitix-maven-tiles`
|
||||||
|
* Add `BeanBuilder` experiment
|
||||||
|
* Upgrade `lombok` to 1.16.20
|
||||||
|
* Upgrade assertj to 3.9.1
|
||||||
|
* jenkins: test on both java 8 and 9
|
||||||
|
|
||||||
0.4.0
|
0.4.0
|
||||||
-----
|
-----
|
||||||
|
|
20
Jenkinsfile
vendored
20
Jenkinsfile
vendored
|
@ -1,20 +0,0 @@
|
||||||
pipeline {
|
|
||||||
agent any
|
|
||||||
stages {
|
|
||||||
stage('Build') {
|
|
||||||
steps {
|
|
||||||
checkout([
|
|
||||||
$class: 'GitSCM',
|
|
||||||
branches: [[name: '**']],
|
|
||||||
doGenerateSubmoduleConfigurations: false,
|
|
||||||
extensions: [[$class: 'CleanBeforeCheckout']],
|
|
||||||
submoduleCfg: [],
|
|
||||||
userRemoteConfigs: [[credentialsId: 'github-kemitix', url: 'git@github.com:kemitix/mon.git']]
|
|
||||||
])
|
|
||||||
sh './mvnw clean install'
|
|
||||||
junit '**/target/surefire-reports/*.xml'
|
|
||||||
archiveArtifacts '**/target/*.jar'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
46
Jenkinsfile.groovy
Normal file
46
Jenkinsfile.groovy
Normal file
|
@ -0,0 +1,46 @@
|
||||||
|
final String gitRepoUrl = 'git@github.com:kemitix/mon.git'
|
||||||
|
final String mvn = "mvn --batch-mode --update-snapshots"
|
||||||
|
|
||||||
|
pipeline {
|
||||||
|
agent any
|
||||||
|
stages {
|
||||||
|
stage('Prepare') {
|
||||||
|
steps {
|
||||||
|
git url: gitRepoUrl, branch: '**', credentialsId: 'github-kemitix'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
stage('Build') {
|
||||||
|
parallel {
|
||||||
|
stage('Java 8') {
|
||||||
|
steps {
|
||||||
|
withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') {
|
||||||
|
sh 'mvn clean install'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// requires maven-failsafe-plugin:2.21 when it is released
|
||||||
|
// stage('Java 9') {
|
||||||
|
// steps {
|
||||||
|
// withMaven(maven: 'maven 3.5.2', jdk: 'JDK 9') {
|
||||||
|
// sh 'mvn clean install'
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
stage('Reporting') {
|
||||||
|
steps {
|
||||||
|
junit '**/target/surefire-reports/*.xml'
|
||||||
|
archiveArtifacts '**/target/*.jar'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
stage('Deploy') {
|
||||||
|
when { expression { (env.GIT_BRANCH == 'master') } }
|
||||||
|
steps {
|
||||||
|
withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') {
|
||||||
|
sh "${mvn} deploy --activate-profiles release -DskipTests=true"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
1
lombok.config
Normal file
1
lombok.config
Normal file
|
@ -0,0 +1 @@
|
||||||
|
lombok.addGeneratedAnnotation=false
|
12
pom.xml
12
pom.xml
|
@ -16,12 +16,12 @@
|
||||||
<properties>
|
<properties>
|
||||||
<java.version>1.8</java.version>
|
<java.version>1.8</java.version>
|
||||||
<junit.version>4.12</junit.version>
|
<junit.version>4.12</junit.version>
|
||||||
<assertj-core.version>3.8.0</assertj-core.version>
|
<assertj.version>3.9.1</assertj.version>
|
||||||
<lombok.version>1.16.18</lombok.version>
|
<lombok.version>1.16.20</lombok.version>
|
||||||
<tiles-maven-plugin.version>2.10</tiles-maven-plugin.version>
|
<tiles-maven-plugin.version>2.10</tiles-maven-plugin.version>
|
||||||
<kemitix-tiles.version>0.5.2</kemitix-tiles.version>
|
<kemitix-tiles.version>0.6.1</kemitix-tiles.version>
|
||||||
<!-- kemitix-tiles provides surefire 2.20.1 which is broken - downgrade surefire to 2.20 -->
|
<maven-surefire-plugin.version>2.20.1</maven-surefire-plugin.version>
|
||||||
<maven-surefire-plugin.version>2.20</maven-surefire-plugin.version>
|
<maven-failsafe-plugin.version>2.20.1</maven-failsafe-plugin.version>
|
||||||
<digraph-dependency.basePackage>net.kemitix.mon</digraph-dependency.basePackage>
|
<digraph-dependency.basePackage>net.kemitix.mon</digraph-dependency.basePackage>
|
||||||
<kemitix-checkstyle.version>4.0.1</kemitix-checkstyle.version>
|
<kemitix-checkstyle.version>4.0.1</kemitix-checkstyle.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
@ -42,7 +42,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.assertj</groupId>
|
<groupId>org.assertj</groupId>
|
||||||
<artifactId>assertj-core</artifactId>
|
<artifactId>assertj-core</artifactId>
|
||||||
<version>${assertj-core.version}</version>
|
<version>${assertj.version}</version>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
Loading…
Reference in a new issue