Skip to content
This repository was archived by the owner on Oct 2, 2023. It is now read-only.

Commit b07d524

Browse files
rvemarvema
authored
Merge pull request #46 from aochsner/update-dependencies
Update dependencies
2 parents 1321a83 + 1ce222d commit b07d524

3 files changed

Lines changed: 32 additions & 64 deletions

File tree

‎pom.xml‎

Lines changed: 26 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
22

33
<modelVersion>4.0.0</modelVersion>
4+
5+
<groupId>com.capitalone.dashboard</groupId>
46
<artifactId>github-graphql-scm-collector</artifactId>
57
<name>${project.groupId}:${project.artifactId}</name>
68
<description>
79
Github Collector Microservice collecting stats from Github using graphql
810
</description>
911
<url>https://github.com/Hygieia/${repository.name}</url>
1012
<packaging>jar</packaging>
11-
<version>3.1.8-SNAPSHOT</version>
13+
<version>3.2.0-SNAPSHOT</version>
1214

1315
<parent>
14-
<groupId>com.capitalone.dashboard</groupId>
15-
<artifactId>Hygieia</artifactId>
16-
<version>3.0.1</version>
16+
<groupId>org.springframework.boot</groupId>
17+
<artifactId>spring-boot-starter-parent</artifactId>
18+
<version>1.5.22.RELEASE</version>
1719
</parent>
1820

1921
<organization>
@@ -45,15 +47,29 @@
4547
</distributionManagement>
4648

4749
<properties>
50+
<!-- Dependencies -->
51+
<com.capitalone.dashboard.core.version>3.10.0</com.capitalone.dashboard.core.version>
52+
<spring-security.version>4.2.18.RELEASE</spring-security.version>
53+
<tomcat.version>8.5.57</tomcat.version>
54+
<commons-beanutils.version>1.9.4</commons-beanutils.version>
55+
<commons-codec.version>1.14</commons-codec.version>
56+
<commons-collections4.version>4.1</commons-collections4.version>
57+
<commons-io.version>2.4</commons-io.version>
58+
<commons-lang.version>3.10</commons-lang.version>
59+
<fongo.version>2.2.0-RC2</fongo.version>
60+
<guava.version>29.0-jre</guava.version>
61+
<hibernate-validator.version>5.4.2.Final</hibernate-validator.version>
62+
<jackson.version>2.10.3</jackson.version>
63+
<jasypt.version>1.18</jasypt.version>
64+
<logback.version>1.2.3</logback.version>
65+
<mongodb.version>3.6.4</mongodb.version>
66+
<assertj.version>3.9.0</assertj.version>
67+
68+
<!-- Plugins -->
4869
<sonar.skip>true</sonar.skip>
4970
<java.version>1.8</java.version>
5071
<repository.name>hygieia-scm-github-graphql-collector</repository.name>
5172
<apache.rat.plugin.version>0.13</apache.rat.plugin.version>
52-
<bc.version>3.0.1</bc.version>
53-
<com.capitalone.dashboard.core.version>3.9.5</com.capitalone.dashboard.core.version>
54-
<commons.codec.version>1.14</commons.codec.version>
55-
<commons.io.version>2.4</commons.io.version>
56-
<commons.lang.version>3.10</commons.lang.version>
5773
<coveralls.maven.plugin.version>4.3.0</coveralls.maven.plugin.version>
5874
<developmentTeam>The Hygieia Team</developmentTeam>
5975
<jacoco.maven.plugin.version>0.8.3</jacoco.maven.plugin.version>
@@ -74,14 +90,9 @@
7490
<maven.project-info.version>3.0.0</maven.project-info.version>
7591
<maven.scm.publish.plugin.version>3.0.0</maven.scm.publish.plugin.version>
7692
<maven.site.plugin.version>3.7.1</maven.site.plugin.version>
77-
<mockito.all.version>1.10.19</mockito.all.version>
78-
<mongodb.version>3.6.4</mongodb.version>
79-
<mongo>3.6.4</mongo>
80-
<org.joda.joda-convert.version>1.8.1</org.joda.joda-convert.version>
8193
<site.publish.url>https://github.com/Hygieia/${project.artifactId}</site.publish.url>
8294
<site.publish.checkout.directory>site-content</site.publish.checkout.directory>
8395
<spotbugs.plugin.version>3.1.11</spotbugs.plugin.version>
84-
<svnkit.version>1.10.1</svnkit.version>
8596
</properties>
8697

