Skip to content

Commit 5f07ca8

Browse files
gm2552gm2552
authored
Merge pull request #15 from DirectProjectJavaRI/develop
Releasing direct-common 8.1.0
2 parents 1949b6c + fcd55d7 commit 5f07ca8

File tree

3 files changed

+62
-32
lines changed

3 files changed

+62
-32
lines changed

‎pom.xml‎

Lines changed: 35 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<artifactId>direct-common</artifactId>
66
<name>Direct Project common APIs</name>
7-
<version>8.0.0</version>
7+
<version>8.1.0</version>
88
<description>Direct Project common APIs. Includes instrumentation, auditing, and other utility APIs</description>
99
<inceptionYear>2010</inceptionYear>
1010
<url>http://api.nhindirect.org/x/www/api.nhindirect.org/java/site/direct-common/${project.version}</url>
@@ -35,8 +35,8 @@
3535
<commons-text.version>1.9</commons-text.version>
3636
<commons-io.version>2.8.0</commons-io.version>
3737
<mina-core.version>2.1.4</mina-core.version>
38-
<bcprov-jdk15on.version>1.68</bcprov-jdk15on.version>
39-
<bcmail-jdk15on>1.68</bcmail-jdk15on>
38+
<bcprov-jdk18on.version>1.81</bcprov-jdk18on.version>
39+
<bcmail-jdk18on>1.81</bcmail-jdk18on>
4040
</properties>
4141
<parent>
4242
<groupId>org.springframework.boot</groupId>
@@ -80,6 +80,20 @@
8080
<dependency>
8181
<groupId>org.springframework.cloud</groupId>
8282
<artifactId>spring-cloud-starter-openfeign</artifactId>
83+
<exclusions>
84+
<exclusion>
85+
<groupId>org.bouncycastle</groupId>
86+
<artifactId>bcprov-jdk15on</artifactId>
87+
</exclusion>
88+
<exclusion>
89+
<groupId>org.bouncycastle</groupId>
90+
<artifactId>bcmail-jdk15on</artifactId>
91+
</exclusion>
92+
<exclusion>
93+
<groupId>org.bouncycastle</groupId>
94+
<artifactId>bcpkix-jdk15on</artifactId>
95+
</exclusion>
96+
</exclusions>
8397
</dependency>
8498
<dependency>
8599
<groupId>org.springframework.cloud</groupId>
@@ -153,13 +167,13 @@
153167
</dependency>
154168
<dependency>
155169
<groupId>org.bouncycastle</groupId>
156-
<artifactId>bcprov-jdk15on</artifactId>
157-
<version>${bcprov-jdk15on.version}</version>
170+
<artifactId>bcprov-jdk18on</artifactId>
171+
<version>${bcprov-jdk18on.version}</version>
158172
</dependency>
159173
<dependency>
160174
<groupId>org.bouncycastle</groupId>
161-
<artifactId>bcmail-jdk15on</artifactId>
162-
<version>${bcmail-jdk15on}</version>
175+
<artifactId>bcmail-jdk18on</artifactId>
176+
<version>${bcmail-jdk18on}</version>
163177
</dependency>
164178
<dependency>
165179
<groupId>org.springframework.boot</groupId>
@@ -171,7 +185,7 @@
171185
<artifactId>jmockit</artifactId>
172186
<version>${jmockit.version}</version>
173187
<scope>test</scope>
174-
</dependency>
188+
</dependency>
175189
</dependencies>
176190
<build>
177191
<extensions>
@@ -293,8 +307,8 @@
293307
</goals>
294308
</execution>
295309
</executions>
296-
</plugin>
297-
<!-- For Releases only
310+
</plugin>
311+
<!-- For Releases only
298312
<plugin>
299313
<groupId>org.apache.maven.plugins</groupId>
300314
<artifactId>maven-gpg-plugin</artifactId>
@@ -307,9 +321,17 @@
307321
</goals>
308322
</execution>
309323
</executions>
310-
<version>3.0.1</version>
311324
</plugin>
312-
-->
325+
-->
326+
<plugin>
327+
<groupId>org.sonatype.central</groupId>
328+
<artifactId>central-publishing-maven-plugin</artifactId>
329+
<version>0.8.0</version>
330+
<extensions>true</extensions>
331+
<configuration>
332+
<publishingServerId>central</publishingServerId>
333+
</configuration>
334+
</plugin>
313335
</plugins>
314336
</build>
315337
<reporting>
@@ -373,23 +395,5 @@
373395
</plugin>
374396
</plugins>
375397
</reporting>
376-
<distributionManagement>
377-
<site>
378-
<id>nhind-site</id>
379-
<name>NHIN Direct API publication site</name>
380-
<url>sftp://api.nhindirect.org/x/www/api.nhindirect.org/java/site/direct-common/${project.version}</url>
381-
</site>
382-
<snapshotRepository>
383-
<id>sonatype-snapshot</id>
384-
<name>Sonatype OSS Maven SNAPSHOT Repository</name>
385-
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
386-
<uniqueVersion>false</uniqueVersion>
387-
</snapshotRepository>
388-
<repository>
389-
<id>sonatype-release</id>
390-
<name>Sonatype OSS Maven Release Repositor</name>
391-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
392-
<uniqueVersion>false</uniqueVersion>
393-
</repository>
394-
</distributionManagement>
398+
395399
</project>

