Fix console color under latest IntellIJ

Remove useless UsernamePasswordTokenTest.java

Author: adrienlauer

CHANGELOG.md

@@ -1,3 +1,7 @@
+# Version 3.11.1 (2021-01-31)
+
+* [fix] Detection of color output under recent versions of IntelliJ.
+
 # Version 3.11.0 (2020-10-28)
 
 * [brk] Config functions that find available ports now take a port name as argument so they can return the same port for each evaluation (example: `$availableTcpPort()` becomes `$availableTcpPort('web')`).

cli/pom.xml

@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.11.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-cli</artifactId>

core/src/main/java/org/seedstack/seed/core/internal/init/ConsoleManager.java

@@ -7,7 +7,6 @@
  */
 package org.seedstack.seed.core.internal.init;
 
-import java.io.PrintStream;
 import org.fusesource.jansi.AnsiConsole;
 import org.fusesource.jansi.AnsiPrintStream;
 import org.fusesource.jansi.FilterPrintStream;
@@ -17,8 +16,14 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.PrintStream;
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
+import java.util.List;
+
 public class ConsoleManager {
     private static final Logger LOGGER = LoggerFactory.getLogger(ConsoleManager.class);
+    private static final String IDEA_RT_JAR = "idea_rt.jar";
     private final PrintStream savedOut = System.out;
     private final PrintStream savedErr = System.err;
 
@@ -41,7 +46,7 @@ public synchronized void uninstall() {
     }
 
     private PrintStream wrapPrintStream(final PrintStream inputStream, FileNo fileno,
-            ApplicationConfig.ColorOutput colorOutput, boolean log) {
+                                        ApplicationConfig.ColorOutput colorOutput, boolean log) {
         try {
             if (colorOutput == ApplicationConfig.ColorOutput.PASSTHROUGH) {
                 if (log) {
@@ -128,13 +133,20 @@ private boolean isXtermColor() {
     }
 
     private boolean isIntelliJ() {
-        if (System.getProperty("java.class.path").contains("idea_rt.jar")) {
+        if (System.getProperty("java.class.path").contains(IDEA_RT_JAR)) {
             return true;
         } else {
             try {
                 Class.forName("com.intellij.rt.execution.application.AppMain");
                 return true;
             } catch (ClassNotFoundException e) {
+                RuntimeMXBean runtimeMXBean = ManagementFactory.getRuntimeMXBean();
+                List<String> jvmArgs = runtimeMXBean.getInputArguments();
+                for (String arg : jvmArgs) {
+                    if (arg.startsWith("-agentpath") || arg.startsWith("-agentlib") || arg.startsWith("-javaagent")) {
+                        return arg.contains(IDEA_RT_JAR);
+                    }
+                }
                 return false;
             }
         }

pom.xml

@@ -19,7 +19,7 @@
 
     <groupId>org.seedstack.seed</groupId>
     <artifactId>seed</artifactId>
-    <version>3.11.0-SNAPSHOT</version>
+    <version>3.11.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>

rest/core/pom.xml

@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-rest</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.11.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-rest-core</artifactId>

rest/jersey2/pom.xml

@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-rest</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.11.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-rest-jersey2</artifactId>

rest/pom.xml

@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.11.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-rest</artifactId>

rest/specs/pom.xml

@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-rest</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.11.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-rest-specs</artifactId>

security/core/pom.xml

@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-security</artifactId>
-        <version>3.11.0-SNAPSHOT</version>
+        <version>3.11.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-security-core</artifactId>

security/core/src/main/java/org/seedstack/seed/security/internal/SeedUsernamePasswordToken.java

@@ -0,0 +1,17 @@
+/*
+ * Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+package org.seedstack.seed.security.internal;
+
+import org.apache.shiro.authc.UsernamePasswordToken;
+import org.seedstack.seed.security.AuthenticationToken;
+
+public class SeedUsernamePasswordToken extends UsernamePasswordToken implements AuthenticationToken {
+    public SeedUsernamePasswordToken(String username, char[] password, boolean rememberMe, String host) {
+        super(username, password, rememberMe, host);
+    }
+}