diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index dcbfa5f..7d022a8 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -10,14 +10,14 @@ jobs: runs-on: ubuntu-latest steps: - name: Check-out - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '11' distribution: 'temurin' cache: maven - name: Test with Maven - run: mvn -B test + run: mvn -B -ntp test - name: Update dependency graph uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6 \ No newline at end of file diff --git a/maven-project/pom.xml b/maven-project/pom.xml deleted file mode 100644 index 1a57221..0000000 --- a/maven-project/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - 4.0.0 - net.tcc - classloading - 0.0.1-SNAPSHOT - - - log4j - log4j - 1.2.17 - - - test - junit - junit - 4.11 - - - commons-logging - commons-logging - 1.1.1 - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..4a21e5c --- /dev/null +++ b/pom.xml @@ -0,0 +1,33 @@ + + 4.0.0 + net.tcc + classloading + 0.0.1-SNAPSHOT + + + 11 + 11 + UTF-8 + UTF-8 + + + + + log4j + log4j + 1.2.17 + + + test + junit + junit + 4.11 + + + commons-logging + commons-logging + 1.1.1 + + + \ No newline at end of file diff --git a/maven-project/src/main/java/net/tcc/classloading/LevelLoaderByClassForName.java b/src/main/java/net/tcc/classloading/LevelLoaderByClassForName.java similarity index 100% rename from maven-project/src/main/java/net/tcc/classloading/LevelLoaderByClassForName.java rename to src/main/java/net/tcc/classloading/LevelLoaderByClassForName.java diff --git a/maven-project/src/main/java/net/tcc/classloading/LevelLoaderByClassInstance.java b/src/main/java/net/tcc/classloading/LevelLoaderByClassInstance.java similarity index 100% rename from maven-project/src/main/java/net/tcc/classloading/LevelLoaderByClassInstance.java rename to src/main/java/net/tcc/classloading/LevelLoaderByClassInstance.java diff --git a/maven-project/src/main/java/net/tcc/classloading/PriorityLoaderByClassForName.java b/src/main/java/net/tcc/classloading/PriorityLoaderByClassForName.java similarity index 100% rename from maven-project/src/main/java/net/tcc/classloading/PriorityLoaderByClassForName.java rename to src/main/java/net/tcc/classloading/PriorityLoaderByClassForName.java diff --git a/maven-project/src/main/java/net/tcc/classloading/UseCommonsLoggingLogFactory.java b/src/main/java/net/tcc/classloading/UseCommonsLoggingLogFactory.java similarity index 100% rename from maven-project/src/main/java/net/tcc/classloading/UseCommonsLoggingLogFactory.java rename to src/main/java/net/tcc/classloading/UseCommonsLoggingLogFactory.java diff --git a/maven-project/src/main/java/net/tcc/classloading/UseLog4JLogger.java b/src/main/java/net/tcc/classloading/UseLog4JLogger.java similarity index 100% rename from maven-project/src/main/java/net/tcc/classloading/UseLog4JLogger.java rename to src/main/java/net/tcc/classloading/UseLog4JLogger.java diff --git a/maven-project/src/main/java/net/tcc/classloading/simplified/BaseClass.java b/src/main/java/net/tcc/classloading/simplified/BaseClass.java similarity index 100% rename from maven-project/src/main/java/net/tcc/classloading/simplified/BaseClass.java rename to src/main/java/net/tcc/classloading/simplified/BaseClass.java diff --git a/maven-project/src/main/java/net/tcc/classloading/simplified/BaseClassInstantiator.java b/src/main/java/net/tcc/classloading/simplified/BaseClassInstantiator.java similarity index 82% rename from maven-project/src/main/java/net/tcc/classloading/simplified/BaseClassInstantiator.java rename to src/main/java/net/tcc/classloading/simplified/BaseClassInstantiator.java index 24d53a0..fb825e1 100644 --- a/maven-project/src/main/java/net/tcc/classloading/simplified/BaseClassInstantiator.java +++ b/src/main/java/net/tcc/classloading/simplified/BaseClassInstantiator.java @@ -1,8 +1,5 @@ package net.tcc.classloading.simplified; -import java.util.Random; -import java.util.logging.Level; - public class BaseClassInstantiator extends Thread { public BaseClassInstantiator() { diff --git a/maven-project/src/main/java/net/tcc/classloading/simplified/SubClass.java b/src/main/java/net/tcc/classloading/simplified/SubClass.java similarity index 100% rename from maven-project/src/main/java/net/tcc/classloading/simplified/SubClass.java rename to src/main/java/net/tcc/classloading/simplified/SubClass.java diff --git a/maven-project/src/main/java/net/tcc/classloading/simplified/SubClassInstantiator.java b/src/main/java/net/tcc/classloading/simplified/SubClassInstantiator.java similarity index 100% rename from maven-project/src/main/java/net/tcc/classloading/simplified/SubClassInstantiator.java rename to src/main/java/net/tcc/classloading/simplified/SubClassInstantiator.java diff --git a/maven-project/src/test/java/net/tcc/classloading/TestLoadingByClassForName.java b/src/test/java/net/tcc/classloading/TestLoadingByClassForName.java similarity index 100% rename from maven-project/src/test/java/net/tcc/classloading/TestLoadingByClassForName.java rename to src/test/java/net/tcc/classloading/TestLoadingByClassForName.java diff --git a/maven-project/src/test/java/net/tcc/classloading/TestLoadingMixed.java b/src/test/java/net/tcc/classloading/TestLoadingMixed.java similarity index 100% rename from maven-project/src/test/java/net/tcc/classloading/TestLoadingMixed.java rename to src/test/java/net/tcc/classloading/TestLoadingMixed.java diff --git a/maven-project/src/test/java/net/tcc/classloading/TestMixedLoggerInstantiation.java b/src/test/java/net/tcc/classloading/TestMixedLoggerInstantiation.java similarity index 100% rename from maven-project/src/test/java/net/tcc/classloading/TestMixedLoggerInstantiation.java rename to src/test/java/net/tcc/classloading/TestMixedLoggerInstantiation.java diff --git a/maven-project/src/test/java/net/tcc/classloading/simplified/TestClassLoadingDeadlock.java b/src/test/java/net/tcc/classloading/simplified/TestClassLoadingDeadlock.java similarity index 96% rename from maven-project/src/test/java/net/tcc/classloading/simplified/TestClassLoadingDeadlock.java rename to src/test/java/net/tcc/classloading/simplified/TestClassLoadingDeadlock.java index 69bfb2e..d3799e5 100644 --- a/maven-project/src/test/java/net/tcc/classloading/simplified/TestClassLoadingDeadlock.java +++ b/src/test/java/net/tcc/classloading/simplified/TestClassLoadingDeadlock.java @@ -4,7 +4,7 @@ public class TestClassLoadingDeadlock { - @Test + @Test(timeout = 2_048) public void test() { Thread[] threads = new Thread[] { new BaseClassInstantiator(), diff --git a/maven-project/src/test/resources/log4j.xml b/src/test/resources/log4j.xml similarity index 100% rename from maven-project/src/test/resources/log4j.xml rename to src/test/resources/log4j.xml