Skip to content

Commit 85fa47a

Browse files
authored
Merge pull request #1266 from jdcasey/indy-1.7.x
update parent to fix enforcer, and specify httpclient directly to solve prod SSL bug
2 parents e62b334 + 010cf74 commit 85fa47a

1 file changed

Lines changed: 25 additions & 4 deletions

File tree

pom.xml

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.commonjava</groupId>
2323
<artifactId>commonjava</artifactId>
24-
<version>13</version>
24+
<version>14</version>
2525
</parent>
2626

2727
<groupId>org.commonjava.indy</groupId>
@@ -39,6 +39,14 @@
3939
<url>http://github.com/Commonjava/indy</url>
4040
<tag>indy-parent-1.6.0</tag>
4141
</scm>
42+
43+
<repositories>
44+
<repository>
45+
<id>sonatype-snapshots</id>
46+
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
47+
<snapshots><enabled>true</enabled></snapshots>
48+
</repository>
49+
</repositories>
4250

4351
<properties>
4452
<apiVersion>1</apiVersion>
@@ -63,6 +71,10 @@
6371
<kafkaVersion>1.1.0</kafkaVersion>
6472
<logbackVersion>1.2.3</logbackVersion>
6573
<logbackContribVersion>0.1.5</logbackContribVersion>
74+
<jacksonVersion>2.9.9</jacksonVersion>
75+
<metricsVersion>4.0.2</metricsVersion>
76+
<httpcoreVersion>4.4.9</httpcoreVersion>
77+
<httpclientVersion>4.5.9</httpclientVersion>
6678

6779
<!-- commonjava/redhat projects -->
6880
<atlasVersion>1.0.1</atlasVersion>
@@ -110,9 +122,6 @@
110122
<jacoco.report.dir>${project.build.directory}</jacoco.report.dir>
111123
<junit.report.dir>${project.build.directory}/surefire-reports</junit.report.dir>
112124
<failsafe.report.dir>${project.build.directory}/failsafe-reports</failsafe.report.dir>
113-
114-
<metrics.version>4.0.2</metrics.version>
115-
<jackson-version>2.9.8</jackson-version>
116125
</properties>
117126

118127
<modules>
@@ -140,6 +149,18 @@
140149

141150
<dependencyManagement>
142151
<dependencies>
152+
<!-- Override httpclient dep versions -->
153+
<dependency>
154+
<groupId>org.apache.httpcomponents</groupId>
155+
<artifactId>httpclient</artifactId>
156+
<version>${httpclientVersion}</version>
157+
</dependency>
158+
<dependency>
159+
<groupId>org.apache.httpcomponents</groupId>
160+
<artifactId>httpcore</artifactId>
161+
<version>${httpcoreVersion}</version>
162+
</dependency>
163+
143164
<dependency>
144165
<groupId>org.commonjava.boms</groupId>
145166
<artifactId>web-commons-bom</artifactId>

0 commit comments

Comments
 (0)