Skip to content

Commit 825a8c3

Browse files
gm2552gm2552
authored
Merge pull request #7 from DirectProjectJavaRI/develop
Releasing config-service-client 8.1.0
2 parents 800b11d + 82f374b commit 825a8c3

4 files changed

Lines changed: 44 additions & 42 deletions

File tree

‎pom.xml‎

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>org.nhind</groupId>
55
<artifactId>config-service-client</artifactId>
6-
<version>8.0.1</version>
6+
<version>8.1.0</version>
77
<packaging>jar</packaging>
88
<name>NHIN Direct Java config service client proxy</name>
99
<description>NHIN Direct Java config service client proxy</description>
@@ -60,16 +60,30 @@
6060
<dependency>
6161
<groupId>org.nhind</groupId>
6262
<artifactId>config-model</artifactId>
63-
<version>8.0.0</version>
63+
<version>8.1.0</version>
6464
</dependency>
6565
<dependency>
6666
<groupId>org.nhind</groupId>
6767
<artifactId>direct-common</artifactId>
68-
<version>8.0.0</version>
68+
<version>8.1.0</version>
6969
</dependency>
7070
<dependency>
7171
<groupId>org.springframework.cloud</groupId>
7272
<artifactId>spring-cloud-starter-openfeign</artifactId>
73+
<exclusions>
74+
<exclusion>
75+
<groupId>org.bouncycastle</groupId>
76+
<artifactId>bcprov-jdk15on</artifactId>
77+
</exclusion>
78+
<exclusion>
79+
<groupId>org.bouncycastle</groupId>
80+
<artifactId>bcmail-jdk15on</artifactId>
81+
</exclusion>
82+
<exclusion>
83+
<groupId>org.bouncycastle</groupId>
84+
<artifactId>bcpkix-jdk15on</artifactId>
85+
</exclusion>
86+
</exclusions>
7387
</dependency>
7488
<dependency>
7589
<groupId>org.springframework.boot</groupId>
@@ -79,7 +93,7 @@
7993
<dependency>
8094
<groupId>org.nhind</groupId>
8195
<artifactId>config-service-jar</artifactId>
82-
<version>8.0.1</version>
96+
<version>8.1.0</version>
8397
<scope>test</scope>
8498
</dependency>
8599
<dependency>
@@ -161,8 +175,8 @@
161175
</goals>
162176
</execution>
163177
</executions>
164-
</plugin>
165-
<!--
178+
</plugin>
179+
<!-- For Releases only
166180
<plugin>
167181
<groupId>org.apache.maven.plugins</groupId>
168182
<artifactId>maven-gpg-plugin</artifactId>
@@ -177,7 +191,16 @@
177191
</executions>
178192
<version>3.0.1</version>
179193
</plugin>
180-
-->
194+
-->
195+
<plugin>
196+
<groupId>org.sonatype.central</groupId>
197+
<artifactId>central-publishing-maven-plugin</artifactId>
198+
<version>0.8.0</version>
199+
<extensions>true</extensions>
200+
<configuration>
201+
<publishingServerId>central</publishingServerId>
202+
</configuration>
203+
</plugin>
181204
</plugins>
182205
</build>
183206
<reporting>
@@ -244,25 +267,4 @@
244267
</plugin>
245268
</plugins>
246269
</reporting>
247-
248-
<distributionManagement>
249-
<site>
250-
<id>nhind-site</id>
251-
<name>NHIN Direct API publication site</name>
252-
<url>sftp://api.nhindirect.org/x/www/api.nhindirect.org/java/site/config/config-service-client/${project.version}</url>
253-
</site>
254-
<snapshotRepository>
255-
<id>sonatype-snapshot</id>
256-
<name>Sonatype OSS Maven SNAPSHOT Repository</name>
257-
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
258-
<uniqueVersion>false</uniqueVersion>
259-
</snapshotRepository>
260-
<repository>
261-
<id>sonatype-release</id>
262-
<name>Sonatype OSS Maven Release Repositor</name>
263-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
264-
<uniqueVersion>false</uniqueVersion>
265-
</repository>
266-
</distributionManagement>
267-
268270
</project>

‎src/test/java/org/nhind/config/rest/impl/DefaultTrustBundleService_getTrustBundleTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ protected Collection<TrustBundle> getBundlesToAdd()
9999

