From 3a454b88ac6a193f7799bd1fb4b71c276ed9d9fd Mon Sep 17 00:00:00 2001 From: you <12347322+Y_OU@user.noreply.gitee.com> Date: Sun, 14 Apr 2024 16:58:29 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0Maven=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E7=9A=84=E9=A1=B9=E7=9B=AE=E4=BB=A3=E7=A0=81=E3=80=81=E6=96=87?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.gitignore | 8 +++ .idea/codeStyles/codeStyleConfig.xml | 5 ++ .idea/compiler.xml | 16 +++++ .idea/encodings.xml | 7 ++ .idea/jarRepositories.xml | 20 ++++++ .idea/libraries/Maven__junit_junit_4_11.xml | 13 ++++ .../Maven__org_hamcrest_hamcrest_core_1_3.xml | 13 ++++ .idea/misc.xml | 13 ++++ .idea/modules.xml | 8 +++ .idea/vcs.xml | 6 ++ .idea/work2.iml | 17 +++++ pom.xml | 24 +++++++ src/main/java/HelloWorld.java | 15 ++++ src/test/java/TestHello.java | 11 +++ target/maven-archiver/pom.properties | 5 ++ .../compile/default-compile/createdFiles.lst | 1 + .../compile/default-compile/inputFiles.lst | 1 + .../default-testCompile/createdFiles.lst | 1 + .../default-testCompile/inputFiles.lst | 1 + target/surefire-reports/TEST-TestHello.xml | 69 +++++++++++++++++++ target/surefire-reports/TestHello.txt | 4 ++ 21 files changed, 258 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/codeStyles/codeStyleConfig.xml create mode 100644 .idea/compiler.xml create mode 100644 .idea/encodings.xml create mode 100644 .idea/jarRepositories.xml create mode 100644 .idea/libraries/Maven__junit_junit_4_11.xml create mode 100644 .idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 .idea/work2.iml create mode 100644 pom.xml create mode 100644 src/main/java/HelloWorld.java create mode 100644 src/test/java/TestHello.java create mode 100644 target/maven-archiver/pom.properties create mode 100644 target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst create mode 100644 target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst create mode 100644 target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst create mode 100644 target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst create mode 100644 target/surefire-reports/TEST-TestHello.xml create mode 100644 target/surefire-reports/TestHello.txt diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..5d26a3c --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Datasource local storage ignored files +/../../../../../:\postgraduate\sd\work2\.idea/dataSources/ +/dataSources.local.xml +# Editor-based HTTP Client requests +/httpRequests/ diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..a55e7a1 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..a78a236 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..aa00ffa --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..b074d70 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_11.xml b/.idea/libraries/Maven__junit_junit_4_11.xml new file mode 100644 index 0000000..40a9cab --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml new file mode 100644 index 0000000..112797e --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..e8942bd --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..d7cac32 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/work2.iml b/.idea/work2.iml new file mode 100644 index 0000000..f8ba30f --- /dev/null +++ b/.idea/work2.iml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..b03932e --- /dev/null +++ b/pom.xml @@ -0,0 +1,24 @@ + + + 4.0.0 + + + UTF-8 + + + org.example + work2 + 1.0-SNAPSHOT + + + + + junit + junit + 4.11 + test + + + diff --git a/src/main/java/HelloWorld.java b/src/main/java/HelloWorld.java new file mode 100644 index 0000000..64fbf00 --- /dev/null +++ b/src/main/java/HelloWorld.java @@ -0,0 +1,15 @@ +/** + * 这是一个示例类，用于生成Javadoc文档。 + */ + +public class HelloWorld { + /** + * 这是一个示例方法，用于生成Javadoc文档。 + * @author yxp + * @param name 姓名 + * @return 欢迎消息 + */ + public String sayHello(String name) { + return "Hello, " + name + "!"; + } +} diff --git a/src/test/java/TestHello.java b/src/test/java/TestHello.java new file mode 100644 index 0000000..d7bf663 --- /dev/null +++ b/src/test/java/TestHello.java @@ -0,0 +1,11 @@ +import org.junit.Test; + +public class TestHello { + + @Test + public void testHelloWorld() { + HelloWorld hw = new HelloWorld(); + System.out.println(hw.sayHello("yxp")); + } + +} diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties new file mode 100644 index 0000000..dc48562 --- /dev/null +++ b/target/maven-archiver/pom.properties @@ -0,0 +1,5 @@ +#Generated by Maven +#Sun Apr 14 16:44:49 CST 2024 +version=1.0-SNAPSHOT +groupId=org.example +artifactId=work2 diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 0000000..3d826fb --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1 @@ +HelloWorld.class diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 0000000..a49f23d --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1 @@ +E:\postgraduate\sd\work2\src\main\java\HelloWorld.java diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst new file mode 100644 index 0000000..488b00a --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst @@ -0,0 +1 @@ +TestHello.class diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst new file mode 100644 index 0000000..ae375b0 --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst @@ -0,0 +1 @@ +E:\postgraduate\sd\work2\src\test\java\TestHello.java diff --git a/target/surefire-reports/TEST-TestHello.xml b/target/surefire-reports/TEST-TestHello.xml new file mode 100644 index 0000000..f8431c3 --- /dev/null +++ b/target/surefire-reports/TEST-TestHello.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/target/surefire-reports/TestHello.txt b/target/surefire-reports/TestHello.txt new file mode 100644 index 0000000..ca8078b --- /dev/null +++ b/target/surefire-reports/TestHello.txt @@ -0,0 +1,4 @@ +------------------------------------------------------------------------------- +Test set: TestHello +------------------------------------------------------------------------------- +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.05 sec -- Gitee From 09484107ece88eac3bff55c9393c4c30bba45767 Mon Sep 17 00:00:00 2001 From: you <12347322+Y_OU@user.noreply.gitee.com> Date: Sun, 14 Apr 2024 17:12:16 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/HelloWorld.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/HelloWorld.java b/src/main/java/HelloWorld.java index 64fbf00..28cba2b 100644 --- a/src/main/java/HelloWorld.java +++ b/src/main/java/HelloWorld.java @@ -12,4 +12,8 @@ public class HelloWorld { public String sayHello(String name) { return "Hello, " + name + "!"; } + + public static void main(String[] args) { + System.out.println("hello world"); + } } -- Gitee From a87645414c1df9e23fd3601936619391f5083aff Mon Sep 17 00:00:00 2001 From: you <12347322+Y_OU@user.noreply.gitee.com> Date: Sun, 14 Apr 2024 17:15:39 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E5=BF=85?= =?UTF-8?q?=E8=A6=81=E7=9A=84=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- target/maven-archiver/pom.properties | 5 -- .../compile/default-compile/createdFiles.lst | 1 - .../compile/default-compile/inputFiles.lst | 1 - .../default-testCompile/createdFiles.lst | 1 - .../default-testCompile/inputFiles.lst | 1 - target/surefire-reports/TEST-TestHello.xml | 69 ------------------- target/surefire-reports/TestHello.txt | 4 -- 7 files changed, 82 deletions(-) delete mode 100644 target/maven-archiver/pom.properties delete mode 100644 target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst delete mode 100644 target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst delete mode 100644 target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst delete mode 100644 target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst delete mode 100644 target/surefire-reports/TEST-TestHello.xml delete mode 100644 target/surefire-reports/TestHello.txt diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties deleted file mode 100644 index dc48562..0000000 --- a/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Sun Apr 14 16:44:49 CST 2024 -version=1.0-SNAPSHOT -groupId=org.example -artifactId=work2 diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index 3d826fb..0000000 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1 +0,0 @@ -HelloWorld.class diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index a49f23d..0000000 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1 +0,0 @@ -E:\postgraduate\sd\work2\src\main\java\HelloWorld.java diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst deleted file mode 100644 index 488b00a..0000000 --- a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst +++ /dev/null @@ -1 +0,0 @@ -TestHello.class diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst deleted file mode 100644 index ae375b0..0000000 --- a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst +++ /dev/null @@ -1 +0,0 @@ -E:\postgraduate\sd\work2\src\test\java\TestHello.java diff --git a/target/surefire-reports/TEST-TestHello.xml b/target/surefire-reports/TEST-TestHello.xml deleted file mode 100644 index f8431c3..0000000 --- a/target/surefire-reports/TEST-TestHello.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/target/surefire-reports/TestHello.txt b/target/surefire-reports/TestHello.txt deleted file mode 100644 index ca8078b..0000000 --- a/target/surefire-reports/TestHello.txt +++ /dev/null @@ -1,4 +0,0 @@ -------------------------------------------------------------------------------- -Test set: TestHello -------------------------------------------------------------------------------- -Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.05 sec -- Gitee From 6100c677ccd3fdeac667e48a2bb70f57c917c0ff Mon Sep 17 00:00:00 2001 From: you <12347322+Y_OU@user.noreply.gitee.com> Date: Sun, 14 Apr 2024 19:17:15 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E5=B0=9D=E8=AF=95cherry-pick=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/HelloWorld.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/HelloWorld.java b/src/main/java/HelloWorld.java index 28cba2b..619ab9d 100644 --- a/src/main/java/HelloWorld.java +++ b/src/main/java/HelloWorld.java @@ -14,6 +14,9 @@ public class HelloWorld { } public static void main(String[] args) { + System.out.println("test new branch"); + System.out.println("test merge"); + System.out.println("test cherry-pick"); System.out.println("hello world"); } } -- Gitee From 1d15c1894ec9ff772077eedab0412e76faaf04eb Mon Sep 17 00:00:00 2001 From: you <12347322+Y_OU@user.noreply.gitee.com> Date: Sun, 14 Apr 2024 19:58:14 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E5=B0=9D=E8=AF=95merge=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/HelloWorld.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/HelloWorld.java b/src/main/java/HelloWorld.java index 619ab9d..fe37bd5 100644 --- a/src/main/java/HelloWorld.java +++ b/src/main/java/HelloWorld.java @@ -15,8 +15,8 @@ public class HelloWorld { public static void main(String[] args) { System.out.println("test new branch"); - System.out.println("test merge"); System.out.println("test cherry-pick"); System.out.println("hello world"); + System.out.println("尝试merge"); } } -- Gitee From dc5707ce0944b4237037ca554daab139eb772ca0 Mon Sep 17 00:00:00 2001 From: you <12347322+Y_OU@user.noreply.gitee.com> Date: Sun, 14 Apr 2024 20:20:52 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E5=B0=9D=E8=AF=95rebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/HelloWorld.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/HelloWorld.java b/src/main/java/HelloWorld.java index fe37bd5..54162f6 100644 --- a/src/main/java/HelloWorld.java +++ b/src/main/java/HelloWorld.java @@ -18,5 +18,6 @@ public class HelloWorld { System.out.println("test cherry-pick"); System.out.println("hello world"); System.out.println("尝试merge"); + System.out.println("test rebase"); } } -- Gitee From 7f2e29c2e25ff6966048a270651bdd85dd29ff17 Mon Sep 17 00:00:00 2001 From: you <12347322+Y_OU@user.noreply.gitee.com> Date: Sun, 14 Apr 2024 20:27:27 +0800 Subject: [PATCH 7/9] rebase test 2 --- src/main/java/HelloWorld.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/HelloWorld.java b/src/main/java/HelloWorld.java index 54162f6..ef9f69f 100644 --- a/src/main/java/HelloWorld.java +++ b/src/main/java/HelloWorld.java @@ -19,5 +19,6 @@ public class HelloWorld { System.out.println("hello world"); System.out.println("尝试merge"); System.out.println("test rebase"); + System.out.println("rebase 2"); } } -- Gitee From 2c5f847aa157eb3e12fc72f4d6eb4eb1921891a5 Mon Sep 17 00:00:00 2001 From: you <12347322+Y_OU@user.noreply.gitee.com> Date: Sun, 14 Apr 2024 20:35:53 +0800 Subject: [PATCH 8/9] rebase test --- src/main/java/HelloWorld.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/HelloWorld.java b/src/main/java/HelloWorld.java index ef9f69f..4cf7071 100644 --- a/src/main/java/HelloWorld.java +++ b/src/main/java/HelloWorld.java @@ -19,6 +19,6 @@ public class HelloWorld { System.out.println("hello world"); System.out.println("尝试merge"); System.out.println("test rebase"); - System.out.println("rebase 2"); + System.out.println("rebase"); } } -- Gitee From ff353591033dcbfa648f91c2391ff48426536a27 Mon Sep 17 00:00:00 2001 From: you <12347322+Y_OU@user.noreply.gitee.com> Date: Sun, 14 Apr 2024 20:45:11 +0800 Subject: [PATCH 9/9] rebase test m1 --- src/main/java/HelloWorld.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/HelloWorld.java b/src/main/java/HelloWorld.java index 4cf7071..e6258f9 100644 --- a/src/main/java/HelloWorld.java +++ b/src/main/java/HelloWorld.java @@ -20,5 +20,6 @@ public class HelloWorld { System.out.println("尝试merge"); System.out.println("test rebase"); System.out.println("rebase"); + System.out.println("rebase 1"); } } -- Gitee