Skip to content

Commit 7763e73

Browse files
PeyaPeyaPeyangPeyaPeyaPeyang
authored
Merge pull request #141 from TeamKun/develop
v3.1.0
2 parents d2452d4 + f171541 commit 7763e73

File tree

24 files changed

+217
-165
lines changed

24 files changed

+217
-165
lines changed

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 24 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -25,42 +25,34 @@ jobs:
2525
name: Analyze
2626
runs-on: ubuntu-latest
2727

28-
strategy:
29-
fail-fast: false
30-
matrix:
31-
language: ['java']
32-
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
33-
# Learn more:
34-
# 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
35-
3628
steps:
3729
- name: Checkout repository
38-
uses: actions/checkout@v2
39-
# Initializes the CodeQL tools for scanning.
30+
uses: actions/checkout@v3
31+
- name: Set up JDK 17
32+
id: sj
33+
uses: actions/setup-java@v3
34+
with:
35+
distribution: "zulu"
36+
java-version: 17
37+
cache: maven
38+
- uses: PeyaPeyaPeyang/nmsaction@v3
39+
if: "steps.sj.outputs.cache-hit != 'true'"
40+
with:
41+
rev: 1.16.5
42+
- uses: PeyaPeyaPeyang/nmsaction@v3
43+
if: "steps.sj.outputs.cache-hit != 'true'"
44+
with:
45+
rev: 1.19
46+
- name: Install nms into m2
47+
if: "steps.sj.outputs.cache-hit != 'true'"
48+
run: |
49+
mkdir -p $HOME/.m2/repository
50+
cp -a nms-build/.m2/repository/. $HOME/.m2/repository
4051
- name: Initialize CodeQL
4152
uses: github/codeql-action/init@v2
4253
with:
43-
languages: ${{ matrix.language }}
44-
# If you wish to specify custom queries, you can do so here or in a config file.
45-
# By default, queries listed here will override any specified in a config file.
46-
# Prefix the list here with "+" to use these queries and those in the config file.
47-
# queries: ./path/to/local/query, your-org/your-repo/queries@main
48-
49-
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
50-
# If this step fails, then you should remove it and run the build manually (see below)
51-
- name: Autobuild
52-
uses: github/codeql-action/autobuild@v2
53-
54-
# ℹ️ Command-line programs to run using the OS shell.
55-
# 📚 https://git.io/JvXDl
56-
57-
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
58-
# and modify them (or add more) to build your code if your project
59-
# uses a compiled language
60-
61-
#- run: |
62-
# make bootstrap
63-
# make release
64-
54+
languages: java
55+
- name: Build with Maven # AutoBuild は動かない \ ばーん！ /
56+
run: mvn -B package --file pom.xml
6557
- name: Perform CodeQL Analysis
6658
uses: github/codeql-action/analyze@v2

‎.github/workflows/maven.yml‎

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,29 @@ on:
1111

