Merge pull request #141 from TeamKun/develop

v3.1.0
TeamKun · Jan 19, 2024 · 7763e73 · 7763e73
2 parents d2452d4 + f171541
commit 7763e73
Show file tree

Hide file tree

Showing 24 changed files with 217 additions and 165 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -25,42 +25,34 @@ jobs:
     name: Analyze
     runs-on: ubuntu-latest
 
-    strategy:
-      fail-fast: false
-      matrix:
-        language: ['java']
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
-        # Learn more:
-        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
-
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
-      # Initializes the CodeQL tools for scanning.
+        uses: actions/checkout@v3
+      - name: Set up JDK 17
+        id: sj
+        uses: actions/setup-java@v3
+        with:
+          distribution: "zulu"
+          java-version: 17
+          cache: maven
+      - uses: PeyaPeyaPeyang/nmsaction@v3
+        if: "steps.sj.outputs.cache-hit != 'true'"
+        with:
+          rev: 1.16.5
+      - uses: PeyaPeyaPeyang/nmsaction@v3
+        if: "steps.sj.outputs.cache-hit != 'true'"
+        with:
+          rev: 1.19
+      - name: Install nms into m2
+        if: "steps.sj.outputs.cache-hit != 'true'"
+        run: |
+          mkdir -p $HOME/.m2/repository
+          cp -a nms-build/.m2/repository/. $HOME/.m2/repository
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2
         with:
-          languages: ${{ matrix.language }}
-          # If you wish to specify custom queries, you can do so here or in a config file.
-          # By default, queries listed here will override any specified in a config file.
-          # Prefix the list here with "+" to use these queries and those in the config file.
-          # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-      # If this step fails, then you should remove it and run the build manually (see below)
-      - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
-
-        # ℹ️ Command-line programs to run using the OS shell.
-        # 📚 https://git.io/JvXDl
-
-        # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-        #    and modify them (or add more) to build your code if your project
-        #    uses a compiled language
-
-      #- run: |
-      #   make bootstrap
-      #   make release
-
+          languages: java
+      - name: Build with Maven # AutoBuild は動かない   \ ばーん！ /
+        run: mvn -B package --file pom.xml
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v2
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -11,15 +11,29 @@ on:
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
-
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        id: sj
+        uses: actions/setup-java@v3
+        with:
+          distribution: "zulu"
+          java-version: 17
+          cache: maven
+      - uses: PeyaPeyaPeyang/nmsaction@v3
+        if: "steps.sj.outputs.cache-hit != 'true'"
         with:
-          java-version: 11
+          rev: 1.16.5
+      - uses: PeyaPeyaPeyang/nmsaction@v3
+        if: "steps.sj.outputs.cache-hit != 'true'"
+        with:
+          rev: 1.19
+      - name: Install nms into m2
+        if: "steps.sj.outputs.cache-hit != 'true'"
+        run: |
+          mkdir -p $HOME/.m2/repository
+          cp -a nms-build/.m2/repository/. $HOME/.m2/repository
       - uses: actions/cache@v1
         with:
           path: ~/.m2/repository
@@ -28,6 +42,4 @@ jobs:
             ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
       - name: Build with Maven
         run: mvn -B package --file pom.xml
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          TOKEN: "dummy_token_114514" # for maven test
+
diff --git a/KPMAlias/pom.xml b/KPMAlias/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.kunlab.kpm</groupId>
         <artifactId>TeamKunPluginManager</artifactId>
-        <version>3.1.0-pre1</version>
+        <version>3.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -22,19 +22,19 @@
         <dependency>
             <groupId>org.kunlab.kpm</groupId>
             <artifactId>KPMCommon</artifactId>
-            <version>3.1.0-pre1</version>
+            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.kunlab.kpm</groupId>
             <artifactId>KPMModels</artifactId>
-            <version>3.1.0-pre1</version>
+            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.kunlab.kpm</groupId>
             <artifactId>KPMResolver</artifactId>
-            <version>3.1.0-pre1</version>
+            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/KPMCommon/pom.xml b/KPMCommon/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.kunlab.kpm</groupId>
         <artifactId>TeamKunPluginManager</artifactId>
-        <version>3.1.0-pre1</version>
+        <version>3.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/KPMDaemon/pom.xml b/KPMDaemon/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>TeamKunPluginManager</artifactId>
         <groupId>org.kunlab.kpm</groupId>
-        <version>3.1.0-pre1</version>
+        <version>3.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -23,7 +23,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.11.0</version>
+                <version>3.12.1</version>
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>
@@ -52,7 +52,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.5.0</version>
+                <version>3.6.3</version>
                 <configuration>
                     <author>true</author>
                     <outputDirectory>${project.basedir}/docs</outputDirectory>