8798
<issueManagement>
@@ -125,27 +136,6 @@
125136
<artifactId>core</artifactId>
126137
<version>${com.capitalone.dashboard.core.version}</version>
127138
</dependency>
128-
<dependency>
129-
<groupId>commons-io</groupId>
130-
<artifactId>commons-io</artifactId>
131-
<version>${commons.io.version}</version>
132-
<scope>test</scope>
133-
</dependency>
134-
<dependency>
135-
<groupId>joda-time</groupId>
136-
<artifactId>joda-time</artifactId>
137-
</dependency>
138-
<dependency>
139-
<groupId>org.apache.commons</groupId>
140-
<artifactId>commons-lang3</artifactId>
141-
<version>${commons.lang.version}</version>
142-
</dependency>
143-
<dependency>
144-
<groupId>org.joda</groupId>
145-
<artifactId>joda-convert</artifactId>
146-
<version>${org.joda.joda-convert.version}</version>
147-
<scope>provided</scope>
148-
</dependency>
149139
<dependency>
150140
<groupId>org.springframework.boot</groupId>
151141
<artifactId>spring-boot-starter-data-mongodb</artifactId>
@@ -155,33 +145,6 @@
155145
<artifactId>spring-boot-starter-test</artifactId>
156146
<scope>test</scope>
157147
</dependency>
158-
<dependency>
159-
<groupId>org.tmatesoft.svnkit</groupId>
160-
<artifactId>svnkit</artifactId>
161-
<version>${svnkit.version}</version>
162-
</dependency>
163-
<dependency>
164-
<groupId>org.mockito</groupId>
165-
<artifactId>mockito-all</artifactId>
166-
<version>${mockito.all.version}</version>
167-
</dependency>
168-
<dependency>
169-
<groupId>com.googlecode.json-simple</groupId>
170-
<artifactId>json-simple</artifactId>
171-
</dependency>
172-
<dependency>
173-
<groupId>commons-codec</groupId>
174-
<artifactId>commons-codec</artifactId>
175-
<version>${commons.codec.version}</version>
176-
</dependency>
177-
<dependency>
178-
<groupId>org.apache.httpcomponents</groupId>
179-
<artifactId>httpclient</artifactId>
180-
</dependency>
181-
<dependency>
182-
<groupId>org.springframework</groupId>
183-
<artifactId>spring-web</artifactId>
184-
</dependency>
185148
</dependencies>
186149

187150
<build>
@@ -291,6 +254,7 @@
291254
<plugin>
292255
<groupId>com.spotify</groupId>
293256
<artifactId>docker-maven-plugin</artifactId>
257+
<version>1.2.2</version>
294258
<configuration>
295259
<skipDockerBuild>false</skipDockerBuild>
296260
<imageName>${repository.name}</imageName> <!-- keeping image name in sync with repo name-->

‎src/main/java/com/capitalone/dashboard/Application.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import org.springframework.boot.SpringApplication;
88
import org.springframework.boot.autoconfigure.SpringBootApplication;
99
import org.springframework.boot.builder.SpringApplicationBuilder;
10-
import org.springframework.boot.context.web.SpringBootServletInitializer;
10+
import org.springframework.boot.web.support.SpringBootServletInitializer;
1111

1212
/**
1313
* Application configuration and bootstrap

‎src/main/java/com/capitalone/dashboard/collector/GitHubCollectorTask.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.capitalone.dashboard.collector;
22

33

4+
import com.capitalone.dashboard.client.RestOperationsSupplier;
45
import com.capitalone.dashboard.misc.HygieiaException;
56
import com.capitalone.dashboard.model.BaseModel;
67
import com.capitalone.dashboard.model.CollectionError;
@@ -45,6 +46,7 @@
4546
import java.util.Objects;
4647
import java.util.Optional;
4748
import java.util.Set;
49+
import java.util.concurrent.atomic.AtomicInteger;
4850
import java.util.regex.Pattern;
4951
import java.util.stream.Collectors;
5052

@@ -65,6 +67,7 @@ public class GitHubCollectorTask extends CollectorTask<Collector> {
6567
private static final long FOURTEEN_DAYS_MILLISECONDS = 14 * 24 * 60 * 60 * 1000;
6668
private static final String REPO_NAME = "repoName";
6769
private static final String ORG_NAME = "orgName";
70+
private AtomicInteger count = new AtomicInteger(0);
6871

6972

7073
@Autowired
@@ -175,14 +178,14 @@ public void collect(Collector collector){
175178
}
176179

177180

178-
179181
@SuppressWarnings({"PMD.AvoidDeeplyNestedIfStmts"})
180182
public void collectProcess(Collector collector, List<GitHubRepo> enabledRepos) {
181183
long start = System.currentTimeMillis();
182184
int repoCount = 0;
183185
int commitCount = 0;
184186
int pullCount = 0;
185187
int issueCount = 0;
188+
count.set(0);
186189

187190
for (GitHubRepo repo : enabledRepos) {
188191
repoCount++;
@@ -280,6 +283,7 @@ public void collectProcess(Collector collector, List<GitHubRepo> enabledRepos) {
280283
}
281284
long end = System.currentTimeMillis();
282285
long elapsedSeconds = (end - start) / 1000;
286+
count.set(commitCount);
283287
LOG.info(String.format("GitHubCollectorTask:collect stop, totalProcessSeconds=%d, totalRepoCount=%d, totalNewPulls=%d, totalNewCommits=%d totalNewIssues=%d",
284288
elapsedSeconds, repoCount, pullCount, commitCount, issueCount));
285289

0 commit comments

Comments
 (0)