Skip to content

Commit db122e5

Browse files
authored
Merge branch 'master' into setup-java-11
2 parents e27da22 + a309931 commit db122e5

2 files changed

Lines changed: 28 additions & 10 deletions

File tree

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ jobs:
2525

2626
steps:
2727
- name: Checkout repository
28-
uses: actions/checkout@v2
28+
uses: actions/checkout@v3
2929

3030
# Initializes the CodeQL tools for scanning.
3131
- name: Initialize CodeQL
32-
uses: github/codeql-action/init@v1
32+
uses: github/codeql-action/init@v2
3333
with:
3434
languages: ${{ matrix.language }}
3535
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -40,4 +40,4 @@ jobs:
4040
- run: "mvn clean compile -Dmaven.test.skip=true -Dmaven.site.skip=true -Dmaven.javadoc.skip=true"
4141

4242
- name: Perform CodeQL Analysis
43-
uses: github/codeql-action/analyze@v1
43+
uses: github/codeql-action/analyze@v2

‎pom.xml‎

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -159,17 +159,35 @@
159159
<autoReleaseAfterClose>false</autoReleaseAfterClose>
160160
</configuration>
161161
</plugin>
162+
<plugin>
163+
<groupId>org.moditect</groupId>
164+
<artifactId>moditect-maven-plugin</artifactId>
165+
<version>1.0.0.Final</version>
166+
<executions>
167+
<execution>
168+
<id>add-module-infos</id>
169+
<phase>package</phase>
170+
<goals>
171+
<goal>add-module-info</goal>
172+
</goals>
173+
<configuration>
174+
<jvmVersion>9</jvmVersion>
175+
<module>
176+
<moduleInfo>
177+
<name>org.json</name>
178+
<exports>
179+
org.json;
180+
</exports>
181+
</moduleInfo>
182+
</module>
183+
</configuration>
184+
</execution>
185+
</executions>
186+
</plugin>
162187
<plugin>
163188
<groupId>org.apache.maven.plugins</groupId>
164189
<artifactId>maven-jar-plugin</artifactId>
165190
<version>3.3.0</version>
166-
<configuration>
167-
<archive>
168-
<manifestEntries>
169-
<Automatic-Module-Name>org.json</Automatic-Module-Name>
170-
</manifestEntries>
171-
</archive>
172-
</configuration>
173191
</plugin>
174192
</plugins>
175193
</build>

0 commit comments

Comments
 (0)