‎src/main/java/org/nhindirect/common/options/OptionsManager.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,8 @@ public class OptionsManager
106106
*/
107107
JVM_PARAMS.put(OptionsParameter.CRYPTOGRAHPER_SMIME_ENCRYPTION_ALGORITHM, "org.nhindirect.stagent.cryptographer.smime.EncryptionAlgorithm");
108108
JVM_PARAMS.put(OptionsParameter.CRYPTOGRAHPER_SMIME_DIGEST_ALGORITHM, "org.nhindirect.stagent.cryptographer.smime.DigestAlgorithm");
109+
JVM_PARAMS.put(OptionsParameter.CRYPTOGRAHPER_KEY_ENCRYPTION_ALGORITHM, "org.nhindirect.stagent.cryptographer.smime.KeyEncryptionAlgorithm");
110+
JVM_PARAMS.put(OptionsParameter.CRYPTOGRAHPER_KEY_ENCRYPTION_DIGEST_ALGORITHM, "org.nhindirect.stagent.cryptographer.smime.KeyEncryptionDigestAlgorithm");
109111
JVM_PARAMS.put(OptionsParameter.ENFORCE_STRONG_DIGESTS, "org.nhindirect.stagent.cryptographer.smime.EnforceStrongDigests");
110112
JVM_PARAMS.put(OptionsParameter.ENFORCE_STRONG_ENCRYPTION, "org.nhindirect.stagent.cryptographer.smime.EnforceStrongEncryption");
111113
JVM_PARAMS.put(OptionsParameter.CRYPTOGRAHPER_LOG_DIGESTS, "org.nhindirect.stagent.cryptographer.smime.LogDigests");

‎src/main/java/org/nhindirect/common/options/OptionsParameter.java‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,31 @@ public class OptionsParameter
158158
* <p><b>JVM Parameter/Options Name:</b> org.nhindirect.stagent.cryptographer.smime.EncryptionAlgorithm
159159
*/
160160
public final static String CRYPTOGRAHPER_SMIME_ENCRYPTION_ALGORITHM = "CRYPTOGRAHPER_SMIME_ENCRYPTION_ALGORITHM";
161-
161+
162+
/**
163+
* String value that specifies the key encryption algorithm used to encrypt message keys by the SMIME cryptographer
164+
* <br>Valid option values:
165+
* <ul>
166+
* <li>RSA_OAEP</li>
167+
* <li>RSA_PKCS#1V15</li>
168+
* </ul>
169+
* <p><b>JVM Parameter/Options Name:</b> org.nhindirect.stagent.cryptographer.smime.EncryptionAlgorithm
170+
*/
171+
public final static String CRYPTOGRAHPER_KEY_ENCRYPTION_ALGORITHM = "CRYPTOGRAHPER_KEY_ENCRYPTION_ALGORITHM";
172+
173+
/**
174+
* String value that specifies the key encryption algorithm used to encrypt message keys by the SMIME cryptographer
175+
* <br>Valid option values:
176+
* <ul>
177+
* <li>SHA1</li>
178+
* <li>SHA256</li>
179+
* <li>SHA384</li>
180+
* <li>SHA512</li>
181+
* </ul>
182+
* <p><b>JVM Parameter/Options Name:</b> org.nhindirect.stagent.cryptographer.smime.EncryptionAlgorithm
183+
*/
184+
public final static String CRYPTOGRAHPER_KEY_ENCRYPTION_DIGEST_ALGORITHM = "CRYPTOGRAHPER_KEY_ENCRYPTION_DIGEST_ALGORITHM";
185+
162186
/**
163187
* String value that specifies the digest algorithm used to hash messages by the SMIME cryptographer
164188
* <br>Valid option values:

0 commit comments

Comments
 (0)