Skip to content

Commit 32d95f8

Browse files
honeymoosehoneymoose
committed
Merge remote-tracking branch 'origin/active_mq' into active_mq
# Conflicts: # .idea/compiler.xml # README.md
2 parents f917b21 + a2f4559 commit 32d95f8

57 files changed

Lines changed: 87 additions & 120 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.idea/encodings.xml‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2022 wiki-us
3+
Copyright (c) 2024 iSharkFly
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎README.md‎

Lines changed: 9 additions & 10 deletions

‎core-java-modules/core-java-11/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<version>0.1.0-SNAPSHOT</version>
88
<name>core-java-11</name>
99
<packaging>jar</packaging>
10-
<url>http://maven.apache.org</url>
10+
<url>https://maven.apache.org</url>
1111

1212
<parent>
1313
<groupId>com.ossez.core-java-modules</groupId>

‎core-java-modules/core-java-strings/README.md‎

Lines changed: 7 additions & 7 deletions

‎core-java-modules/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<module>core-java-8</module>
2020
<module>core-java-8-2</module>
2121
<module>core-java-11</module>
22-
<!-- <module>core-java-11-2</module>-->
22+
<module>core-java-11-2</module>
2323
<module>core-java-annotations</module>
2424
<module>core-java-collections</module>
2525
<module>core-java-collections-2</module>

toolkits/codebank/src/main/java/com/ossez/toolkits/codebank/Main.java renamed to toolkits/codebank/src/main/java/com/isharkfly/toolkits/codebank/Main.java

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
1-
package com.ossez.toolkits.codebank;
2-
3-
import java.util.Properties;
4-
import java.util.concurrent.ExecutorService;
5-
6-
import com.google.gdata.data.docs.Size;
7-
import org.apache.commons.cli.CommandLine;
8-
import org.apache.commons.cli.CommandLineParser;
9-
import org.apache.commons.cli.GnuParser;
10-
import org.apache.commons.cli.Options;
1+
package com.isharkfly.toolkits.codebank;
112

123
import org.slf4j.Logger;
134
import org.slf4j.LoggerFactory;

toolkits/codebank/src/main/java/com/ossez/toolkits/codebank/algorithm/objplusclass/CreateObject.java renamed to toolkits/codebank/src/main/java/com/isharkfly/toolkits/codebank/algorithm/objplusclass/CreateObject.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.ossez.toolkits.codebank.algorithm.objplusclass;
1+
package com.isharkfly.toolkits.codebank.algorithm.objplusclass;
22

33
/**
44
*

toolkits/codebank/src/main/java/com/ossez/toolkits/codebank/algorithm/overview/FreshJuiceEnums.java renamed to toolkits/codebank/src/main/java/com/isharkfly/toolkits/codebank/algorithm/overview/FreshJuiceEnums.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.ossez.toolkits.codebank.algorithm.overview;
1+
package com.isharkfly.toolkits.codebank.algorithm.overview;
22

33
/**
44
* Java Tutorial

toolkits/codebank/src/main/java/com/ossez/toolkits/codebank/algorithm/overview/HelloWorld.java renamed to toolkits/codebank/src/main/java/com/isharkfly/toolkits/codebank/algorithm/overview/HelloWorld.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.ossez.toolkits.codebank.algorithm.overview;
1+
package com.isharkfly.toolkits.codebank.algorithm.overview;
22

33
/**
44
* Java Tutorial

0 commit comments

Comments
 (0)