100100
TrustBundle bundle = new TrustBundle();
101101
bundle.setBundleName("testBundle1");
102-
File fl = new File("src/test/resources/bundles/providerTestBundle.p7b");
103-
bundle.setBundleURL(filePrefix + fl.getAbsolutePath());
102+
String bundleURL = getClass().getClassLoader().getResource("bundles/providerTestBundle.p7b").toString();
103+
bundle.setBundleURL(bundleURL);
104104
bundle.setRefreshInterval(24);
105105
bundle.setSigningCertificateData(null);
106106
bundles.add(bundle);
@@ -153,8 +153,8 @@ protected Collection<TrustBundle> getBundlesToAdd()
153153

154154
TrustBundle bundle = new TrustBundle();
155155
bundle.setBundleName("testBundle1");
156-
File fl = new File("src/test/resources/bundles/providerTestBundle.p7b");
157-
bundle.setBundleURL(filePrefix + fl.getAbsolutePath());
156+
String bundleURL = getClass().getClassLoader().getResource("bundles/providerTestBundle.p7b").toString();
157+
bundle.setBundleURL(bundleURL);
158158
bundle.setRefreshInterval(24);
159159
bundle.setSigningCertificateData(null);
160160
bundles.add(bundle);

‎src/test/java/org/nhind/config/rest/impl/DefaultTrustBundleService_getTrustBundlesTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -224,16 +224,16 @@ protected Collection<TrustBundle> getBundlesToAdd()
224224

225225
TrustBundle bundle = new TrustBundle();
226226
bundle.setBundleName("testBundle1");
227-
File fl = new File("src/test/resources/bundles/providerTestBundle.p7b");
228-
bundle.setBundleURL(filePrefix + fl.getAbsolutePath());
227+
String bundleURL = getClass().getClassLoader().getResource("bundles/providerTestBundle.p7b").toString();
228+
bundle.setBundleURL(bundleURL);
229229
bundle.setRefreshInterval(24);
230230
bundle.setSigningCertificateData(null);
231231
bundles.add(bundle);
232232

233233

234234
bundle = new TrustBundle();
235235
bundle.setBundleName("testBundle2");
236-
bundle.setBundleURL(filePrefix + fl.getAbsolutePath());
236+
bundle.setBundleURL(bundleURL);
237237
bundle.setRefreshInterval(12);
238238
bundle.setSigningCertificateData(null);
239239

@@ -287,16 +287,16 @@ protected Collection<TrustBundle> getBundlesToAdd()
287287

288288
TrustBundle bundle = new TrustBundle();
289289
bundle.setBundleName("testBundle1");
290-
File fl = new File("src/test/resources/bundles/providerTestBundle.p7b");
291-
bundle.setBundleURL(filePrefix + fl.getAbsolutePath());
290+
String bundleURL = getClass().getClassLoader().getResource("bundles/providerTestBundle.p7b").toString();
291+
bundle.setBundleURL(bundleURL);
292292
bundle.setRefreshInterval(24);
293293
bundle.setSigningCertificateData(null);
294294
bundles.add(bundle);
295295

296296

297297
bundle = new TrustBundle();
298298
bundle.setBundleName("testBundle2");
299-
bundle.setBundleURL(filePrefix + fl.getAbsolutePath());
299+
bundle.setBundleURL(bundleURL);
300300
bundle.setRefreshInterval(12);
301301
bundle.setSigningCertificateData(null);
302302

‎src/test/java/org/nhind/config/rest/impl/DefaultTrustBundleService_refreshTrustBundleTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ protected Collection<TrustBundle> getBundlesToAdd()
8686

8787
TrustBundle bundle = new TrustBundle();
8888
bundle.setBundleName("testBundle1");
89-
File fl = new File("src/test/resources/bundles/providerTestBundle.p7b");
90-
bundle.setBundleURL(filePrefix + fl.getAbsolutePath());
89+
String bundleURL = getClass().getClassLoader().getResource("bundles/providerTestBundle.p7b").toString();
90+
bundle.setBundleURL(bundleURL);
9191
bundle.setRefreshInterval(24);
9292
bundle.setSigningCertificateData(null);
9393
bundles.add(bundle);
@@ -130,8 +130,8 @@ protected Collection<TrustBundle> getBundlesToAdd()
130130

131131
TrustBundle bundle = new TrustBundle();
132132
bundle.setBundleName("testBundle1");
133-
File fl = new File("src/test/resources/bundles/providerTestBundle.p7b");
134-
bundle.setBundleURL(filePrefix + fl.getAbsolutePath());
133+
String bundleURL = getClass().getClassLoader().getResource("bundles/providerTestBundle.p7b").toString();
134+
bundle.setBundleURL(bundleURL);
135135
bundle.setRefreshInterval(24);
136136
bundle.setSigningCertificateData(null);
137137
bundles.add(bundle);

0 commit comments

Comments
 (0)