Set test skip enabled, remove surefire

Red5 · Dec 4, 2023 · 303d348 · 303d348
1 parent 919e985
commit 303d348
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 50 deletions.
diff --git a/client/pom.xml b/client/pom.xml
@@ -13,17 +13,6 @@
     <build>
         <defaultGoal>install</defaultGoal>
         <plugins>
-            <plugin>
-                <artifactId>maven-enforcer-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-            </plugin>
-            <!--
-            <plugin>
-                <artifactId>maven-toolchains-plugin</artifactId>
-            </plugin>
-            -->
             <plugin>
                 <groupId>net.revelc.code.formatter</groupId>
                 <artifactId>formatter-maven-plugin</artifactId>

diff --git a/common/pom.xml b/common/pom.xml
@@ -21,12 +21,6 @@
     <build>
         <defaultGoal>install</defaultGoal>
         <plugins>
-            <plugin>
-                <artifactId>maven-enforcer-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <artifactId>maven-toolchains-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>net.revelc.code.formatter</groupId>
                 <artifactId>formatter-maven-plugin</artifactId>

diff --git a/common/src/main/java/org/red5/server/service/ReflectionUtils.java b/common/src/main/java/org/red5/server/service/ReflectionUtils.java
@@ -130,7 +130,7 @@ public static Object[] findMethod(IConnection conn, IServiceCall call, Object se
      *            Arguments
      * @return Method/params pairs
      */
-    public static Object[] findMethodWithExactParameters(Object service, String methodName, Object[] args) {
+    private static Object[] findMethodWithExactParameters(Object service, String methodName, Object[] args) {
         int numParams = (args == null) ? 0 : args.length;
         if (isTrace) {
             log.trace("Args / parameters count: {}", numParams);
@@ -192,7 +192,7 @@ public static Object[] findMethodWithExactParameters(Object service, String meth
      *            Arguments
      * @return Method/params pairs
      */
-    public static Object[] findMethodWithListParameters(Object service, String methodName, List<?> args) {
+    private static Object[] findMethodWithListParameters(Object service, String methodName, List<?> args) {
         return findMethodWithListParameters(service, methodName, args.toArray());
     }
 
@@ -207,7 +207,7 @@ public static Object[] findMethodWithListParameters(Object service, String metho
      *            Arguments
      * @return Method/params pairs
      */
-    public static Object[] findMethodWithListParameters(Object service, String methodName, Object[] args) {
+    private static Object[] findMethodWithListParameters(Object service, String methodName, Object[] args) {
         Method method = null;
         try {
             // convert the args first
@@ -253,7 +253,7 @@ public static Object[] findMethodWithListParameters(Object service, String metho
      *            Number of parameters
      * @return List of methods that match by name and number of parameters
      */
-    public static List<Method> findMethodsByNameAndNumParams(Object object, String method, int numParam) {
+    private static List<Method> findMethodsByNameAndNumParams(Object object, String method, int numParam) {
         LinkedList<Method> list = new LinkedList<>();
         Method[] methods = object.getClass().getMethods();
         for (Method m : methods) {

diff --git a/io/pom.xml b/io/pom.xml
@@ -13,12 +13,6 @@
     <build>
         <defaultGoal>install</defaultGoal>
         <plugins>
-            <plugin>
-                <artifactId>maven-enforcer-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <artifactId>maven-toolchains-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>net.revelc.code.formatter</groupId>
                 <artifactId>formatter-maven-plugin</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -86,7 +86,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- to run unit tests use -Dmaven.test.skip=false -->
-        <!-- <maven.test.skip>true</maven.test.skip> -->
+        <maven.test.skip>true</maven.test.skip>
         <maven.compiler.source>1.11</maven.compiler.source>
         <maven.compiler.target>1.11</maven.compiler.target>
         <java.release.level>11</java.release.level>
@@ -319,18 +319,6 @@
                         </execution>
                     </executions>
                 </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.0.0-M3</version>
-                    <configuration>
-                      <skipTests>${skipTests}</skipTests>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-project-info-reports-plugin</artifactId>
-                    <version>3.0.0</version>
-                </plugin>
                 <plugin>
                     <artifactId>maven-scm-plugin</artifactId>
                     <version>1.11.2</version>

diff --git a/red5-server.code-workspace b/red5-server.code-workspace
@@ -5,7 +5,7 @@
 		}
 	],
 	"settings": {
-		"java.configuration.updateBuildConfiguration": "interactive",
+		"java.configuration.updateBuildConfiguration": "automatic",
 		"java.compile.nullAnalysis.mode": "automatic",
 		"java.project.sourcePaths": [
 			"io",

diff --git a/server/src/test/java/org/red5/server/service/ReflectionUtilsTest.java b/server/src/test/java/org/red5/server/service/ReflectionUtilsTest.java
@@ -54,19 +54,18 @@ public void testReflectionUtils() {
         }
         assertNotEquals(NULL_RETURN, result);
 
-
     }
 
     private class DummyConnection extends RTMPMinaConnection {
-            
+
     }
 
     public class TestService {
 
         public void doTest(String param) {
             log.info("doTest: {}", param);
         }
-        
+
         public void doTestWithConn(IConnection conn, String param0, Integer param1) {
             log.info("doTestWithConn: {} {} {}", conn, param0, param1);
         }

diff --git a/service/pom.xml b/service/pom.xml
@@ -16,12 +16,6 @@
     <build>
         <defaultGoal>install</defaultGoal>
         <plugins>
-            <plugin>
-                <artifactId>maven-enforcer-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <artifactId>maven-toolchains-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>net.revelc.code.formatter</groupId>
                 <artifactId>formatter-maven-plugin</artifactId>