From 459823d07dfe0b8b8c79f08a05f2ea366b992ebd Mon Sep 17 00:00:00 2001 From: bowensuuu <2258882479@qq.com> Date: Sun, 14 Apr 2024 21:56:53 +0800 Subject: [PATCH 1/7] =?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/compiler.xml | 16 +++++++++++ .idea/jarRepositories.xml | 20 +++++++++++++ .idea/libraries/Maven__junit_junit_4_12.xml | 13 +++++++++ .../Maven__org_hamcrest_hamcrest_core_1_3.xml | 13 +++++++++ .idea/misc.xml | 13 +++++++++ .idea/modules.xml | 8 ++++++ .idea/runConfigurations.xml | 10 +++++++ .idea/vcs.xml | 6 ++++ .idea/web-framework.iml | 17 +++++++++++ pom.xml | 28 +++++++++++++++++++ src/main/java/work1.java | 5 ++++ src/test/java/testWork1.java | 9 ++++++ 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 + 18 files changed, 175 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/compiler.xml create mode 100644 .idea/jarRepositories.xml create mode 100644 .idea/libraries/Maven__junit_junit_4_12.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/runConfigurations.xml create mode 100644 .idea/vcs.xml create mode 100644 .idea/web-framework.iml create mode 100644 pom.xml create mode 100644 src/main/java/work1.java create mode 100644 src/test/java/testWork1.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 diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..774643c --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..712ab9d --- /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_12.xml b/.idea/libraries/Maven__junit_junit_4_12.xml new file mode 100644 index 0000000..d411041 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_12.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..f58bbc1 --- /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..5755a99 --- /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..8e99870 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..797acea --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,10 @@ + + + + + + \ 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/web-framework.iml b/.idea/web-framework.iml new file mode 100644 index 0000000..975d5da --- /dev/null +++ b/.idea/web-framework.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..fdd8dd4 --- /dev/null +++ b/pom.xml @@ -0,0 +1,28 @@ + + + 4.0.0 + + org.example + web-framework + 1.0-SNAPSHOT + + + 8 + 8 + + + + + + + junit + junit + 4.12 + test + + + + + \ No newline at end of file diff --git a/src/main/java/work1.java b/src/main/java/work1.java new file mode 100644 index 0000000..c798f8f --- /dev/null +++ b/src/main/java/work1.java @@ -0,0 +1,5 @@ +public class work1 { + public void name(String n) { + System.out.println(n); + } +} diff --git a/src/test/java/testWork1.java b/src/test/java/testWork1.java new file mode 100644 index 0000000..cf0e524 --- /dev/null +++ b/src/test/java/testWork1.java @@ -0,0 +1,9 @@ +import org.junit.Test; + +public class testWork1 { + @Test + public void testName() { + work1 w1 = new work1(); + w1.name("苏博文"); + } +} diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties new file mode 100644 index 0000000..10345ce --- /dev/null +++ b/target/maven-archiver/pom.properties @@ -0,0 +1,5 @@ +#Generated by Maven +#Sun Apr 14 21:54:22 CST 2024 +version=1.0-SNAPSHOT +groupId=org.example +artifactId=web-framework 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..ad893c4 --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1 @@ +work1.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..1a7a738 --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1 @@ +D:\Java_Project\web-framework\src\main\java\work1.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..90c50c1 --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst @@ -0,0 +1 @@ +testWork1.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..041d373 --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst @@ -0,0 +1 @@ +D:\Java_Project\web-framework\src\test\java\testWork1.java -- Gitee From 8f4dc4a37144e217b2332c1c1d8db4ebeef935de Mon Sep 17 00:00:00 2001 From: bowensuuu <2258882479@qq.com> Date: Sun, 14 Apr 2024 21:59:24 +0800 Subject: [PATCH 2/7] =?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/work1.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/work1.java b/src/main/java/work1.java index c798f8f..8166442 100644 --- a/src/main/java/work1.java +++ b/src/main/java/work1.java @@ -2,4 +2,8 @@ public class work1 { public void name(String n) { System.out.println(n); } + + public static void main(String[] args) { + System.out.println("hello"); + } } -- Gitee From 8dd3ebf10c2517e5acf17052747ffcc32c25dac8 Mon Sep 17 00:00:00 2001 From: bowensuuu <2258882479@qq.com> Date: Sun, 14 Apr 2024 22:00:39 +0800 Subject: [PATCH 3/7] =?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 - .../testCompile/default-testCompile/createdFiles.lst | 1 - .../testCompile/default-testCompile/inputFiles.lst | 1 - 5 files changed, 9 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 diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties deleted file mode 100644 index 10345ce..0000000 --- a/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Sun Apr 14 21:54:22 CST 2024 -version=1.0-SNAPSHOT -groupId=org.example -artifactId=web-framework 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 ad893c4..0000000 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1 +0,0 @@ -work1.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 1a7a738..0000000 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1 +0,0 @@ -D:\Java_Project\web-framework\src\main\java\work1.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 90c50c1..0000000 --- a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst +++ /dev/null @@ -1 +0,0 @@ -testWork1.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 041d373..0000000 --- a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst +++ /dev/null @@ -1 +0,0 @@ -D:\Java_Project\web-framework\src\test\java\testWork1.java -- Gitee From f2da189246c668598f07b09464a57e0de9d9779a Mon Sep 17 00:00:00 2001 From: bowensuuu <2258882479@qq.com> Date: Sun, 14 Apr 2024 22:02:58 +0800 Subject: [PATCH 4/7] branch --- src/main/java/work1.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/work1.java b/src/main/java/work1.java index 8166442..5e07098 100644 --- a/src/main/java/work1.java +++ b/src/main/java/work1.java @@ -5,5 +5,6 @@ public class work1 { public static void main(String[] args) { System.out.println("hello"); + System.out.println("branch"); } } -- Gitee From 918311a00795963dc4b7f3cf4655f5f7bf25f26e Mon Sep 17 00:00:00 2001 From: bowensuuu <2258882479@qq.com> Date: Sun, 14 Apr 2024 22:05:33 +0800 Subject: [PATCH 5/7] cherry-pick --- src/main/java/work1.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/work1.java b/src/main/java/work1.java index 5e07098..9cb1b73 100644 --- a/src/main/java/work1.java +++ b/src/main/java/work1.java @@ -6,5 +6,6 @@ public class work1 { public static void main(String[] args) { System.out.println("hello"); System.out.println("branch"); + System.out.println("cherry-pick"); } } -- Gitee From b27fef2fbac9ca33a5fa546ad499c8c3154c1598 Mon Sep 17 00:00:00 2001 From: bowensuuu <2258882479@qq.com> Date: Sun, 14 Apr 2024 22:10:21 +0800 Subject: [PATCH 6/7] merge branch --- src/main/java/work1.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/work1.java b/src/main/java/work1.java index 9cb1b73..408ce7e 100644 --- a/src/main/java/work1.java +++ b/src/main/java/work1.java @@ -7,5 +7,7 @@ public class work1 { System.out.println("hello"); System.out.println("branch"); System.out.println("cherry-pick"); + + System.out.println("merge branch"); } } -- Gitee From 1628a08f71196a2974e8b9b8bf9881da02e78054 Mon Sep 17 00:00:00 2001 From: bowensuuu <2258882479@qq.com> Date: Sun, 14 Apr 2024 22:10:48 +0800 Subject: [PATCH 7/7] merge master --- src/main/java/work1.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/work1.java b/src/main/java/work1.java index 9cb1b73..b485e57 100644 --- a/src/main/java/work1.java +++ b/src/main/java/work1.java @@ -7,5 +7,7 @@ public class work1 { System.out.println("hello"); System.out.println("branch"); System.out.println("cherry-pick"); + + System.out.println("merge master"); } } -- Gitee