Skip to content

Commit 7f74ee9

Browse files
author
Greg Meyer
authored
Merge pull request #12 from DirectProjectJavaRI/develop
Releasing 8.0.0
2 parents c60d2e3 + cc45bfd commit 7f74ee9

File tree

75 files changed

+321
-328
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+321
-328
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,4 @@ hs_err_pid*
2424
/.DS_Store
2525
/.classpath
2626
/.project
27+
/target/

‎pom.xml‎

Lines changed: 55 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<artifactId>direct-policy</artifactId>
66
<name>Direct Project policy enablement engine</name>
7-
<version>7.0</version>
7+
<version>8.0.0</version>
88
<description>Direct Project policy enablement engine</description>
99
<inceptionYear>2010</inceptionYear>
1010
<url>http://api.nhindirect.org/x/www/api.nhindirect.org/java/site/direct-policy/${project.version}</url>
@@ -23,91 +23,84 @@
2323
<url>http://nhindirect.org</url>
2424
</organization>
2525
<prerequisites>
26-
<maven>3.0.0</maven>
26+
<maven>3.5.0</maven>
2727
</prerequisites>
2828
<scm>
2929
<url>scm:git:https://github.com/DirectProjectJavaRI/direct-policy.git</url>
3030
<connection>scm:git:https://github.com/DirectProjectJavaRI/direct-policy.git</connection>
3131
</scm>
32-
<parent>
33-
<groupId>org.springframework.boot</groupId>
34-
<artifactId>spring-boot-dependencies</artifactId>
35-
<version>2.2.4.RELEASE</version>
36-
</parent>
32+
<parent>
33+
<groupId>org.springframework.boot</groupId>
34+
<artifactId>spring-boot-dependencies</artifactId>
35+
<version>2.5.2</version>
36+
<relativePath />
37+
</parent>
3738
<licenses>
3839
<license>
3940
<name>New BSD License</name>
4041
<url>http://nhindirect.org/BSDLicense</url>
4142
</license>
42-
</licenses>
43+
</licenses>
44+
<properties>
45+
<xstream.version>1.4.17</xstream.version>
46+
<javax-mail.version>1.6.2</javax-mail.version>
47+
<bcprov-jdk15on.version>1.68</bcprov-jdk15on.version>
48+
<commons-io.version>2.8.0</commons-io.version>
49+
</properties>
4350
<dependencies>
4451
<dependency>
4552
<groupId>com.thoughtworks.xstream</groupId>
4653
<artifactId>xstream</artifactId>
47-
<version>1.4.11.1</version>
54+
<version>${xstream.version}</version>
4855
</dependency>
4956
<dependency>
5057
<groupId>org.bouncycastle</groupId>
5158
<artifactId>bcprov-jdk15on</artifactId>
52-
<version>1.64</version>
59+
<version>${bcprov-jdk15on.version}</version>
5360
</dependency>
5461
<dependency>
55-
<groupId>javax.mail</groupId>
56-
<artifactId>mail</artifactId>
57-
<version>1.4.3</version>
58-
<exclusions>
59-
<exclusion>
60-
<groupId>javax.activation</groupId>
61-
<artifactId>activation</artifactId>
62-
</exclusion>
63-
</exclusions>
64-
</dependency>
62+
<groupId>com.sun.mail</groupId>
63+
<artifactId>javax.mail</artifactId>
64+
<version>${javax-mail.version}</version>
65+
</dependency>
6566
<dependency>
6667
<groupId>commons-io</groupId>
6768
<artifactId>commons-io</artifactId>
68-
<version>2.6</version>
69-
</dependency>
69+
<version>${commons-io.version}</version>
70+
</dependency>
7071
<dependency>
7172
<groupId>org.apache.commons</groupId>
7273
<artifactId>commons-lang3</artifactId>
7374
</dependency>
7475
<dependency>
7576
<groupId>org.springframework.boot</groupId>
76-
<artifactId>spring-boot-starter-web</artifactId>
77+
<artifactId>spring-boot-starter-webflux</artifactId>
7778
<scope>test</scope>
7879
</dependency>
7980
<dependency>
8081
<groupId>org.springframework.boot</groupId>
8182
<artifactId>spring-boot-starter-test</artifactId>
8283
<scope>test</scope>
8384
</dependency>
84-
<dependency>
85-
<groupId>junit</groupId>
86-
<artifactId>junit</artifactId>
87-
<scope>test</scope>
88-
</dependency>
89-
<dependency>
90-
<groupId>org.mockito</groupId>
91-
<artifactId>mockito-core</artifactId>
92-
<scope>test</scope>
93-
</dependency>
85+
<dependency>
86+
<groupId>org.junit.jupiter</groupId>
87+
<artifactId>junit-jupiter-engine</artifactId>
88+
<scope>test</scope>
89+
</dependency>
9490
</dependencies>
9591
<build>
9692
<extensions>
9793
<extension>
9894
<groupId>org.apache.maven.wagon</groupId>
9995
<artifactId>wagon-webdav-jackrabbit</artifactId>
100-
<version>3.1.0</version>
10196
</extension>
10297
<extension>
10398
<groupId>org.apache.maven.wagon</groupId>
10499
<artifactId>wagon-ssh-external</artifactId>
105-
<version>3.1.0</version>
106100
</extension>
107101
<extension>
108102
<groupId>org.apache.maven.wagon</groupId>
109103
<artifactId>wagon-ssh</artifactId>
110-
<version>3.1.0</version>
111104
</extension>
112105
</extensions>
113106
<resources>
@@ -136,6 +129,7 @@
136129
<plugin>
137130
<groupId>org.apache.maven.plugins</groupId>
138131
<artifactId>maven-jxr-plugin</artifactId>
132+
<version>3.1.1</version>
139133
</plugin>
140134
<plugin>
141135
<groupId>org.apache.maven.plugins</groupId>
@@ -168,32 +162,27 @@
168162
</execution>
169163
</executions>
170164
</plugin>
171-
<plugin>
172-
<groupId>org.apache.maven.plugins</groupId>
173-
<artifactId>maven-jar-plugin</artifactId>
174-
<configuration>
175-
<archive>
176-
<index>true</index>
177-
</archive>
178-
</configuration>
179-
</plugin>
180-
<plugin>
181-
<groupId>org.apache.maven.plugins</groupId>
182-
<artifactId>maven-jar-plugin</artifactId>
183-
<executions>
184-
<execution>
185-
<goals>
186-
<goal>test-jar</goal>
187-
</goals>
188-
</execution>
189-
</executions>
190-
</plugin>
165+
<plugin>
166+
<groupId>org.apache.maven.plugins</groupId>
167+
<artifactId>maven-jar-plugin</artifactId>
168+
<configuration>
169+
<archive>
170+
<index>true</index>
171+
</archive>
172+
</configuration>
173+
<executions>
174+
<execution>
175+
<goals>
176+
<goal>test-jar</goal>
177+
</goals>
178+
</execution>
179+
</executions>
180+
</plugin>
191181
<plugin>
192182
<groupId>org.apache.maven.plugins</groupId>
193183
<artifactId>maven-javadoc-plugin</artifactId>
194-
<version>2.9.1</version>
195184
<configuration>
196-
<additionalparam>-Xdoclint:none</additionalparam>
185+
<additionalJOption>-Xdoclint:none</additionalJOption>
197186
<charset>UTF-8</charset>
198187
<docencoding>UTF-8</docencoding>
199188
<docfilessubdirs>true</docfilessubdirs>
@@ -214,7 +203,8 @@
214203
</goals>
215204
</execution>
216205
</executions>
217-
</plugin>
206+
</plugin>
207+
<!-- for release only
218208
<plugin>
219209
<groupId>org.apache.maven.plugins</groupId>
220210
<artifactId>maven-gpg-plugin</artifactId>
@@ -227,22 +217,22 @@
227217
</goals>
228218
</execution>
229219
</executions>
230-
</plugin>
220+
<version>3.0.1</version>
221+
</plugin>
222+
-->
231223
</plugins>
232224
</build>
233225
<reporting>
234226
<plugins>
235227
<plugin>
236228
<groupId>org.apache.maven.plugins</groupId>
237229
<artifactId>maven-project-info-reports-plugin</artifactId>
238-
<version>2.9</version>
239230
</plugin>
240231
<plugin>
241232
<groupId>org.apache.maven.plugins</groupId>
242-
<artifactId>maven-javadoc-plugin</artifactId>
243-
<version>2.9.1</version>
233+
<artifactId>maven-javadoc-plugin</artifactId>
244234
<configuration>
245-
<additionalparam>-Xdoclint:none</additionalparam>
235+
<additionalJOption>-Xdoclint:none</additionalJOption>
246236
<charset>UTF-8</charset>
247237
<docencoding>UTF-8</docencoding>
248238
<docfilessubdirs>true</docfilessubdirs>
@@ -269,6 +259,7 @@
269259
<plugin>
270260
<groupId>org.apache.maven.plugins</groupId>
271261
<artifactId>maven-jxr-plugin</artifactId>
262+
<version>3.1.1</version>
272263
</plugin>
273264
<plugin>
274265
<groupId>org.codehaus.mojo</groupId>

