jrivard@gmail.com před 6 roky
rodič
revize
f18b9b90fa

+ 3 - 3
docker/pom.xml

@@ -61,15 +61,15 @@
                                 </volumes>
                             </container>
                             <extraDirectory>
-                                <path>${project.basedir}/src/main/image-files</path> <!-- Copies files from 'src/main/custom-extra-dir' -->
+                                <path>${project.basedir}/src/main/image-files</path>
                                 <permissions>
                                     <permission>
                                         <file>/app/startup.sh</file>
-                                        <mode>755</mode> <!-- Read/write for owner, read-only for group/other -->
+                                        <mode>755</mode>
                                     </permission>
                                     <permission>
                                         <file>/app/command.sh</file>
-                                        <mode>755</mode> <!-- Read/write for owner, read-only for group/other -->
+                                        <mode>755</mode>
                                     </permission>
                                 </permissions>
                             </extraDirectory>

+ 5 - 22
pom.xml

@@ -64,12 +64,6 @@
                 <skipSpotbugs>true</skipSpotbugs>
             </properties>
         </profile>
-        <profile>
-            <id>skip-tests</id>
-            <properties>
-                <skipTests>true</skipTests>
-            </properties>
-        </profile>
         <profile>
             <id>skip-javadoc</id>
             <properties>
@@ -80,17 +74,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.0</version>
-                <configuration>
-                    <skipTests>${skipTests}</skipTests>
-                    <excludes>
-                        <exclude>**/password.pwm.manual.*</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
@@ -188,7 +171,7 @@
                     <dependency>
                         <groupId>com.puppycrawl.tools</groupId>
                         <artifactId>checkstyle</artifactId>
-                        <version>8.15</version>
+                        <version>8.16</version>
                     </dependency>
                 </dependencies>
                 <executions>
@@ -235,12 +218,12 @@
             <plugin>
                 <groupId>com.github.spotbugs</groupId>
                 <artifactId>spotbugs-maven-plugin</artifactId>
-                <version>3.1.8</version>
+                <version>3.1.10</version>
                 <dependencies>
                     <dependency>
                         <groupId>com.github.spotbugs</groupId>
                         <artifactId>spotbugs</artifactId>
-                        <version>3.1.9</version>
+                        <version>3.1.10</version>
                     </dependency>
                 </dependencies>
                 <configuration>
@@ -266,7 +249,7 @@
             <plugin> <!-- checks owsp vulnerability database -->
                 <groupId>org.owasp</groupId>
                 <artifactId>dependency-check-maven</artifactId>
-                <version>4.0.0</version>
+                <version>4.0.1</version>
                 <reportSets>
                     <reportSet>
                         <reports>
@@ -289,7 +272,7 @@
         <dependency>
             <groupId>com.github.spotbugs</groupId>
             <artifactId>spotbugs-annotations</artifactId>
-            <version>3.1.9</version>
+            <version>3.1.10</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

+ 1 - 1
rest-test-service/pom.xml

@@ -75,7 +75,7 @@
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
             <artifactId>wiremock</artifactId>
-            <version>2.19.0</version>
+            <version>2.20.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>

+ 21 - 1
server/pom.xml

@@ -19,8 +19,28 @@
         <skipTests>false</skipTests>
     </properties>
 
+    <profiles>
+        <profile>
+            <id>skip-tests</id>
+            <properties>
+                <skipTests>true</skipTests>
+            </properties>
+        </profile>
+    </profiles>
+
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.22.0</version>
+                <configuration>
+                    <skipTests>${skipTests}</skipTests>
+                    <excludes>
+                        <exclude>**/password.pwm.manual.*</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
                 <version>3.1.0</version>
@@ -119,7 +139,7 @@
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
             <artifactId>wiremock</artifactId>
-            <version>2.19.0</version>
+            <version>2.20.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>

+ 3 - 3
server/src/main/java/password/pwm/PwmAboutProperty.java

@@ -89,9 +89,9 @@ public enum PwmAboutProperty
     java_vmLocation( "Java VM Location", pwmApplication -> System.getProperty( "java.home" ) ),
     java_vmVersion( "Java VM Version", pwmApplication -> System.getProperty( "java.vm.version" ) ),
     java_vmCommandLine( "Java VM Command Line", pwmApplication -> StringUtil.collectionToString( ManagementFactory.getRuntimeMXBean().getInputArguments() ) ),
-    java_osName( "Java OS Name", pwmApplication -> System.getProperty( "os.name" ) ),
-    java_osVersion( "Java OS Version", pwmApplication -> System.getProperty( "os.version" ) ),
-    java_osArch( "Java OS Architecture", pwmApplication -> System.getProperty( "os.arch" ) ),
+    java_osName( "Operating System Name", pwmApplication -> System.getProperty( "os.name" ) ),
+    java_osVersion( "Operating System Version", pwmApplication -> System.getProperty( "os.version" ) ),
+    java_osArch( "Operating System Architecture", pwmApplication -> System.getProperty( "os.arch" ) ),
     java_randomAlgorithm( null, pwmApplication -> pwmApplication.getSecureService().pwmRandom().getAlgorithm() ),
     java_defaultCharset( null, pwmApplication -> Charset.defaultCharset().name() ),
     java_appServerInfo( "Java AppServer Info", pwmApplication -> pwmApplication.getPwmEnvironment().getContextManager().getServerInfo() ),