iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adjust the pom to make project can be compile

This commit is contained in:
YuCheng Hu 2021-04-15 12:15:45 -04:00
parent 43c81ad3d4
commit a228fa25f3
No known key found for this signature in database
GPG Key ID: 1E5CBEF8B550FB7D
9 changed files with 47 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.idea/compiler.xml
View File

@ -1,14 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="CompilerConfiguration"> <component name="CompilerConfiguration">
<annotationProcessing>
<profile name="Maven default annotation processors profile" enabled="true">
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
<module name="cwiki-us-demo-tutorials" />
</profile>
</annotationProcessing>
<bytecodeTargetLevel target="1.8"> <bytecodeTargetLevel target="1.8">
<module name="cwiki-us-demo-tutorials" target="1.8" /> <module name="cwiki-us-demo-tutorials" target="1.8" />
<module name="cwiki-us-demo-tutorials.spring-batch" target="11" /> <module name="cwiki-us-demo-tutorials.spring-batch" target="11" />

61
.idea/workspace.xml
View File

@ -4,38 +4,16 @@
<option name="autoReloadType" value="SELECTIVE" /> <option name="autoReloadType" value="SELECTIVE" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="bc4dcfec-3698-4fde-a6cf-dd08b73f1f06" name="Default Changelist" comment="Discourse"> <list default="true" id="bc4dcfec-3698-4fde-a6cf-dd08b73f1f06" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/jarRepositories.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_7.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_7.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_cli_commons_cli_1_2.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_8_15.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_8_15.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_11.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_maven_surefire_surefire_logger_api_2_21_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_all_1_3.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_7_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_7_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_7_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_7_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_core_2_21_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_21.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_21.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle" afterDir="false" /> <change beforePath="$PROJECT_DIR$/parent-java/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/parent-java/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lang-tutorial.iml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/settings.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/settings.gradle" afterDir="false" /> <change beforePath="$PROJECT_DIR$/spring-amqp/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/spring-amqp/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/ossez/lang/tutorial/overview/HelloWorld.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/ossez/lang/tutorial/overview/HelloWorld.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/toolkits/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/toolkits/.idea/compiler.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/toolkits/discourse/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/toolkits/discourse/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/toolkits/discourse/src/test/java/com/ossez/toolkits/discourse/DiscourseTopicsImportTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/toolkits/discourse/src/test/java/com/ossez/toolkits/discourse/DiscourseTopicsImportTest.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -81,10 +59,11 @@
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" /> <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" /> <property name="aspect.path.notification.shown" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/toolkits/discourse" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/spring-batch" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS"> <key name="CopyFile.RECENT_KEYS">
<recent name="C:\WorkDir\GitHub\cwiki-us-docs\java-tutorials\spring-batch" />
<recent name="C:\WorkDir\GitHub\cwiki-us-docs\java-tutorials\toolkits\discourse" /> <recent name="C:\WorkDir\GitHub\cwiki-us-docs\java-tutorials\toolkits\discourse" />
<recent name="C:\WorkDir\GitHub\cwiki-us-docs\java-tutorials\toolkits" /> <recent name="C:\WorkDir\GitHub\cwiki-us-docs\java-tutorials\toolkits" />
<recent name="C:\WorkDir\GitHub\cwiki-us-docs\java-tutorials\toolkits\test\java\com\ossez\edtestbank\service\test" /> <recent name="C:\WorkDir\GitHub\cwiki-us-docs\java-tutorials\toolkits\test\java\com\ossez\edtestbank\service\test" />
@ -120,7 +99,7 @@
<workItem from="1618145805266" duration="1634000" /> <workItem from="1618145805266" duration="1634000" />
<workItem from="1618147512704" duration="6933000" /> <workItem from="1618147512704" duration="6933000" />
<workItem from="1618246818887" duration="17236000" /> <workItem from="1618246818887" duration="17236000" />
<workItem from="1618429441584" duration="2303000" /> <workItem from="1618429441584" duration="5857000" />
</task> </task>
<task id="LOCAL-00001" summary="更新 POM 文件"> <task id="LOCAL-00001" summary="更新 POM 文件">
<created>1618147556538</created> <created>1618147556538</created>
@ -150,7 +129,21 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1618157753954</updated> <updated>1618157753954</updated>
</task> </task>
<option name="localTasksCounter" value="5" /> <task id="LOCAL-00005" summary="添加忽略文件的内容">
<created>1618499169408</created>
<option name="number" value="00005" />
<option name="presentableId" value="LOCAL-00005" />
<option name="project" value="LOCAL" />
<updated>1618499169408</updated>
</task>
<task id="LOCAL-00006" summary="完成所有的文件的提交，以便于下一步的代码演示和开发">
<created>1618499203125</created>
<option name="number" value="00006" />
<option name="presentableId" value="LOCAL-00006" />
<option name="project" value="LOCAL" />
<updated>1618499203125</updated>
</task>
<option name="localTasksCounter" value="7" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
@ -173,6 +166,8 @@
<MESSAGE value="Discourse Topic import" /> <MESSAGE value="Discourse Topic import" />
<MESSAGE value="项目的 POM 配置文件&#10;# Conflicts:&#10;#&#9;pom.xml" /> <MESSAGE value="项目的 POM 配置文件&#10;# Conflicts:&#10;#&#9;pom.xml" />
<MESSAGE value="Discourse" /> <MESSAGE value="Discourse" />
<option name="LAST_COMMIT_MESSAGE" value="Discourse" /> <MESSAGE value="添加忽略文件的内容" />
<MESSAGE value="完成所有的文件的提交，以便于下一步的代码演示和开发" />
<option name="LAST_COMMIT_MESSAGE" value="完成所有的文件的提交，以便于下一步的代码演示和开发" />
</component> </component>
</project> </project>