‎src/main/java/org/nhindirect/policy/x509/IssuerAttributeField.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
2929
import javax.security.auth.x500.X500Principal;
3030

3131
import org.bouncycastle.asn1.ASN1Object;
32-
import org.bouncycastle.asn1.DERObjectIdentifier;
32+
import org.bouncycastle.asn1.ASN1ObjectIdentifier;
3333
import org.bouncycastle.asn1.x500.AttributeTypeAndValue;
3434
import org.bouncycastle.asn1.x500.RDN;
3535
import org.bouncycastle.asn1.x500.X500Name;
@@ -106,7 +106,7 @@ public void injectReferenceValue(X509Certificate value) throws PolicyProcessExce
106106

107107
final X500Name x500Name = getX509Name(tbsStruct);
108108

109-
final RDN[] values = x500Name.getRDNs(new DERObjectIdentifier(getRDNAttributeFieldId().getId()));
109+
final RDN[] values = x500Name.getRDNs(new ASN1ObjectIdentifier(getRDNAttributeFieldId().getId()));
110110

111111
if (values.length == 0 && this.isRequired())
112112
throw new PolicyRequiredException(getFieldName() + " field attribute " + rdnAttributeId.getName() + " is marked as required but is not present.");

‎src/test/java/org/nhindirect/policy/LiteralPolicyExpressionFactory_getInstanceTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package org.nhindirect.policy;
22

