Skip to content

Commit ffc5943

Browse files
author
Greg Meyer
authored
Merge pull request #5 from DirectProjectJavaRI/develop
Updating release notes and pom for site creation. Ready for 6.0 release.
2 parents 47bde18 + e3d4919 commit ffc5943

3 files changed

Lines changed: 80 additions & 88 deletions

File tree

‎pom.xml‎

Lines changed: 54 additions & 88 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>6.0-SNAPSHOT</version>
7+
<version>6.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>
@@ -26,8 +26,8 @@
2626
<maven>3.0.0</maven>
2727
</prerequisites>
2828
<scm>
29-
<url>http://code.google.com/p/nhin-d/source/browse/#hg/java/direct-policy</url>
30-
<connection>scm:hg:https://nhin-d.googlecode.com/hg/nhin-d/java/direct-policy</connection>
29+
<url>scm:git:https://github.com/DirectProjectJavaRI/direct-common.git</url>
30+
<connection>scm:git:https://github.com/DirectProjectJavaRI/direct-common.git</connection>
3131
</scm>
3232
<parent>
3333
<groupId>org.springframework.boot</groupId>
@@ -39,15 +39,7 @@
3939
<name>New BSD License</name>
4040
<url>http://nhindirect.org/BSDLicense</url>
4141
</license>
42-
</licenses>
43-
<repositories>
44-
<!-- Temp repository for Spring Boot Milestone -->
45-
<repository>
46-
<id>spring-milestone</id>
47-
<name>Spring Milestone Releases</name>
48-
<url>https://repo.spring.io/milestone/</url>
49-
</repository>
50-
</repositories>
42+
</licenses>
5143
<dependencies>
5244
<dependency>
5345
<groupId>com.thoughtworks.xstream</groupId>
@@ -180,26 +172,7 @@
180172
</goals>
181173
</execution>
182174
</executions>
183-
</plugin>
184-
<plugin>
185-
<groupId>com.atlassian.maven.plugins</groupId>
186-
<artifactId>maven-clover2-plugin</artifactId>
187-
<version>3.1.0</version>
188-
<configuration>
189-
<jdk>1.8</jdk>
190-
<licenseLocation>
191-
${project.basedir}/../licenses/clover.license
192-
</licenseLocation>
193-
</configuration>
194-
<executions>
195-
<execution>
196-
<phase>pre-site</phase>
197-
<goals>
198-
<goal>instrument</goal>
199-
</goals>
200-
</execution>
201-
</executions>
202-
</plugin>
175+
</plugin>
203176
<plugin>
204177
<groupId>org.apache.maven.plugins</groupId>
205178
<artifactId>maven-jar-plugin</artifactId>
@@ -290,30 +263,33 @@
290263
</dependency>
291264
</dependencies>
292265
</plugin>
293-
<!-- for releases only
294-
<plugin>
295-
<groupId>org.apache.maven.plugins</groupId>
296-
<artifactId>maven-javadoc-plugin</artifactId>
297-
<version>2.6.1</version>
298-
<configuration>
299-
<charset>UTF-8</charset>
300-
<docencoding>UTF-8</docencoding>
301-
<docfilessubdirs>true</docfilessubdirs>
302-
<detectJavaApiLink>true</detectJavaApiLink>
303-
<detectLinks>true</detectLinks>
304-
<source>1.6</source>
305-
<show>public</show>
306-
</configuration>
307-
<executions>
308-
<execution>
309-
<phase>package</phase>
310-
<id>attach-javadocs</id>
311-
<goals>
312-
<goal>jar</goal>
313-
</goals>
314-
</execution>
315-
</executions>
316-
</plugin>
266+
<plugin>
267+
<groupId>org.apache.maven.plugins</groupId>
268+
<artifactId>maven-javadoc-plugin</artifactId>
269+
<version>2.6.1</version>
270+
<configuration>
271+
<additionalparam>-Xdoclint:none</additionalparam>
272+
<charset>UTF-8</charset>
273+
<docencoding>UTF-8</docencoding>
274+
<docfilessubdirs>true</docfilessubdirs>
275+
<detectJavaApiLink>true</detectJavaApiLink>
276+
<detectLinks>true</detectLinks>
277+
<source>1.8</source>
278+
<show>public</show>
279+
<excludePackageNames>
280+
org.nhindirect.policy.tools
281+
</excludePackageNames>
282+
</configuration>
283+
<executions>
284+
<execution>
285+
<phase>package</phase>
286+
<id>attach-javadocs</id>
287+
<goals>
288+
<goal>jar</goal>
289+
</goals>
290+
</execution>
291+
</executions>
292+
</plugin>
317293
<plugin>
318294
<groupId>org.apache.maven.plugins</groupId>
319295
<artifactId>maven-gpg-plugin</artifactId>
@@ -326,39 +302,39 @@
326302
</goals>
327303
</execution>
328304
</executions>
329-
</plugin>
330-
-->
305+
</plugin>
331306
</plugins>
332307
</build>
333308
<reporting>
334309
<plugins>
335-
<plugin>
336-
<groupId>org.apache.maven.plugins</groupId>
337-
<artifactId>maven-project-info-reports-plugin</artifactId>
338-
<version>2.9</version>
339-
</plugin>
310+
<plugin>
311+
<groupId>org.apache.maven.plugins</groupId>
312+
<artifactId>maven-project-info-reports-plugin</artifactId>
313+
<version>2.9</version>
314+
</plugin>
340315
<plugin>
341316
<groupId>org.apache.maven.plugins</groupId>
342317
<artifactId>maven-javadoc-plugin</artifactId>
343-
<version>3.0.1</version>
318+
<version>2.6.1</version>
344319
<configuration>
345-
<charset>UTF-8</charset>
346-
<docencoding>UTF-8</docencoding>
347-
<docfilessubdirs>true</docfilessubdirs>
348-
<detectJavaApiLink>true</detectJavaApiLink>
349-
<detectLinks>true</detectLinks>
350-
<source>1.8</source>
351-
<show>public</show>
352-
<excludePackageNames>
353-
org.nhindirect.policy.tools
354-
</excludePackageNames>
355-
</configuration>
320+
<additionalparam>-Xdoclint:none</additionalparam>
321+
<charset>UTF-8</charset>
322+
<docencoding>UTF-8</docencoding>
323+
<docfilessubdirs>true</docfilessubdirs>
324+
<detectJavaApiLink>true</detectJavaApiLink>
325+
<detectLinks>true</detectLinks>
326+
<source>1.8</source>
327+
<show>public</show>
328+
<excludePackageNames>
329+
org.nhindirect.policy.tools
330+
</excludePackageNames>
331+
</configuration>
356332
</plugin>
357333
<plugin>
358334
<groupId>org.apache.maven.plugins</groupId>
359335
<artifactId>maven-pmd-plugin</artifactId>
360336
<configuration>
361-
<targetJdk>1.6</targetJdk>
337+
<targetJdk>1.8</targetJdk>
362338
</configuration>
363339
</plugin>
364340
<plugin>
@@ -372,7 +348,7 @@
372348
<plugin>
373349
<groupId>org.codehaus.mojo</groupId>
374350
<artifactId>findbugs-maven-plugin</artifactId>
375-
<version>2.3</version>
351+
<version>2.3.2</version>
376352
<configuration>
377353
<effort>Max</effort>
378354
<excludeFilterFile>${project.basedir}/src/report/findbugs-exclude.xml</excludeFilterFile>
@@ -389,17 +365,7 @@
389365
<tag>@deprecated</tag>
390366
</tags>
391367
</configuration>
392-
</plugin>
393-
<plugin>
394-
<groupId>com.atlassian.maven.plugins</groupId>
395-
<artifactId>maven-clover2-plugin</artifactId>
396-
<version>3.1.0</version>
397-
<configuration>
398-
<licenseLocation>
399-
${project.basedir}/../licenses/clover.license
400-
</licenseLocation>
401-
</configuration>
402-
</plugin>
368+
</plugin>
403369
</plugins>
404370
</reporting>
405371
<distributionManagement>