1212
jobs:
1313
build:
14-
1514
runs-on: ubuntu-latest
16-
1715
steps:
18-
- uses: actions/checkout@v2
19-
- name: Set up JDK 11
20-
uses: actions/setup-java@v1
16+
- uses: actions/checkout@v3
17+
- name: Set up JDK 17
18+
id: sj
19+
uses: actions/setup-java@v3
20+
with:
21+
distribution: "zulu"
22+
java-version: 17
23+
cache: maven
24+
- uses: PeyaPeyaPeyang/nmsaction@v3
25+
if: "steps.sj.outputs.cache-hit != 'true'"
2126
with:
22-
java-version: 11
27+
rev: 1.16.5
28+
- uses: PeyaPeyaPeyang/nmsaction@v3
29+
if: "steps.sj.outputs.cache-hit != 'true'"
30+
with:
31+
rev: 1.19
32+
- name: Install nms into m2
33+
if: "steps.sj.outputs.cache-hit != 'true'"
34+
run: |
35+
mkdir -p $HOME/.m2/repository
36+
cp -a nms-build/.m2/repository/. $HOME/.m2/repository
2337
- uses: actions/cache@v1
2438
with:
2539
path: ~/.m2/repository
@@ -28,6 +42,4 @@ jobs:
2842
${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
2943
- name: Build with Maven
3044
run: mvn -B package --file pom.xml
31-
env:
32-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
33-
TOKEN: "dummy_token_114514" # for maven test
45+

‎KPMAlias/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.kunlab.kpm</groupId>
88
<artifactId>TeamKunPluginManager</artifactId>
9-
<version>3.1.0-pre1</version>
9+
<version>3.1.0</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

@@ -22,19 +22,19 @@
2222
<dependency>
2323
<groupId>org.kunlab.kpm</groupId>
2424
<artifactId>KPMCommon</artifactId>
25-
<version>3.1.0-pre1</version>
25+
<version>3.1.0</version>
2626
<scope>provided</scope>
2727
</dependency>
2828
<dependency>
2929
<groupId>org.kunlab.kpm</groupId>
3030
<artifactId>KPMModels</artifactId>
31-
<version>3.1.0-pre1</version>
31+
<version>3.1.0</version>
3232
<scope>provided</scope>
3333
</dependency>
3434
<dependency>
3535
<groupId>org.kunlab.kpm</groupId>
3636
<artifactId>KPMResolver</artifactId>
37-
<version>3.1.0-pre1</version>
37+
<version>3.1.0</version>
3838
<scope>provided</scope>
3939
</dependency>
4040
</dependencies>

‎KPMCommon/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.kunlab.kpm</groupId>
88
<artifactId>TeamKunPluginManager</artifactId>
9-
<version>3.1.0-pre1</version>
9+
<version>3.1.0</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

‎KPMDaemon/pom.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>TeamKunPluginManager</artifactId>
77
<groupId>org.kunlab.kpm</groupId>
8-
<version>3.1.0-pre1</version>
8+
<version>3.1.0</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111
<modelVersion>4.0.0</modelVersion>
@@ -23,7 +23,7 @@
2323
<plugin>
2424
<groupId>org.apache.maven.plugins</groupId>
2525
<artifactId>maven-compiler-plugin</artifactId>
26-
<version>3.11.0</version>
26+
<version>3.12.1</version>
2727
<configuration>
2828
<source>${java.version}</source>
2929
<target>${java.version}</target>
@@ -52,7 +52,7 @@
5252
<plugin>
5353
<groupId>org.apache.maven.plugins</groupId>
5454
<artifactId>maven-javadoc-plugin</artifactId>
55-
<version>3.5.0</version>
55+
<version>3.6.3</version>
5656
<configuration>
5757
<author>true</author>
5858
<outputDirectory>${project.basedir}/docs</outputDirectory>
@@ -111,55 +111,55 @@
111111
<dependency>
112112
<groupId>org.kunlab.kpm</groupId>
113113
<artifactId>KPMModels</artifactId>
114-
<version>3.1.0-pre1</version>
114+
<version>3.1.0</version>
115115
<scope>compile</scope>
116116
</dependency>
117117
<dependency>
118118
<groupId>org.kunlab.kpm</groupId>
119119
<artifactId>KPMCommon</artifactId>
120-
<version>3.1.0-pre1</version>
120+
<version>3.1.0</version>
121121
<scope>compile</scope>
122122
</dependency>
123123
<dependency>
124124
<groupId>org.kunlab.kpm</groupId>
125125
<artifactId>KPMResolver</artifactId>
126-
<version>3.1.0-pre1</version>
126+
<version>3.1.0</version>
127127
<scope>compile</scope>
128128
</dependency>
129129
<dependency>
130130
<groupId>org.kunlab.kpm</groupId>
131131
<artifactId>KPMAlias</artifactId>
132-
<version>3.1.0-pre1</version>
132+
<version>3.1.0</version>
133133
<scope>compile</scope>
134134
</dependency>
135135
<dependency>
136136
<groupId>org.kunlab.kpm</groupId>
137137
<artifactId>KPMMeta</artifactId>
138-
<version>3.1.0-pre1</version>
138+
<version>3.1.0</version>
139139
<scope>compile</scope>
140140
</dependency>
141141
<dependency>
142142
<groupId>org.kunlab.kpm</groupId>
143143
<artifactId>KPMHooks</artifactId>
144-
<version>3.1.0-pre1</version>
144+
<version>3.1.0</version>
145145
<scope>compile</scope>
146146
</dependency>
147147
<dependency>
148148
<groupId>org.kunlab.kpm</groupId>
149149
<artifactId>KPMInfo</artifactId>
150-
<version>3.1.0-pre1</version>
150+
<version>3.1.0</version>
151151
<scope>compile</scope>
152152
</dependency>
153153
<dependency>
154154
<groupId>org.kunlab.kpm</groupId>
155155
<artifactId>KPMPluginInstaller</artifactId>
156-
<version>3.1.0-pre1</version>
156+
<version>3.1.0</version>
157157
<scope>compile</scope>
158158
</dependency>
159159
<dependency>
160160
<groupId>org.kunlab.kpm</groupId>
161161
<artifactId>KPMTasks</artifactId>
162-
<version>3.1.0-pre1</version>
162+
<version>3.1.0</version>
163163
<scope>compile</scope>
164164
</dependency>
165165
</dependencies>

‎KPMHooks/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.kunlab.kpm</groupId>
88
<artifactId>TeamKunPluginManager</artifactId>
9-
<version>3.1.0-pre1</version>
9+
<version>3.1.0</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

@@ -22,13 +22,13 @@
2222
<dependency>
2323
<groupId>org.kunlab.kpm</groupId>
2424
<artifactId>KPMModels</artifactId>
25-
<version>3.1.0-pre1</version>
25+
<version>3.1.0</version>
2626
<scope>compile</scope>
2727
</dependency>
2828
<dependency>
2929
<groupId>org.kunlab.kpm</groupId>
3030
<artifactId>KPMCommon</artifactId>
31-
<version>3.1.0-pre1</version>
31+
<version>3.1.0</version>
3232
<scope>provided</scope>
3333
</dependency>
3434
</dependencies>

‎KPMInfo/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.kunlab.kpm</groupId>
88
<artifactId>TeamKunPluginManager</artifactId>
9-
<version>3.1.0-pre1</version>
9+
<version>3.1.0</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

@@ -22,25 +22,25 @@
2222
<dependency>
2323
<groupId>org.kunlab.kpm</groupId>
2424
<artifactId>KPMCommon</artifactId>
25-
<version>3.1.0-pre1</version>
25+
<version>3.1.0</version>
2626
<scope>provided</scope>
2727
</dependency>
2828
<dependency>
2929
<groupId>org.kunlab.kpm</groupId>
3030
<artifactId>KPMModels</artifactId>
31-
<version>3.1.0-pre1</version>
31+
<version>3.1.0</version>
3232
<scope>provided</scope>
3333
</dependency>
3434
<dependency>
3535
<groupId>org.kunlab.kpm</groupId>
3636
<artifactId>KPMHooks</artifactId>
37-
<version>3.1.0-pre1</version>
37+
<version>3.1.0</version>
3838
<scope>provided</scope>
3939
</dependency>
4040
<dependency>
4141
<groupId>org.kunlab.kpm</groupId>
4242
<artifactId>KPMResolver</artifactId>
43-
<version>3.1.0-pre1</version>
43+
<version>3.1.0</version>
4444
<scope>provided</scope>
4545
</dependency>
4646
</dependencies>

‎KPMMeta/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.kunlab.kpm</groupId>
88
<artifactId>TeamKunPluginManager</artifactId>
9-
<version>3.1.0-pre1</version>
9+
<version>3.1.0</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

@@ -22,19 +22,19 @@
2222
<dependency>
2323
<groupId>org.kunlab.kpm</groupId>
2424
<artifactId>KPMCommon</artifactId>
25-
<version>3.1.0-pre1</version>
25+
<version>3.1.0</version>
2626
<scope>provided</scope>
2727
</dependency>
2828
<dependency>
2929
<groupId>org.kunlab.kpm</groupId>
3030
<artifactId>KPMModels</artifactId>
31-
<version>3.1.0-pre1</version>
31+
<version>3.1.0</version>
3232
<scope>provided</scope>
3333
</dependency>
3434
<dependency>
3535
<groupId>org.kunlab.kpm</groupId>
3636
<artifactId>KPMResolver</artifactId>
37-
<version>3.1.0-pre1</version>
37+
<version>3.1.0</version>
3838
<scope>provided</scope>
3939
</dependency>
4040
</dependencies>

‎KPMModels/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.kunlab.kpm</groupId>
88
<artifactId>TeamKunPluginManager</artifactId>
9-
<version>3.1.0-pre1</version>
9+
<version>3.1.0</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

@@ -31,7 +31,7 @@
3131
<dependency>
3232
<groupId>org.kunlab.kpm</groupId>
3333
<artifactId>KPMCommon</artifactId>
34-
<version>3.1.0-pre1</version>
34+
<version>3.1.0</version>
3535
<scope>provided</scope>
3636
</dependency>
3737
</dependencies>

‎KPMModels/src/main/java/org/kunlab/kpm/resolver/interfaces/QueryContext.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ public interface QueryContext
1616
*/
1717
String versionEqualQuerySeparator = "==";
1818

19+
/**
20+
* バージョンを指定する指定子です。
21+
*/
22+
String versionChooseSpecifier = "?";
23+
1924
/**
2025
* 指定するリゾルバの名前を取得します。
2126
*
@@ -57,4 +62,11 @@ public interface QueryContext
5762
* @param version バージョン
5863
*/
5964
void setVersion(Version version);
65+
66+
/**
67+
* バージョンを選択するかどうかを取得します。
68+
*
69+
* @return バージョンを選択するかどうか
70+
*/
71+
boolean isChooseVersion();
6072
}

0 commit comments

Comments
 (0)