13
parent-java/pom.xml
View File

@ -10,8 +10,8 @@
<parent> <parent>
<groupId>com.ossez</groupId> <groupId>com.ossez</groupId>
<artifactId>parent-modules</artifactId> <artifactId>java-tutorials</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>0.0.1</version>
</parent> </parent>
<dependencies> <dependencies>
@ -26,11 +26,20 @@
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
<version>${commons.io.version}</version> <version>${commons.io.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.6</version>
</dependency>
</dependencies> </dependencies>
<properties> <properties>
<guava.version>23.0</guava.version> <guava.version>23.0</guava.version>
<commons.io.version>2.6</commons.io.version> <commons.io.version>2.6</commons.io.version>
<!-- plugins -->
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
</properties> </properties>
</project> </project>

37
pom.xml
View File

@ -2,12 +2,12 @@
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.ossez</groupId> <groupId>com.ossez</groupId>
<artifactId>lang-tutorial</artifactId> <artifactId>java-tutorials</artifactId>
<version>0.0.1</version> <version>0.0.1</version>
<packaging>pom</packaging>
<properties> <properties>
<!-- Generic properties --> <!-- Generic properties -->
@ -16,10 +16,9 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<!-- Logging --> <!-- Logging -->
<slf4j.version>1.7.12</slf4j.version> <slf4j.version>1.7.30</slf4j.version>
<log4j2.version>2.2</log4j2.version> <log4j2.version>2.2</log4j2.version>
<!-- Hibernate / JPA --> <!-- Hibernate / JPA -->
<hibernate.version>4.3.5.Final</hibernate.version> <hibernate.version>4.3.5.Final</hibernate.version>
@ -236,37 +235,7 @@
</manifest> </manifest>
</archive> </archive>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.6</version>
<executions>
<execution>
<phase>package</phase> <!-- bind to the packaging phase -->
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptor>src/assembly/zipAssembly.xml</descriptor>
<finalName>reoc-rets</finalName>
<archive>
<manifest>
<mainClass>com.ossez.reoc.rets.Main</mainClass>
</manifest>
<manifestEntries>
<Class-Path>./</Class-Path>
</manifestEntries>
</archive>
</configuration>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>
</project> </project>

1
spring-amqp/pom.xml
View File

@ -24,5 +24,4 @@
<properties> <properties>
<start-class>com.baeldung.springamqp.simple.HelloWorldMessageApp</start-class> <start-class>com.baeldung.springamqp.simple.HelloWorldMessageApp</start-class>
</properties> </properties>
</project> </project>

22
src/main/java/com/ossez/lang/tutorial/overview/HelloWorld.java
View File

@ -3,36 +3,14 @@ package com.ossez.lang.tutorial.overview;
/** /**
* Java Tutorial * 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 * 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 * @author YuCheng
* *
*/ */
public class HelloWorld { public class HelloWorld {
public static void main(String[] args) { 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"); System.out.println("Hello World");
} }
} }
<<<<<<< HEAD
=======
>>>>>>> 361e407d91e00158295aadeaca0a91d84a534820
>>>>>>> RB

2
toolkits/.idea/compiler.xml
View File

@ -10,7 +10,7 @@
</profile> </profile>
</annotationProcessing> </annotationProcessing>
<bytecodeTargetLevel> <bytecodeTargetLevel>
<module name="discourse" target="11.0.10" /> <module name="discourse" target="1.8" />
<module name="toolkits" target="1.8" /> <module name="toolkits" target="1.8" />
</bytecodeTargetLevel> </bytecodeTargetLevel>
</component> </component>

7
toolkits/discourse/pom.xml
View File

@ -27,11 +27,6 @@
<version>4.5.13</version> <version>4.5.13</version>
</dependency> </dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.6</version>
</dependency>
<dependency> <dependency>
<groupId>joda-time</groupId> <groupId>joda-time</groupId>
<artifactId>joda-time</artifactId> <artifactId>joda-time</artifactId>
@ -72,8 +67,6 @@
<asspectj.version>1.8.9</asspectj.version> <asspectj.version>1.8.9</asspectj.version>
<jmh-core.version>1.19</jmh-core.version> <jmh-core.version>1.19</jmh-core.version>
<jmh-generator.version>1.19</jmh-generator.version> <jmh-generator.version>1.19</jmh-generator.version>
<!-- plugins -->
<maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
</properties> </properties>
</project> </project>

4
toolkits/discourse/src/test/java/com/ossez/toolkits/discourse/DiscourseTopicsImportTest.java
View File

@ -112,8 +112,8 @@ public class DiscourseTopicsImportTest {
HttpPost httpPost = new HttpPost("https://www.ossez.com/posts.json"); HttpPost httpPost = new HttpPost("https://www.ossez.com/posts.json");
httpPost.setHeader(HttpHeaders.CONTENT_TYPE, "application/json; charset=UTF-8"); httpPost.setHeader(HttpHeaders.CONTENT_TYPE, "application/json; charset=UTF-8");
httpPost.setHeader("Api-Key", "8d789c529c4c22bf1dac3de7dbe7b29af10f2429aeb9a1914eff6da70c2265a9"); httpPost.setHeader("Api-Key", "XXXX");
httpPost.setHeader("Api-Username", "honeymoose"); httpPost.setHeader("Api-Username", "XXXX");
TopicRequest topicRequest = new TopicRequest(); TopicRequest topicRequest = new TopicRequest();
topicRequest.setTitle(bbsOssezForumPost.getSubject()); topicRequest.setTitle(bbsOssezForumPost.getSubject());