diff --git a/.idea/compiler.xml b/.idea/compiler.xml index ebe8da4553..ad4d6736a5 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,14 +1,6 @@ - - - - - - - - diff --git a/.idea/workspace.xml b/.idea/workspace.xml index d5a46f0b49..c60aa19867 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,38 +4,16 @@ - - + - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + + + + + @@ -120,7 +99,7 @@ - + 1618147556538 @@ -150,7 +129,21 @@ - @@ -173,6 +166,8 @@ - \ No newline at end of file diff --git a/parent-java/pom.xml b/parent-java/pom.xml index 4e351d3735..7946e7b3ab 100644 --- a/parent-java/pom.xml +++ b/parent-java/pom.xml @@ -10,8 +10,8 @@ com.ossez - parent-modules - 1.0.0-SNAPSHOT + java-tutorials + 0.0.1 @@ -26,11 +26,20 @@ commons-io ${commons.io.version} + + com.google.code.gson + gson + 2.8.6 + + 23.0 2.6 + + + 3.8.1 diff --git a/pom.xml b/pom.xml index 7487ab15c0..3d27861f03 100644 --- a/pom.xml +++ b/pom.xml @@ -2,12 +2,12 @@ - 4.0.0 com.ossez - lang-tutorial + java-tutorials 0.0.1 + pom @@ -16,10 +16,9 @@ UTF-8 - 1.7.12 + 1.7.30 2.2 - 4.3.5.Final @@ -236,37 +235,7 @@ - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.6 - - - - package - - single - - - src/assembly/zipAssembly.xml - reoc-rets - - - com.ossez.reoc.rets.Main - - - ./ - - - - - - - - diff --git a/spring-amqp/pom.xml b/spring-amqp/pom.xml index 3e6789dcb6..c98e919695 100644 --- a/spring-amqp/pom.xml +++ b/spring-amqp/pom.xml @@ -24,5 +24,4 @@ com.baeldung.springamqp.simple.HelloWorldMessageApp - diff --git a/src/main/java/com/ossez/lang/tutorial/overview/HelloWorld.java b/src/main/java/com/ossez/lang/tutorial/overview/HelloWorld.java index 709a70ac21..471ec43175 100644 --- a/src/main/java/com/ossez/lang/tutorial/overview/HelloWorld.java +++ b/src/main/java/com/ossez/lang/tutorial/overview/HelloWorld.java @@ -2,37 +2,15 @@ package com.ossez.lang.tutorial.overview; /** * Java Tutorial - * -<<<<<<< HEAD + * * This is my first java program. This will print 'Hello World' as the output This is an example of multi-line comments - * -======= -<<<<<<< HEAD -======= - * This is my first java program. This will print 'Hello World' as the output This is an example of multi-line comments - * ->>>>>>> 361e407d91e00158295aadeaca0a91d84a534820 ->>>>>>> RB + * * @author YuCheng * */ public class HelloWorld { public static void main(String[] args) { -<<<<<<< HEAD -======= -<<<<<<< HEAD - System.out.println("Hello World"); - } -} -======= ->>>>>>> RB - // This is an example of single line comment - /* This is also an example of single line comment. */ System.out.println("Hello World"); } } -<<<<<<< HEAD -======= ->>>>>>> 361e407d91e00158295aadeaca0a91d84a534820 ->>>>>>> RB diff --git a/toolkits/.idea/compiler.xml b/toolkits/.idea/compiler.xml index 3c6a21132c..45d2ba3bd2 100644 --- a/toolkits/.idea/compiler.xml +++ b/toolkits/.idea/compiler.xml @@ -10,7 +10,7 @@ - + diff --git a/toolkits/discourse/pom.xml b/toolkits/discourse/pom.xml index cdc23f2d83..029e363b0d 100644 --- a/toolkits/discourse/pom.xml +++ b/toolkits/discourse/pom.xml @@ -27,11 +27,6 @@ 4.5.13 - - com.google.code.gson - gson - 2.8.6 - joda-time joda-time @@ -72,8 +67,6 @@ 1.8.9 1.19 1.19 - - 2.22.1 diff --git a/toolkits/discourse/src/test/java/com/ossez/toolkits/discourse/DiscourseTopicsImportTest.java b/toolkits/discourse/src/test/java/com/ossez/toolkits/discourse/DiscourseTopicsImportTest.java index 281905bf79..a31671b8e1 100644 --- a/toolkits/discourse/src/test/java/com/ossez/toolkits/discourse/DiscourseTopicsImportTest.java +++ b/toolkits/discourse/src/test/java/com/ossez/toolkits/discourse/DiscourseTopicsImportTest.java @@ -112,8 +112,8 @@ public class DiscourseTopicsImportTest { HttpPost httpPost = new HttpPost("https://www.ossez.com/posts.json"); httpPost.setHeader(HttpHeaders.CONTENT_TYPE, "application/json; charset=UTF-8"); - httpPost.setHeader("Api-Key", "8d789c529c4c22bf1dac3de7dbe7b29af10f2429aeb9a1914eff6da70c2265a9"); - httpPost.setHeader("Api-Username", "honeymoose"); + httpPost.setHeader("Api-Key", "XXXX"); + httpPost.setHeader("Api-Username", "XXXX"); TopicRequest topicRequest = new TopicRequest(); topicRequest.setTitle(bbsOssezForumPost.getSubject());