@@ -111,55 +111,55 @@
         <dependency>
             <groupId>org.kunlab.kpm</groupId>
             <artifactId>KPMModels</artifactId>
-            <version>3.1.0-pre1</version>
+            <version>3.1.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.kunlab.kpm</groupId>
             <artifactId>KPMCommon</artifactId>
-            <version>3.1.0-pre1</version>
+            <version>3.1.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.kunlab.kpm</groupId>
             <artifactId>KPMResolver</artifactId>
-            <version>3.1.0-pre1</version>
+            <version>3.1.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.kunlab.kpm</groupId>
             <artifactId>KPMAlias</artifactId>
-            <version>3.1.0-pre1</version>
+            <version>3.1.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.kunlab.kpm</groupId>
             <artifactId>KPMMeta</artifactId>
-            <version>3.1.0-pre1</version>
+            <version>3.1.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.kunlab.kpm</groupId>
             <artifactId>KPMHooks</artifactId>
-            <version>3.1.0-pre1</version>
+            <version>3.1.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.kunlab.kpm</groupId>
             <artifactId>KPMInfo</artifactId>
-            <version>3.1.0-pre1</version>
+            <version>3.1.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.kunlab.kpm</groupId>
             <artifactId>KPMPluginInstaller</artifactId>
-            <version>3.1.0-pre1</version>
+            <version>3.1.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.kunlab.kpm</groupId>
             <artifactId>KPMTasks</artifactId>
-            <version>3.1.0-pre1</version>
+            <version>3.1.0</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

diff --git a/KPMHooks/pom.xml b/KPMHooks/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.kunlab.kpm</groupId>
         <artifactId>TeamKunPluginManager</artifactId>
-        <version>3.1.0-pre1</version>
+        <version>3.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>org.kunlab.kpm</groupId>
             <artifactId>KPMModels</artifactId>
-            <version>3.1.0-pre1</version>
+            <version>3.1.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.kunlab.kpm</groupId>
             <artifactId>KPMCommon</artifactId>
-            <version>3.1.0-pre1</version>
+            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/KPMInfo/pom.xml b/KPMInfo/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.kunlab.kpm</groupId>
         <artifactId>TeamKunPluginManager</artifactId>
-        <version>3.1.0-pre1</version>
+        <version>3.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -22,25 +22,25 @@
         <dependency>
             <groupId>org.kunlab.kpm</groupId>
             <artifactId>KPMCommon</artifactId>
-            <version>3.1.0-pre1</version>
+            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.kunlab.kpm</groupId>
             <artifactId>KPMModels</artifactId>
-            <version>3.1.0-pre1</version>
+            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.kunlab.kpm</groupId>
             <artifactId>KPMHooks</artifactId>
-            <version>3.1.0-pre1</version>
+            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.kunlab.kpm</groupId>
             <artifactId>KPMResolver</artifactId>
-            <version>3.1.0-pre1</version>
+            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/KPMMeta/pom.xml b/KPMMeta/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.kunlab.kpm</groupId>
         <artifactId>TeamKunPluginManager</artifactId>
-        <version>3.1.0-pre1</version>
+        <version>3.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -22,19 +22,19 @@
         <dependency>
             <groupId>org.kunlab.kpm</groupId>
             <artifactId>KPMCommon</artifactId>
-            <version>3.1.0-pre1</version>
+            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.kunlab.kpm</groupId>
             <artifactId>KPMModels</artifactId>
-            <version>3.1.0-pre1</version>
+            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.kunlab.kpm</groupId>
             <artifactId>KPMResolver</artifactId>
-            <version>3.1.0-pre1</version>
+            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/KPMModels/pom.xml b/KPMModels/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.kunlab.kpm</groupId>
         <artifactId>TeamKunPluginManager</artifactId>
-        <version>3.1.0-pre1</version>
+        <version>3.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>org.kunlab.kpm</groupId>
             <artifactId>KPMCommon</artifactId>
-            <version>3.1.0-pre1</version>
+            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/KPMModels/src/main/java/org/kunlab/kpm/resolver/interfaces/QueryContext.java b/KPMModels/src/main/java/org/kunlab/kpm/resolver/interfaces/QueryContext.java
@@ -16,6 +16,11 @@ public interface QueryContext
      */
     String versionEqualQuerySeparator = "==";
 
+    /**
+     * バージョンを指定する指定子です。
+     */
+    String versionChooseSpecifier = "?";
+
     /**
      * 指定するリゾルバの名前を取得します。
      *
@@ -57,4 +62,11 @@ public interface QueryContext
      * @param version バージョン
      */
     void setVersion(Version version);
+
+    /**
+     * バージョンを選択するかどうかを取得します。
+     *
+     * @return バージョンを選択するかどうか
+     */
+    boolean isChooseVersion();
 }