Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[JENKINS-49130] - Testing solution.
* update docker-compose.yml to test
* update parent version org.jenkins-ci.plugins:plugin:3.4
* update version to 1.2.0-SNAPSHOT
* update jenkins version to 2.89.3
* update dependencies
  • Loading branch information
arkanjoms committed Feb 13, 2018
1 parent b32531b commit 1213569
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 23 deletions.
22 changes: 8 additions & 14 deletions docker-test/docker-compose.yml
@@ -1,24 +1,18 @@
version: '3'
services:
sonar-5:
image: sonarqube:5.6.6-alpine
hostname: sonar-5
sonar-lts:
image: sonarqube:lts
hostname: sonar-lts
ports:
- 9500:9000
networks:
- sonarnet
sonar-6.0:
image: sonarqube:6.0-alpine
sonar-7.0:
image: sonarqube:7.0
ports:
- 9600:9000
networks:
- sonarnet
sonar-6.5:
image: sonarqube:6.5-alpine
ports:
- 9605:9000
networks:
- sonarnet
jenkins-lts:
image: jenkins/jenkins:lts-alpine
environment:
Expand All @@ -30,21 +24,21 @@ services:
- jenkins-lts-data:/var/jenkins_home
networks:
- sonarnet
jenkins:
jenkins-latest:
image: jenkins/jenkins:alpine
environment:
- JAVA_OPTS=-Dhudson.model.ParametersAction.keepUndefinedParameters=true
ports:
- 8889:8080
- 50001:50000
volumes:
- jenkins-data:/var/jenkins_home
- jenkins-latest-data:/var/jenkins_home
networks:
- sonarnet

volumes:
jenkins-lts-data:
jenkins-data:
jenkins-latest-data:

networks:
sonarnet:
45 changes: 36 additions & 9 deletions pom.xml
Expand Up @@ -28,13 +28,13 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>2.28</version>
<version>3.4</version>
<relativePath />
</parent>

<artifactId>sonar-quality-gates</artifactId>
<name>Sonar Quality Gates Plugin</name>
<version>1.1.3-SNAPSHOT</version>
<version>1.2.0-SNAPSHOT</version>
<description>Fails the build whenever the Quality Gates criteria in the Sonar 5.6+ analysis aren't met (the project
Quality Gates status is different than "Passed")
</description>
Expand All @@ -43,7 +43,7 @@

<properties>
<java.level>8</java.level>
<jenkins.version>2.60.3</jenkins.version>
<jenkins.version>2.89.3</jenkins.version>
</properties>

<licenses>
Expand Down Expand Up @@ -74,36 +74,63 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.3</version>
<version>4.5.5</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>4.4.6</version>
<version>4.4.9</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20160810</version>
<version>20180130</version>
</dependency>

<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.0</version>
<version>2.8.2</version>
</dependency>

<dependency>
<groupId>org.jenkins-ci.main</groupId>
<artifactId>jenkins-core</artifactId>
</dependency>

<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock</artifactId>
<version>2.6.0</version>
<version>2.15.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlets</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
</exclusion>
<exclusion>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.7.22</version>
<version>2.15.0</version>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
Expand Down

0 comments on commit 1213569

Please sign in to comment.