Merge pull request #80 from Siroshun09/develop

Version 4.6.1
Siroshun09 · Feb 16, 2023 · dbf8f5a · dbf8f5a
2 parents 4824f27 + 6630769
commit dbf8f5a
Show file tree

Hide file tree

Showing 31 changed files with 103 additions and 97 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -2,28 +2,11 @@ name: Java CI
 on: [ push, pull_request ]
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        java: [ '11', '16', '17' ]
-    steps:
-      - uses: actions/[email protected]
-      - name: Set up JDK ${{ matrix.java }}
-        uses: actions/[email protected]
-        with:
-          distribution: 'temurin'
-          java-version: ${{ matrix.java }}
-          cache: 'maven'
-      - name: Build Project
-        run: mvn -B package --file pom.xml -Djava.version=${{ matrix.java }}
-      - name: Move Artifacts
-        run: |
-          mkdir staging
-          mv target staging/parent
-          mv api/target staging/api
-          mv yaml/target staging/yaml
-      - uses: actions/[email protected]
-        with:
-          name: Artifacts-Java-${{ matrix.java }}
-          path: staging
+  build-java-11:
+    uses: Siroshun09/gh-actions-workflows/.github/workflows/maven.yml@v1
+    with:
+      java-version: '11'
+  build-java-17:
+    uses: Siroshun09/gh-actions-workflows/.github/workflows/maven.yml@v1
+    with:
+      java-version: '17'
diff --git a/.github/workflows/update-javadoc.yml b/.github/workflows/update-javadoc.yml
@@ -1,24 +1,18 @@
 name: Deploy Javadoc to GitHub Pages (Maven)
 on:
-  push:
-    branches: [ master ]
+  release:
+    types: [ published ]
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/[email protected]
-      - name: Set up JDK 17
-        uses: actions/[email protected]
-        with:
-          distribution: 'temurin'
-          java-version: 17
-          cache: 'maven'
-      - name: Build with Maven
-        run: mvn -B package --file pom.xml -Djava.version=17
-      - name: Deploy pages
-        uses: peaceiris/[email protected]
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./target/site/apidocs
-          allow_empty_commit: true
+  generate-javadoc:
+    uses: Siroshun09/gh-actions-workflows/.github/workflows/maven-generate-javadoc.yml@v1
+    with:
+      java-version: '17'
+      maven-arguments: "javadoc:aggregate"
+  deploy-javadoc:
+    needs: [ generate-javadoc ]
+    uses: Siroshun09/gh-actions-workflows/.github/workflows/deploy-to-gh-pages.yml@v1
+    with:
+      project-version: ${{ github.event.release.tag_name }}
+      artifact-name: Javadoc
+      update-latest: true
diff --git a/api/pom.xml b/api/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~     Copyright 2021 Siroshun09
+  ~     Copyright 2023 Siroshun09
   ~
   ~     Licensed under the Apache License, Version 2.0 (the "License");
   ~     you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.github.siroshun09.configapi</groupId>
         <artifactId>parent</artifactId>
