Skip to content

Commit

Permalink
dependency updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@jrivard
jrivard committed Aug 14, 2021
1 parent 7c929ac commit 4355ed1
Show file tree
Hide file tree
Showing 21 changed files with 129 additions and 127 deletions.
11 changes: 6 additions & 5 deletions build/checkstyle.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@
<property name="fileExtensions" value="jsp,java"/>
</module>

<module name="LineLength">
<property name="max" value="180" />
<property name="ignorePattern" value="@version|@see|@todo|TODO"/>
<property name="fileExtensions" value="java"/>
</module>

<!-- Checks for Headers -->
<!-- See http://checkstyle.sf.net/config_header.html -->
<!--
Expand Down Expand Up @@ -80,11 +86,6 @@
<property name="allowNonPrintableEscapes" value="true"/>
</module>

<module name="LineLength">
<property name="max" value="180" />
<property name="ignorePattern" value="@version|@see|@todo|TODO"/>
</module>

<module name="EmptyBlock">
<property name="option" value="TEXT"/>
<property name="tokens" value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
Expand Down
3 changes: 3 additions & 0 deletions build/spotbugs-exclude.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,7 @@
<!-- due to bug with java 11 -->
<Bug pattern="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE"/>
</Match>
<Match>
<Bug pattern="DMI_RANDOM_USED_ONLY_ONCE"/>
</Match>
</FindBugsFilter>
36 changes: 19 additions & 17 deletions client/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,47 +8,48 @@
"npm": ">=3.9"
},
"scripts": {
"build": "webpack --mode=production",
"build": "webpack --mode=development",
"clean": "rimraf dist/",
"test": "karma start test/karma.conf.js",
"test-single-run": "karma start test/karma.conf.js --singleRun --no-auto-watch",
"start": "webpack-dev-server --mode=development --port 4000 --history-api-fallback --colors"
"start": "webpack-dev-server --mode=development --port 4000 --history-api-fallback --colors --progress"
},
"author": "",
"license": "ISC",
"dependencies": {
"@microfocus/ias-icons": "1.0.1",
"@microfocus/ng-ias": "1.0.0-alpha.2",
"@microfocus/ux-ias": "1.0.0-rc",
"@microfocus/ias-icons": "1.0.4",
"@microfocus/ng-ias": "1.0.1",
"@microfocus/ux-ias": "1.1.2",
"@uirouter/angularjs": "1.0.15",
"angular": "1.6.9",
"angular-aria": "1.6.9",
"angular-sanitize": "1.6.9",
"angular-translate": "2.17.0",
"angular": "^1.7.9",
"angular-aria": "1.7.8",
"angular-sanitize": "1.7.9",
"angular-translate": "2.18.1",
"core-js": "3.5.0",
"textangular": "1.5.16"
},
"devDependencies": {
"@types/angular": "1.6.43",
"@types/angular": "^1.8.1",
"@types/angular-mocks": "1.5.11",
"@types/angular-translate": "2.15.2",
"@types/angular-ui-router": "1.1.40",
"@types/jasmine": "2.8.9",
"@types/node": "9.4.7",
"angular-mocks": "1.6.9",
"autoprefixer": "8.1.0",
"copy-webpack-plugin": "4.5.1",
"css-loader": "0.28.10",
"copy-webpack-plugin": "^5.1.1",
"css-loader": "^3.3.2",
"file-loader": "1.1.11",
"html-loader": "0.5.5",
"html-webpack-plugin": "3.0.6",
"ignore-loader": "0.1.2",
"imports-loader": "0.8.0",
"jasmine": "3.2.0",
"jasmine-core": "3.2.1",
"jshint": "2.9.5",
"jshint": "^2.13.0",
"jshint-loader": "0.8.4",
"json-loader": "0.5.7",
"karma": "3.1.1",
"karma": "^4.4.1",
"karma-chrome-launcher": "2.2.0",
"karma-jasmine": "1.1.2",
"karma-jasmine-html-reporter": "1.3.1",
Expand All @@ -58,7 +59,7 @@
"karma-webpack": "3.0.5",
"moment": "2.21.0",
"ngtemplate-loader": "2.0.1",
"node-sass": "4.7.2",
"node-sass": "^6.0.1",
"phantomjs": "2.1.7",
"phantomjs-prebuilt": "2.1.16",
"postcss-loader": "2.1.1",
Expand All @@ -67,15 +68,16 @@
"sass-loader": "6.0.7",
"string-replace-loader": "2.1.1",
"style-loader": "0.20.3",
"trim-newlines": ">=3.0.1",
"ts-loader": "4.0.1",
"ts-mockito": "2.3.1",
"tslint": "5.9.1",
"tslint-loader": "3.6.0",
"typescript": "2.7.2",
"uglifyjs-webpack-plugin": "1.2.3",
"url-loader": "1.0.1",
"webpack": "4.1.1",
"webpack-cli": "2.0.12",
"webpack": "^4.46.0",
"webpack-cli": "^3.3.10",
"webpack-dev-server": "3.1.14",
"webpack-merge": "4.1.2",
"write-file-webpack-plugin": "4.2.0"
Expand Down
8 changes: 5 additions & 3 deletions client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

<properties>
<project.root.basedir>${project.basedir}/..</project.root.basedir>
<node.version>v14.17.2</node.version>
<npm.version>6.14.13</npm.version>
</properties>

<profiles>
Expand Down Expand Up @@ -81,8 +83,8 @@
<artifactId>frontend-maven-plugin</artifactId>
<version>1.7.6</version>
<configuration>
<nodeVersion>v8.9.4</nodeVersion>
<npmVersion>5.6.0</npmVersion>
<nodeVersion>${node.version}</nodeVersion>
<npmVersion>${npm.version}</npmVersion>
<installDirectory>.node</installDirectory>
</configuration>
<executions>
Expand Down Expand Up @@ -115,7 +117,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.0</version>
<configuration>
<archive>
<manifestEntries>
Expand Down
2 changes: 1 addition & 1 deletion client/src/modules/helpdesk/main.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import 'angular-sanitize';
import '@microfocus/ng-ias/dist/ng-ias';

// Add a polyfill for Set() for IE11, since it's used in peoplesearch-base.component.ts
import 'core-js/es6/set';
import 'core-js/es/set';

import { bootstrap, module } from 'angular';
import helpDeskModule from './helpdesk.module';
Expand Down
2 changes: 1 addition & 1 deletion client/src/modules/peoplesearch/main.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import 'angular-translate';
import '@microfocus/ng-ias/dist/ng-ias';

// Add a polyfill for Set() for IE11, since it's used in peoplesearch-base.component.ts
import 'core-js/es6/set';
import 'core-js/es/set';

import { bootstrap, module } from 'angular';
import ConfigService from '../../services/peoplesearch-config.service';
Expand Down
12 changes: 6 additions & 6 deletions data-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,17 +122,17 @@
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>3.6</version>
<version>3.8.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
<version>1.7</version>
<version>1.9.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.9</version>
<version>3.12.0</version>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
Expand All @@ -142,7 +142,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.9</version>
<version>4.5.13</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
Expand All @@ -157,12 +157,12 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.5</version>
<version>2.8.7</version>
</dependency>
<dependency>
<groupId>org.jetbrains.xodus</groupId>
<artifactId>xodus-environment</artifactId>
<version>1.3.0</version>
<version>1.3.232</version>
</dependency>
</dependencies>
</project>
19 changes: 12 additions & 7 deletions docker/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<version>1.2.0</version>
<version>3.1.2</version>
<executions>
<execution>
<id>make-docker-image</id>
Expand All @@ -44,25 +44,30 @@
</goals>
<configuration>
<skip>${skipDocker}</skip>
<jib.console>plain</jib.console>
<from>
<image>adoptopenjdk/openjdk11:jre</image>
</from>
<outputPaths>
<tar>target/pwm-docker-image-${project.version}.tar</tar>
</outputPaths>
<to>
<image>${dockerImageTag}</image>
</to>
<container>
<entrypoint>
<arg>/app/startup.sh</arg>
</entrypoint>
<format>docker</format>
<ports>8443</ports>
<ports>
<port>8443</port>
</ports>
<volumes>
<volume>/config</volume>
</volumes>
</container>
<extraDirectory>
<path>${project.basedir}/src/main/image-files</path>
<extraDirectories>
<paths>
<path>${project.basedir}/src/main/image-files</path>
</paths>
<permissions>
<permission>
<file>/app/startup.sh</file>
Expand All @@ -73,7 +78,7 @@
<mode>755</mode>
</permission>
</permissions>
</extraDirectory>
</extraDirectories>
</configuration>
</execution>
</executions>
Expand Down
4 changes: 2 additions & 2 deletions onejar/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<properties>
<project.root.basedir>${project.basedir}/..</project.root.basedir>
<tomcat.version>9.0.22</tomcat.version>
<tomcat.version>9.0.52</tomcat.version>
</properties>

<build>
Expand All @@ -26,7 +26,7 @@
<!-- prevent normal jar from being built -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.0</version>
<executions>
<execution>
<id>default-jar</id>
Expand Down
Loading

0 comments on commit 4355ed1

Please sign in to comment.