‎src/site/apt/releaseNotes.apt‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,26 @@
66
Greg Meyer
77
---
88

9+
{6.0}
10+
11+
Changes included with release 6.0
12+
13+
[]
14+
15+
Enhancements
16+
17+
* Requires Java 8
18+
19+
* Incorporation/Upgrade to Spring 5 and SpringBoot 2.1
20+
21+
* Updating to BouncyCaslte bcprov-jdk15on library.
22+
23+
[]
24+
25+
Bug Fixes
26+
27+
* NA
28+
929
{1.0.1}
1030

1131
Changes included with release 1.0.1

‎src/test/resources/interopTestCertPolicy.pol‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
((X509.TBS.EXTENSION.KeyUsage & 32) > 0) || ((X509.TBS.EXTENSION.KeyUsage & 128) > 0) &&
2+
(X509.TBS.SubjectPublicKeyInfo.Size > 2047) &&
3+
((X509.TBS.EXTENSION.CertificatePolicies.PolicyOIDs {?} 1.3.6.1.4.1.41179.2.1) || (X509.TBS.EXTENSION.CertificatePolicies.PolicyOIDs {?} 1.3.6.1.4.1.41179.2.2) || (X509.TBS.EXTENSION.CertificatePolicies.PolicyOIDs {?} 1.3.6.1.4.1.41179.2.3) ||
4+
(X509.TBS.EXTENSION.CertificatePolicies.PolicyOIDs {?} 1.3.6.1.4.1.41179.2.4)) &&
5+
((X509.TBS.EXTENSION.CertificatePolicies.PolicyOIDs {?} 1.3.6.1.4.1.41179.1.1) || (X509.TBS.EXTENSION.CertificatePolicies.PolicyOIDs {?} 1.3.6.1.4.1.41179.1.2) || (X509.TBS.EXTENSION.CertificatePolicies.PolicyOIDs {?} 1.3.6.1.4.1.41179.1.3) ||
6+
(X509.TBS.EXTENSION.CertificatePolicies.PolicyOIDs {?} 1.3.6.1.4.1.41179.1.4))

0 commit comments

Comments
 (0)