Skip to content

Commit

Permalink
new release v1.5.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@HealthPDU
HealthPDU committed Jun 15, 2020
1 parent 7a69379 commit a87e676
Show file tree
Hide file tree
Showing 7 changed files with 406 additions and 370 deletions.
3 changes: 3 additions & 0 deletions .gitlab-ci.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
include:
- project: 'health-pdu/htds/pipeline/ci-scripts'
file: 'maven-base.yml'
11 changes: 0 additions & 11 deletions Jenkinsfile
View file

This file was deleted.

9 changes: 9 additions & 0 deletions checkstyle/checkstyle-suppressions.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0"?>
<!DOCTYPE suppressions PUBLIC
"-//Checkstyle//DTD SuppressionFilter Configuration 1.0//EN"
"https://checkstyle.org/dtds/suppressions_1_0.dtd">
<suppressions>
<suppress checks="CustomImportOrder" files=".*"/>
<suppress checks="JavadocMethod" files=".*"/>
<suppress checks="AbbreviationAsWordInName" files=".*"/>
</suppressions>
318 changes: 174 additions & 144 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,155 +1,185 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>uk.gov.dwp.crypto</groupId>
<artifactId>secure-strings</artifactId>
<version>1.5.2</version>
<groupId>uk.gov.dwp.crypto</groupId>
<artifactId>secure-strings</artifactId>
<version>1.5.3</version>

<name>${project.groupId}:${project.artifactId}</name>
<description>Utility for storing passwords in memory encrypted form to prevent heap inspection</description>
<url>https://github.com/dwp/secure-strings</url>
<name>${project.groupId}:${project.artifactId}</name>
<description>Utility for storing passwords in memory encrypted form to prevent heap inspection
</description>
<url>https://github.com/dwp/secure-strings</url>

<licenses>
<license>
<name>MIT License</name>
<distribution>repo</distribution>
<url>http://www.opensource.org/licenses/mit-license.php</url>
</license>
</licenses>
<licenses>
<license>
<name>MIT License</name>
<distribution>repo</distribution>
<url>http://www.opensource.org/licenses/mit-license.php</url>
</license>
</licenses>

<developers>
<developer>
<name>Andrew Valentine</name>
<organization>DWP</organization>
<email>andrew.valentine@dwp.gsi.gov.uk</email>
<organizationUrl>http://www.gov.uk/dwp</organizationUrl>
</developer>
<developer>
<name>Chris Hulley</name>
<organization>DWP</organization>
<email>chris.hulley@dwp.gsi.gov.uk</email>
<organizationUrl>http://www.gov.uk/dwp</organizationUrl>
</developer>
</developers>
<developers>
<developer>
<name>Andrew Valentine</name>
<organization>DWP</organization>
<email>andrew.valentine@dwp.gov.uk</email>
<organizationUrl>http://www.gov.uk/dwp</organizationUrl>
</developer>
<developer>
<name>Chris Hulley</name>
<organization>DWP</organization>
<email>chris.hulley@dwp.gov.uk</email>
<organizationUrl>http://www.gov.uk/dwp</organizationUrl>
</developer>
</developers>

<scm>
<connection>scm:git:git://github.com/dwp/secure-strings.git</connection>
<developerConnection>scm:git:ssh://github.com:dwp/secure-strings.git</developerConnection>
<url>https://github.com/dwp/secure-strings</url>
</scm>
<scm>
<connection>scm:git:git://github.com/dwp/secure-strings.git</connection>
<developerConnection>scm:git:ssh://github.com:dwp/secure-strings.git</developerConnection>
<url>https://github.com/dwp/secure-strings</url>
</scm>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jackson-data.version>2.10.0</jackson-data.version>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<mvn-javadoc.version>2.10.4</mvn-javadoc.version>
<mvn-source.version>3.0.1</mvn-source.version>
<mvn-gpg.version>1.6</mvn-gpg.version>
<slf4j.version>1.7.25</slf4j.version>
<owasp.version>4.0.2</owasp.version>
<junit.version>4.12</junit.version>
<java.version>1.8</java.version>
</properties>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.version>3.8.1</maven.compiler.version>
<jackson-data.version>2.10.0</jackson-data.version>
<mvn-javadoc.version>3.2.0</mvn-javadoc.version>
<mvn-source.version>3.0.1</mvn-source.version>
<mvn-gpg.version>1.6</mvn-gpg.version>
<jacoco.version>0.8.5</jacoco.version>
<slf4j.version>1.7.25</slf4j.version>
<owasp.version>5.3.0</owasp.version>
<junit.version>4.12</junit.version>
<java.version>11</java.version>
</properties>

<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson-data.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson-data.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<resources>
<resource>
<directory>.</directory>
<targetPath>META-INF</targetPath>
<includes>
<include>LICENSE</include>
<include>README.md</include>
<include>CONTRIBUTING.md</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
<version>${owasp.version}</version>
<configuration>
<cveValidForHours>12</cveValidForHours>
<failBuildOnCVSS>4</failBuildOnCVSS>
<suppressionFile>src/test/resources/DependencySuppression.xml</suppressionFile>
</configuration>
<executions>
<execution>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${mvn-javadoc.version}</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>${mvn-source.version}</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>${mvn-gpg.version}</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<build>
<resources>
<resource>
<directory>.</directory>
<targetPath>META-INF</targetPath>
<includes>
<include>LICENSE</include>
<include>README.md</include>
<include>CONTRIBUTING.md</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
<version>${owasp.version}</version>
<configuration>
<cveValidForHours>12</cveValidForHours>
<failBuildOnCVSS>4</failBuildOnCVSS>
<suppressionFile>src/test/resources/DependencySuppression.xml</suppressionFile>
</configuration>
<executions>
<execution>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>${jacoco.version}</version>
<executions>
<execution>
<id>jacoco-initialize</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>jacoco-complete</id>
<phase>verify</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${mvn-javadoc.version}</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>${mvn-source.version}</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>${mvn-gpg.version}</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven.compiler.version}</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
</plugins>
</build>
</project>
Loading

0 comments on commit a87e676

Please sign in to comment.