3-
import static org.junit.Assert.assertEquals;
4-
import static org.junit.Assert.assertNotNull;
3+
import static org.junit.jupiter.api.Assertions.assertEquals;
4+
import static org.junit.jupiter.api.Assertions.assertNotNull;
55

6-
import org.junit.Test;
6+
import org.junit.jupiter.api.Test;
77

88
public class LiteralPolicyExpressionFactory_getInstanceTest
99
{

‎src/test/java/org/nhindirect/policy/OperationPolicyExpression_getInstanceTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package org.nhindirect.policy;
22

3-
import static org.junit.Assert.assertEquals;
4-
import static org.junit.Assert.assertNotNull;
3+
import static org.junit.jupiter.api.Assertions.assertEquals;
4+
import static org.junit.jupiter.api.Assertions.assertNotNull;
55

66
import java.util.Vector;
77

8-
import org.junit.Test;
8+
import org.junit.jupiter.api.Test;
99

1010
public class OperationPolicyExpression_getInstanceTest
1111
{

‎src/test/java/org/nhindirect/policy/PolicyFilterFactory_getInstanceTest.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package org.nhindirect.policy;
22

3-
import static org.junit.Assert.assertNotNull;
4-
import static org.junit.Assert.assertTrue;
3+
import static org.junit.jupiter.api.Assertions.assertNotNull;
4+
import static org.junit.jupiter.api.Assertions.assertTrue;
5+
6+
import org.junit.jupiter.api.Test;
57
import static org.mockito.Mockito.mock;
68

7-
import org.junit.Test;
89
import org.nhindirect.policy.impl.DefaultPolicyFilter;
910

1011
public class PolicyFilterFactory_getInstanceTest

‎src/test/java/org/nhindirect/policy/PolicyFilter_simpleTextLexiconTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package org.nhindirect.policy;
22

3-
import static org.junit.Assert.assertTrue;
3+
import static org.junit.jupiter.api.Assertions.assertTrue;
44

5+
import org.junit.jupiter.api.Test;
56
import java.io.InputStream;
67
import java.security.cert.X509Certificate;
78

89
import org.apache.commons.io.IOUtils;
9-
import org.junit.Test;
1010
import org.nhindirect.policy.util.TestUtils;
1111

1212
@SuppressWarnings("deprecation")

‎src/test/java/org/nhindirect/policy/PolicyFilter_textConversionToIntegerComplianceTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package org.nhindirect.policy;
22

3-
import static org.junit.Assert.assertTrue;
3+
import static org.junit.jupiter.api.Assertions.assertTrue;
4+
5+
import org.junit.jupiter.api.Test;
46

57
import java.io.InputStream;
68
import java.security.cert.X509Certificate;
79

810
import org.apache.commons.io.IOUtils;
9-
import org.junit.Test;
1011
import org.nhindirect.policy.util.TestUtils;
1112

1213

‎src/test/java/org/nhindirect/policy/PolicyLexiconParserFactory_getInstanceTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package org.nhindirect.policy;
22

3-
import static org.junit.Assert.assertTrue;
3+
import static org.junit.jupiter.api.Assertions.assertTrue;
4+
5+
import org.junit.jupiter.api.Test;
46

5-
import org.junit.Test;
67
import org.nhindirect.policy.impl.JavaSerializedObjectLexiconPolicyParser;
78
import org.nhindirect.policy.impl.XMLLexiconPolicyParser;
89

‎src/test/java/org/nhindirect/policy/PolicyLexicon_getParserClassTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package org.nhindirect.policy;
22

3-
import static org.junit.Assert.assertEquals;
3+
import static org.junit.jupiter.api.Assertions.assertEquals;
4+
5+
import org.junit.jupiter.api.Test;
46

5-
import org.junit.Test;
67
import org.nhindirect.policy.impl.JavaSerializedObjectLexiconPolicyParser;
78
import org.nhindirect.policy.impl.XMLLexiconPolicyParser;
89

0 commit comments

Comments
 (0)