Skip to content

Commit 4e14be0

Browse files
gm2552gm2552
authored
Merge pull request #8 from DirectProjectJavaRI/java-ri-8.1.0
Java ri 8.1.0
2 parents 7fe3234 + 06a340e commit 4e14be0

1 file changed

Lines changed: 48 additions & 34 deletions

File tree

‎pom.xml‎

Lines changed: 48 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,13 @@
3838
<properties>
3939
<dnsjava.version>3.3.1</dnsjava.version>
4040
<mina-core.version>2.1.4</mina-core.version>
41-
<bcprov-jdk15on.version>1.68</bcprov-jdk15on.version>
4241
</properties>
4342
<licenses>
4443
<license>
4544
<name>New BSD License</name>
4645
<url>http://nhindirect.org/BSDLicense</url>
4746
</license>
48-
</licenses>
47+
</licenses>
4948
<dependencyManagement>
5049
<dependencies>
5150
<dependency>
@@ -71,7 +70,12 @@
7170
</dependency>
7271
</dependencies>
7372
</dependencyManagement>
74-
<dependencies>
73+
<dependencies>
74+
<dependency>
75+
<groupId>org.nhind</groupId>
76+
<artifactId>dns</artifactId>
77+
<version>8.1.0-SNAPSHOT</version>
78+
</dependency>
7579
<dependency>
7680
<groupId>org.springframework.boot</groupId>
7781
<artifactId>spring-boot-configuration-processor</artifactId>
@@ -82,11 +86,39 @@
8286
</dependency>
8387
<dependency>
8488
<groupId>org.springframework.cloud</groupId>
85-
<artifactId>spring-cloud-starter-config</artifactId>
89+
<artifactId>spring-cloud-starter-config</artifactId>
90+
<exclusions>
91+
<exclusion>
92+
<groupId>org.bouncycastle</groupId>
93+
<artifactId>bcprov-jdk15on</artifactId>
94+
</exclusion>
95+
<exclusion>
96+
<groupId>org.bouncycastle</groupId>
97+
<artifactId>bcmail-jdk15on</artifactId>
98+
</exclusion>
99+
<exclusion>
100+
<groupId>org.bouncycastle</groupId>
101+
<artifactId>bcpkix-jdk15on</artifactId>
102+
</exclusion>
103+
</exclusions>
86104
</dependency>
87105
<dependency>
88106
<groupId>org.springframework.cloud</groupId>
89107
<artifactId>spring-cloud-starter-bootstrap</artifactId>
108+
<exclusions>
109+
<exclusion>
110+
<groupId>org.bouncycastle</groupId>
111+
<artifactId>bcprov-jdk15on</artifactId>
112+
</exclusion>
113+
<exclusion>
114+
<groupId>org.bouncycastle</groupId>
115+
<artifactId>bcmail-jdk15on</artifactId>
116+
</exclusion>
117+
<exclusion>
118+
<groupId>org.bouncycastle</groupId>
119+
<artifactId>bcpkix-jdk15on</artifactId>
120+
</exclusion>
121+
</exclusions>
90122
</dependency>
91123
<dependency>
92124
<groupId>io.pivotal.spring.cloud</groupId>
@@ -96,42 +128,24 @@
96128
<groupId>org.codehaus.jackson</groupId>
97129
<artifactId>jackson-mapper-asl</artifactId>
98130
</exclusion>
131+
<exclusion>
132+
<groupId>org.bouncycastle</groupId>
133+
<artifactId>bcprov-jdk15on</artifactId>
134+
</exclusion>
135+
<exclusion>
136+
<groupId>org.bouncycastle</groupId>
137+
<artifactId>bcmail-jdk15on</artifactId>
138+
</exclusion>
139+
<exclusion>
140+
<groupId>org.bouncycastle</groupId>
141+
<artifactId>bcpkix-jdk15on</artifactId>
142+
</exclusion>
99143
</exclusions>
100144
</dependency>
101-
<dependency>
102-
<groupId>org.bouncycastle</groupId>
103-
<artifactId>bcprov-jdk15on</artifactId>
104-
<version>${bcprov-jdk15on.version}</version>
105-
</dependency>
106145
<dependency>
107146
<groupId>dnsjava</groupId>
108147
<artifactId>dnsjava</artifactId>
109148
<version>${dnsjava.version}</version>
110-
</dependency>
111-
<dependency>
112-
<groupId>org.nhind</groupId>
113-
<artifactId>dns</artifactId>
114-
<version>8.0.1</version>
115-
</dependency>
116-
<dependency>
117-
<groupId>org.nhind</groupId>
118-
<artifactId>config-model</artifactId>
119-
<version>8.0.0</version>
120-
</dependency>
121-
<dependency>
122-
<groupId>org.nhind</groupId>
123-
<artifactId>config-service-client</artifactId>
124-
<version>8.0.0</version>
125-
</dependency>
126-
<dependency>
127-
<groupId>org.nhind</groupId>
128-
<artifactId>direct-policy</artifactId>
129-
<version>8.0.0</version>
130-
</dependency>
131-
<dependency>
132-
<groupId>org.nhind</groupId>
133-
<artifactId>direct-common</artifactId>
134-
<version>8.0.0</version>
135149
</dependency>
136150
</dependencies>
137151
<build>

0 commit comments

Comments
 (0)