Merge branch 'pwm-project:master' into master

netiq-ps · May 8, 2023 · a627c89 · a627c89
2 parents 5b66e46 + 4626393
commit a627c89
Show file tree

Hide file tree

Showing 141 changed files with 2,712 additions and 26,969 deletions.
diff --git a/client/angular/package-lock.json b/client/angular/package-lock.json
diff --git a/client/angular/package.json b/client/angular/package.json
@@ -25,8 +25,7 @@
         "angular-aria": "1.8.3",
         "angular-sanitize": "1.8.3",
         "angular-translate": "2.19.0",
-        "core-js": "3.27.2",
-        "textangular": "1.5.16"
+        "core-js": "3.27.2"
     },
     "devDependencies": {
         "@types/angular": "^1.8.3",

diff --git a/client/angular/src/modules/configeditor/configeditor.controller.ts b/client/angular/src/modules/configeditor/configeditor.controller.ts
diff --git a/client/angular/src/modules/configeditor/configeditor.module.ts b/client/angular/src/modules/configeditor/configeditor.module.ts
diff --git a/client/angular/tsconfig.json b/client/angular/tsconfig.json
@@ -9,7 +9,7 @@
         ],
         "module": "commonjs",
         "removeComments": true,
-        "sourceMap": true,
+        "sourceMap": false,
         "target": "es5"
     },
     "files": [

diff --git a/client/angular/webpack.config.js b/client/angular/webpack.config.js
@@ -16,8 +16,7 @@ module.exports = function (env, argv) {
     const commonConfig = {
         devtool: 'source-map',
         entry: {
-            'changepassword.ng': './src/modules/changepassword/changepassword.module',
-            'configeditor.ng': './src/modules/configeditor/configeditor.module'
+            'changepassword.ng': './src/modules/changepassword/changepassword.module'
 
             // (see production and development specific sections below for more entries)
         },
@@ -63,22 +62,14 @@ module.exports = function (env, argv) {
                 {
                     test: /\.(png|jpg|jpeg|gif|svg)$/,
                     loaders: [ 'url-loader?limit=25000' ]
-                },
-                {
-                    test: [
-                        require.resolve("textangular"),
-                        require.resolve("textangular/dist/textAngular-sanitize")
-                    ],
-                    use: "imports-loader?angular"
                 }
             ]
         },
         plugins: [
             new CopyWebpackPlugin([
                 { from: 'node_modules/@microfocus/ux-ias/dist/ux-ias.css', to: 'vendor/ux-ias/' },
                 { from: 'node_modules/@microfocus/ias-icons/dist/ias-icons.css', to: 'vendor/ux-ias/' },
-                { from: 'node_modules/@microfocus/ias-icons/dist/fonts', to: 'vendor/ux-ias/fonts' },
-                { from: 'node_modules/textangular/dist/textAngular.css', to: 'vendor/textangular' }
+                { from: 'node_modules/@microfocus/ias-icons/dist/fonts', to: 'vendor/ux-ias/fonts' }
             ])
         ],
         optimization: {

diff --git a/client/pom.xml b/client/pom.xml
@@ -33,7 +33,7 @@
         <plugins>
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.3.1</version>
                 <executions>
                     <execution>
                         <id>copy-client-files</id>
@@ -131,20 +131,24 @@
                 <version>3.3.0</version>
                 <configuration>
                     <archive>
+                        <manifest>
+                            <addDefaultEntries>false</addDefaultEntries>
+                            <addDefaultImplementationEntries>false</addDefaultImplementationEntries>
+                        </manifest>
                         <manifestEntries>
+                            <Artifact-ID>${project.artifactId}</Artifact-ID>
                             <Implementation-Title>${project.name}</Implementation-Title>
                             <Implementation-Version>${project.version}</Implementation-Version>
                             <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
                             <Implementation-URL>${project.organization.url}</Implementation-URL>
-                            <Implementation-Build>${build.number}</Implementation-Build>
-                            <Implementation-Revision>${build.revision}</Implementation-Revision>
-                            <Implementation-Version-Display>v${project.version} b${build.number} r${build.revision}</Implementation-Version-Display>
+                            <Implementation-Build-Java-Version>${maven.compiler.target}</Implementation-Build-Java-Version>
                             <SCM-Git-Branch>${git.branch}</SCM-Git-Branch>
                             <SCM-Git-Commit-ID>${git.commit.id}</SCM-Git-Commit-ID>
                             <SCM-Git-Commit-ID-Abbrev>${git.commit.id.abbrev}</SCM-Git-Commit-ID-Abbrev>
                             <SCM-Git-Commit-ID-Description>${git.commit.id.describe}</SCM-Git-Commit-ID-Description>
                             <SCM-Git-Commit-Timestamp>${git.commit.time}</SCM-Git-Commit-Timestamp>
                             <SCM-Git-Commit-Dirty>${git.dirty}</SCM-Git-Commit-Dirty>
+                            <SCM-Git-Remote-Origin-URL>${git.remote.origin.url}</SCM-Git-Remote-Origin-URL>
                         </manifestEntries>
                     </archive>
                 </configuration>

diff --git a/data-service/pom.xml b/data-service/pom.xml
@@ -60,42 +60,50 @@
                     <archiveClasses>true</archiveClasses>
                     <packagingExcludes>WEB-INF/classes</packagingExcludes>
                     <archive>
+                        <manifest>
+                            <addDefaultEntries>false</addDefaultEntries>
+                            <addDefaultImplementationEntries>false</addDefaultImplementationEntries>
+                        </manifest>
                         <manifestEntries>
+                            <Artifact-ID>${project.artifactId}</Artifact-ID>
+                            <Implementation-Title>${project.name}</Implementation-Title>
                             <Implementation-Title>${project.name}</Implementation-Title>
                             <Implementation-Version>${project.version}</Implementation-Version>
                             <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
                             <Implementation-URL>${project.organization.url}</Implementation-URL>
-                            <Implementation-Build>${build.number}</Implementation-Build>
-                            <Implementation-Revision>${build.revision}</Implementation-Revision>
-                            <Implementation-Version-Display>v${project.version} b${build.number} r${build.revision}</Implementation-Version-Display>
+                            <Implementation-Build-Java-Version>${maven.compiler.target}</Implementation-Build-Java-Version>
+                            <SCM-Git-Branch>${git.branch}</SCM-Git-Branch>
+                            <SCM-Git-Commit-ID>${git.commit.id}</SCM-Git-Commit-ID>
+                            <SCM-Git-Commit-ID-Abbrev>${git.commit.id.abbrev}</SCM-Git-Commit-ID-Abbrev>
+                            <SCM-Git-Commit-ID-Description>${git.commit.id.describe}</SCM-Git-Commit-ID-Description>
+                            <SCM-Git-Commit-Timestamp>${git.commit.time}</SCM-Git-Commit-Timestamp>
+                            <SCM-Git-Commit-Dirty>${git.dirty}</SCM-Git-Commit-Dirty>
+                            <SCM-Git-Remote-Origin-URL>${git.remote.origin.url}</SCM-Git-Remote-Origin-URL>
                         </manifestEntries>
                     </archive>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>io.leonard.maven.plugins</groupId>
                 <artifactId>jspc-maven-plugin</artifactId>
-                <version>4.1.0</version>
+                <version>4.1.1</version>
                 <executions>
                     <execution>
                         <goals>
                             <goal>compile</goal>
                         </goals>
                         <phase>compile</phase>
                         <configuration>
-                            <compiler>17</compiler>
                             <trimSpaces>true</trimSpaces>
-                            <compilerVersion>${maven.compiler.source}</compilerVersion>
                             <keepSources>false</keepSources>
-                            <threads>20</threads>
                             <mergeFragment>false</mergeFragment>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.3.1</version>
                 <executions>
                     <execution>
                         <id>copy-resources</id>
@@ -221,12 +229,12 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>2.0.6</version>
+            <version>2.0.7</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.4.5</version>
+            <version>1.4.6</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/data-service/src/main/webapp/WEB-INF/jsp/telemetry-viewer.jsp b/data-service/src/main/webapp/WEB-INF/jsp/telemetry-viewer.jsp
@@ -62,6 +62,8 @@
     <br/>
     Servers Shown: <%= summaryBean.getServerCount() %>
     <br/>
+    Published Current Version: <%= app.getSettings().getCurrentVersionInfo().prettyVersionString() %>
+    <br/>
     <h3>Counters</h3>
     <% final Map<String, String> counterStatMap = app.getStatisticCounterBundle().debugStats( request.getLocale() ); %>
     <% for ( final Map.Entry<String, String> entry : counterStatMap.entrySet() ) { %>

diff --git a/docker/pom.xml b/docker/pom.xml
@@ -45,7 +45,7 @@
                         <configuration>
                             <skip>${skipDocker}</skip>
                             <from>
-                                <image>eclipse-temurin:18-jre</image>
+                                <image>eclipse-temurin:20-jre</image>
                             </from>
                             <to>
                                 <image>${dockerImageTag}</image>

diff --git a/ldif/pom.xml b/ldif/pom.xml
@@ -29,21 +29,24 @@
                 <version>3.3.0</version>
                 <configuration>
                     <archive>
+                        <manifest>
+                            <addDefaultEntries>false</addDefaultEntries>
+                            <addDefaultImplementationEntries>false</addDefaultImplementationEntries>
+                        </manifest>
                         <manifestEntries>
-                            <Archive-Type>jar</Archive-Type>
+                            <Artifact-ID>${project.artifactId}</Artifact-ID>
                             <Implementation-Title>${project.name}</Implementation-Title>
                             <Implementation-Version>${project.version}</Implementation-Version>
                             <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
                             <Implementation-URL>${project.organization.url}</Implementation-URL>
-                            <Implementation-Build-Java-Spec-Version>${java.specification.version}</Implementation-Build-Java-Spec-Version>
-                            <Implementation-Revision>${build.revision}</Implementation-Revision>
-                            <Implementation-Version-Display>v${project.version} b${build.number} r${build.revision}</Implementation-Version-Display>
+                            <Implementation-Build-Java-Version>${maven.compiler.target}</Implementation-Build-Java-Version>
                             <SCM-Git-Branch>${git.branch}</SCM-Git-Branch>
                             <SCM-Git-Commit-ID>${git.commit.id}</SCM-Git-Commit-ID>
                             <SCM-Git-Commit-ID-Abbrev>${git.commit.id.abbrev}</SCM-Git-Commit-ID-Abbrev>
                             <SCM-Git-Commit-ID-Description>${git.commit.id.describe}</SCM-Git-Commit-ID-Description>
                             <SCM-Git-Commit-Timestamp>${git.commit.time}</SCM-Git-Commit-Timestamp>
                             <SCM-Git-Commit-Dirty>${git.dirty}</SCM-Git-Commit-Dirty>
+                            <SCM-Git-Remote-Origin-URL>${git.remote.origin.url}</SCM-Git-Remote-Origin-URL>
                         </manifestEntries>
                     </archive>
                 </configuration>

diff --git a/lib-data/pom.xml b/lib-data/pom.xml
@@ -44,22 +44,24 @@
                 <version>3.3.0</version>
                 <configuration>
                     <archive>
+                        <manifest>
+                            <addDefaultEntries>false</addDefaultEntries>
+                            <addDefaultImplementationEntries>false</addDefaultImplementationEntries>
+                        </manifest>
                         <manifestEntries>
-                            <Archive-Type>jar</Archive-Type>
-                            <Implementation-Archive-Name>pwm.server</Implementation-Archive-Name>
+                            <Artifact-ID>${project.artifactId}</Artifact-ID>
                             <Implementation-Title>${project.name}</Implementation-Title>
                             <Implementation-Version>${project.version}</Implementation-Version>
                             <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
                             <Implementation-URL>${project.organization.url}</Implementation-URL>
-                            <Implementation-Build-Java-Spec-Version>${java.specification.version}</Implementation-Build-Java-Spec-Version>
-                            <Implementation-Revision>${build.revision}</Implementation-Revision>
-                            <Implementation-Version-Display>v${project.version} b${build.number} r${build.revision}</Implementation-Version-Display>
+                            <Implementation-Build-Java-Version>${maven.compiler.target}</Implementation-Build-Java-Version>
                             <SCM-Git-Branch>${git.branch}</SCM-Git-Branch>
                             <SCM-Git-Commit-ID>${git.commit.id}</SCM-Git-Commit-ID>
                             <SCM-Git-Commit-ID-Abbrev>${git.commit.id.abbrev}</SCM-Git-Commit-ID-Abbrev>
                             <SCM-Git-Commit-ID-Description>${git.commit.id.describe}</SCM-Git-Commit-ID-Description>
                             <SCM-Git-Commit-Timestamp>${git.commit.time}</SCM-Git-Commit-Timestamp>
                             <SCM-Git-Commit-Dirty>${git.dirty}</SCM-Git-Commit-Dirty>
+                            <SCM-Git-Remote-Origin-URL>${git.remote.origin.url}</SCM-Git-Remote-Origin-URL>
                         </manifestEntries>
                     </archive>
                 </configuration>

diff --git a/lib-util/pom.xml b/lib-util/pom.xml
@@ -44,22 +44,24 @@
                 <version>3.3.0</version>
                 <configuration>
                     <archive>
+                        <manifest>
+                            <addDefaultEntries>false</addDefaultEntries>
+                            <addDefaultImplementationEntries>false</addDefaultImplementationEntries>
+                        </manifest>
                         <manifestEntries>
-                            <Archive-Type>jar</Archive-Type>
-                            <Implementation-Archive-Name>pwm.server</Implementation-Archive-Name>
+                            <Artifact-ID>${project.artifactId}</Artifact-ID>
                             <Implementation-Title>${project.name}</Implementation-Title>
                             <Implementation-Version>${project.version}</Implementation-Version>
                             <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
                             <Implementation-URL>${project.organization.url}</Implementation-URL>
-                            <Implementation-Build-Java-Spec-Version>${java.specification.version}</Implementation-Build-Java-Spec-Version>
-                            <Implementation-Revision>${build.revision}</Implementation-Revision>
-                            <Implementation-Version-Display>v${project.version} b${build.number} r${build.revision}</Implementation-Version-Display>
+                            <Implementation-Build-Java-Version>${maven.compiler.target}</Implementation-Build-Java-Version>
                             <SCM-Git-Branch>${git.branch}</SCM-Git-Branch>
                             <SCM-Git-Commit-ID>${git.commit.id}</SCM-Git-Commit-ID>
                             <SCM-Git-Commit-ID-Abbrev>${git.commit.id.abbrev}</SCM-Git-Commit-ID-Abbrev>
                             <SCM-Git-Commit-ID-Description>${git.commit.id.describe}</SCM-Git-Commit-ID-Description>
                             <SCM-Git-Commit-Timestamp>${git.commit.time}</SCM-Git-Commit-Timestamp>
                             <SCM-Git-Commit-Dirty>${git.dirty}</SCM-Git-Commit-Dirty>
+                            <SCM-Git-Remote-Origin-URL>${git.remote.origin.url}</SCM-Git-Remote-Origin-URL>
                         </manifestEntries>
                     </archive>
                 </configuration>

diff --git a/lib-util/src/main/java/password/pwm/util/java/CollectionUtil.java b/lib-util/src/main/java/password/pwm/util/java/CollectionUtil.java
@@ -64,7 +64,7 @@ public static <V> List<V> stripNulls( final List<V> input )
 
         return input.stream()
                 .filter( Objects::nonNull )
-                .collect( Collectors.toUnmodifiableList() );
+                .toList();
     }
 
     public static <V> Set<V> stripNulls( final Set<V> input )