-        <version>4.6.0</version>
+        <version>4.6.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/api/src/main/java/com/github/siroshun09/configapi/api/AbstractConfiguration.java b/api/src/main/java/com/github/siroshun09/configapi/api/AbstractConfiguration.java
@@ -1,5 +1,5 @@
 /*
- *     Copyright 2021 Siroshun09
+ *     Copyright 2023 Siroshun09
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.

diff --git a/api/src/main/java/com/github/siroshun09/configapi/api/Configuration.java b/api/src/main/java/com/github/siroshun09/configapi/api/Configuration.java
@@ -1,5 +1,5 @@
 /*
- *     Copyright 2021 Siroshun09
+ *     Copyright 2023 Siroshun09
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.

diff --git a/api/src/main/java/com/github/siroshun09/configapi/api/MappedConfiguration.java b/api/src/main/java/com/github/siroshun09/configapi/api/MappedConfiguration.java
@@ -1,5 +1,5 @@
 /*
- *     Copyright 2021 Siroshun09
+ *     Copyright 2023 Siroshun09
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
@@ -69,7 +69,7 @@ public class MappedConfiguration extends AbstractConfiguration {
 
     private static @NotNull Map<Object, Object> convertToMap(@NotNull Configuration config) {
         if (config instanceof MappedConfiguration) {
-            return ((MappedConfiguration) config).map;
+            return new LinkedHashMap<>(((MappedConfiguration) config).map);
         }
 
         var map = new LinkedHashMap<>();

diff --git a/api/src/main/java/com/github/siroshun09/configapi/api/file/AbstractFileConfiguration.java b/api/src/main/java/com/github/siroshun09/configapi/api/file/AbstractFileConfiguration.java
@@ -1,5 +1,5 @@
 /*
- *     Copyright 2021 Siroshun09
+ *     Copyright 2023 Siroshun09
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.

diff --git a/api/src/main/java/com/github/siroshun09/configapi/api/file/FileConfiguration.java b/api/src/main/java/com/github/siroshun09/configapi/api/file/FileConfiguration.java
@@ -1,5 +1,5 @@
 /*
- *     Copyright 2021 Siroshun09
+ *     Copyright 2023 Siroshun09
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.

diff --git a/api/src/main/java/com/github/siroshun09/configapi/api/file/PropertiesConfiguration.java b/api/src/main/java/com/github/siroshun09/configapi/api/file/PropertiesConfiguration.java
@@ -1,5 +1,5 @@
 /*
- *     Copyright 2021 Siroshun09
+ *     Copyright 2023 Siroshun09
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.

diff --git a/api/src/main/java/com/github/siroshun09/configapi/api/file/package-info.java b/api/src/main/java/com/github/siroshun09/configapi/api/file/package-info.java
@@ -1,5 +1,5 @@
 /*
- *     Copyright 2021 Siroshun09
+ *     Copyright 2023 Siroshun09
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.

diff --git a/api/src/main/java/com/github/siroshun09/configapi/api/package-info.java b/api/src/main/java/com/github/siroshun09/configapi/api/package-info.java
@@ -1,5 +1,5 @@
 /*
- *     Copyright 2021 Siroshun09
+ *     Copyright 2023 Siroshun09
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.

diff --git a/...src/main/java/com/github/siroshun09/configapi/api/serializer/ConfigurationSerializer.java b/...src/main/java/com/github/siroshun09/configapi/api/serializer/ConfigurationSerializer.java
@@ -1,5 +1,5 @@
 /*
- *     Copyright 2021 Siroshun09
+ *     Copyright 2023 Siroshun09
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.

diff --git a/api/src/main/java/com/github/siroshun09/configapi/api/serializer/Serializer.java b/api/src/main/java/com/github/siroshun09/configapi/api/serializer/Serializer.java
@@ -1,5 +1,5 @@
 /*
- *     Copyright 2021 Siroshun09
+ *     Copyright 2023 Siroshun09
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.

diff --git a/api/src/main/java/com/github/siroshun09/configapi/api/serializer/StringSerializer.java b/api/src/main/java/com/github/siroshun09/configapi/api/serializer/StringSerializer.java
@@ -1,5 +1,5 @@
 /*
- *     Copyright 2021 Siroshun09
+ *     Copyright 2023 Siroshun09
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.

diff --git a/api/src/main/java/com/github/siroshun09/configapi/api/serializer/package-info.java b/api/src/main/java/com/github/siroshun09/configapi/api/serializer/package-info.java
@@ -1,5 +1,5 @@
 /*
- *     Copyright 2021 Siroshun09
+ *     Copyright 2023 Siroshun09
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.

diff --git a/api/src/main/java/com/github/siroshun09/configapi/api/util/FileUtils.java b/api/src/main/java/com/github/siroshun09/configapi/api/util/FileUtils.java
@@ -1,5 +1,5 @@
 /*
- *     Copyright 2021 Siroshun09
+ *     Copyright 2023 Siroshun09
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.

diff --git a/api/src/main/java/com/github/siroshun09/configapi/api/util/ResourceUtils.java b/api/src/main/java/com/github/siroshun09/configapi/api/util/ResourceUtils.java
@@ -1,5 +1,5 @@
 /*
- *     Copyright 2021 Siroshun09
+ *     Copyright 2023 Siroshun09
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.

diff --git a/api/src/main/java/com/github/siroshun09/configapi/api/util/package-info.java b/api/src/main/java/com/github/siroshun09/configapi/api/util/package-info.java
@@ -1,5 +1,5 @@
 /*
- *     Copyright 2021 Siroshun09
+ *     Copyright 2023 Siroshun09
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.

diff --git a/api/src/main/java/com/github/siroshun09/configapi/api/value/ConfigValue.java b/api/src/main/java/com/github/siroshun09/configapi/api/value/ConfigValue.java
@@ -1,5 +1,5 @@
 /*
- *     Copyright 2021 Siroshun09
+ *     Copyright 2023 Siroshun09
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.

diff --git a/api/src/main/java/com/github/siroshun09/configapi/api/value/package-info.java b/api/src/main/java/com/github/siroshun09/configapi/api/value/package-info.java
@@ -1,5 +1,5 @@
 /*
- *     Copyright 2021 Siroshun09
+ *     Copyright 2023 Siroshun09
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.

diff --git a/api/src/test/java/com/github/siroshun09/configapi/api/test/AbstractConfigurationTest.java b/api/src/test/java/com/github/siroshun09/configapi/api/test/AbstractConfigurationTest.java
@@ -1,5 +1,5 @@
 /*
- *     Copyright 2021 Siroshun09
+ *     Copyright 2023 Siroshun09
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.

diff --git a/api/src/test/java/com/github/siroshun09/configapi/api/test/MappedConfigurationTest.java b/api/src/test/java/com/github/siroshun09/configapi/api/test/MappedConfigurationTest.java
@@ -1,5 +1,5 @@
 /*
- *     Copyright 2021 Siroshun09
+ *     Copyright 2023 Siroshun09
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.

diff --git a/.../test/java/com/github/siroshun09/configapi/api/test/file/PropertiesConfigurationTest.java b/.../test/java/com/github/siroshun09/configapi/api/test/file/PropertiesConfigurationTest.java
@@ -1,5 +1,5 @@
 /*
- *     Copyright 2021 Siroshun09
+ *     Copyright 2023 Siroshun09
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.

diff --git a/api/src/test/java/com/github/siroshun09/configapi/api/test/util/ResourceUtilsTest.java b/api/src/test/java/com/github/siroshun09/configapi/api/test/util/ResourceUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- *     Copyright 2021 Siroshun09
+ *     Copyright 2023 Siroshun09
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.

diff --git a/api/src/test/resources/example.properties b/api/src/test/resources/example.properties
@@ -1,2 +1,18 @@
+#
+#     Copyright 2023 Siroshun09
+#
+#     Licensed under the Apache License, Version 2.0 (the "License");
+#     you may not use this file except in compliance with the License.
+#     You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#     Unless required by applicable law or agreed to in writing, software
+#     distributed under the License is distributed on an "AS IS" BASIS,
+#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#     See the License for the specific language governing permissions and
+#     limitations under the License.
+#
+
 example.key=value
 1=number
diff --git a/pom.xml b/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~     Copyright 2021 Siroshun09
+  ~     Copyright 2023 Siroshun09
   ~
   ~     Licensed under the Apache License, Version 2.0 (the "License");
   ~     you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
 
     <groupId>com.github.siroshun09.configapi</groupId>
     <artifactId>parent</artifactId>
-    <version>4.6.0</version>
+    <version>4.6.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ConfigAPI</name>
@@ -75,19 +75,19 @@
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>23.0.0</version>
+            <version>24.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.8.2</version>
+            <version>5.9.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.8.2</version>
+            <version>5.9.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -135,7 +135,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
+                <version>3.10.1</version>
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>
@@ -145,7 +145,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.3.0</version>
                 <configuration>
                     <archive combine.children="append">
                         <manifest>
@@ -161,7 +161,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0-M5</version>
+                <version>3.0.0-M9</version>
             </plugin>
             <plugin>
                 <artifactId>maven-source-plugin</artifactId>
@@ -179,13 +179,19 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.3.1</version>
+                <version>3.5.0</version>
                 <executions>
                     <execution>
                         <id>attach-docs</id>
                         <phase>prepare-package</phase>
                         <goals>
                             <goal>jar</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>aggregate</id>
+                        <phase>site</phase>
+                        <goals>
                             <goal>aggregate</goal>
                         </goals>
                     </execution>
@@ -201,7 +207,7 @@
                     <show>protected</show>
                     <quiet>true</quiet>
                     <bottom>
-                        <![CDATA[<p class="legalCopy">Copyright &#169;2020-2021 <a href="https://github.com/Siroshun09">Siroshun09</a>. All rights reserved.</p>]]>
+                        <![CDATA[<p class="legalCopy">Copyright &#169;2020-2023 <a href="https://github.com/Siroshun09">Siroshun09</a>. All rights reserved.</p>]]>
                     </bottom>
                 </configuration>
             </plugin>
@@ -213,7 +219,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.3.1</version>
+                <version>3.5.0</version>
                 <reportSets>
                     <reportSet>
                         <id>aggregate</id>