Skip to content

Commit ff93c47

Browse files
author
cube
committed
Download and scan the now-official oolite-source.xxx.yyyy.zip while meeting Github's limitations
https://bb.oolite.space/viewtopic.php?p=304029#p304029 Upgrade some of the dependencies
1 parent cfcb489 commit ff93c47

8 files changed

Lines changed: 22 additions & 23 deletions

File tree

‎.github/workflows/Build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ jobs:
2828
with:
2929
versionSpec: '5.x'
3030

31-
- name: Set up JDK 11
31+
- name: Set up JDK 21
3232
uses: actions/setup-java@v4
3333
with:
34-
java-version: '11'
34+
java-version: '21'
3535
distribution: 'adopt'
3636

3737
- name: Determine Version

‎pom.xml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<packaging>jar</packaging>
88
<properties>
99
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
10-
<maven.compiler.source>11</maven.compiler.source>
11-
<maven.compiler.target>11</maven.compiler.target>
10+
<maven.compiler.source>21</maven.compiler.source>
11+
<maven.compiler.target>21</maven.compiler.target>
1212
<sonar.coverage.jacoco.xmlReportPaths>${project.basedir}/target/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
1313
<sonar.junit.reportsPath>target/surefire-reports/TEST-*.xml</sonar.junit.reportsPath>
1414
<sonar.tests>src/test/java</sonar.tests>
@@ -19,12 +19,12 @@
1919
<dependency>
2020
<groupId>org.antlr</groupId>
2121
<artifactId>antlr4-runtime</artifactId>
22-
<version>4.13.1</version>
22+
<version>4.13.2</version>
2323
</dependency>
2424
<dependency>
2525
<groupId>org.freemarker</groupId>
2626
<artifactId>freemarker</artifactId>
27-
<version>2.3.32</version>
27+
<version>2.3.34</version>
2828
</dependency>
2929

3030
<dependency>
@@ -35,32 +35,32 @@
3535
<dependency>
3636
<groupId>commons-io</groupId>
3737
<artifactId>commons-io</artifactId>
38-
<version>2.16.1</version>
38+
<version>2.21.0</version>
3939
</dependency>
4040
<dependency>
4141
<groupId>org.junit.jupiter</groupId>
4242
<artifactId>junit-jupiter-api</artifactId>
43-
<version>5.10.2</version>
43+
<version>6.0.1</version>
4444
<scope>test</scope>
4545
</dependency>
4646
<dependency>
4747
<groupId>org.junit.jupiter</groupId>
4848
<artifactId>junit-jupiter-params</artifactId>
49-
<version>5.10.2</version>
49+
<version>6.0.1</version>
5050
<scope>test</scope>
5151
</dependency>
5252
<dependency>
5353
<groupId>org.junit.jupiter</groupId>
5454
<artifactId>junit-jupiter-engine</artifactId>
55-
<version>5.10.2</version>
55+
<version>6.0.1</version>
5656
<scope>test</scope>
5757
</dependency>
5858

5959
<!-- Maven pom.xml -->
6060
<dependency>
6161
<groupId>com.ginsberg</groupId>
6262
<artifactId>junit5-system-exit</artifactId>
63-
<version>1.1.2</version>
63+
<version>2.0.2</version>
6464
<scope>test</scope>
6565
</dependency>
6666

@@ -72,26 +72,26 @@
7272
<dependency>
7373
<groupId>commons-cli</groupId>
7474
<artifactId>commons-cli</artifactId>
75-
<version>1.6.0</version>
75+
<version>1.11.0</version>
7676
</dependency>
7777

7878
<dependency>
7979
<groupId>org.apache.logging.log4j</groupId>
8080
<artifactId>log4j-api</artifactId>
81-
<version>2.23.1</version>
81+
<version>2.25.2</version>
8282
</dependency>
8383
<dependency>
8484
<groupId>org.apache.logging.log4j</groupId>
8585
<artifactId>log4j-core</artifactId>
86-
<version>2.23.1</version>
86+
<version>2.25.2</version>
8787
<scope>runtime</scope>
8888
</dependency>
8989

9090
<!-- https://mvnrepository.com/artifact/net.sf.saxon/Saxon-HE -->
9191
<dependency>
9292
<groupId>net.sf.saxon</groupId>
9393
<artifactId>Saxon-HE</artifactId>
94-
<version>12.4</version>
94+
<version>12.9</version>
9595
</dependency>
9696

9797
</dependencies>

‎src/main/java/com/chaudhuri/ooliteaddonscanner2/AddonsUtil.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ public static void readEquipment(String url, InputStream in, Registry registry,
298298
/**
299299
* Download oolite, unpack and scan for ships and equipment.
300300
*
301-
* @param registry
301+
* @param registry the registry that will receive the found resources
302302
*/
303303
public static void readOolite(ExpansionCache cache, Registry registry) throws IOException, SAXException, ParserConfigurationException, RegistryException, TransformerException, URISyntaxException {
304304
log.debug("readOolite({})", registry);
@@ -340,11 +340,11 @@ public static void readOolite(ExpansionCache cache, Registry registry) throws IO
340340

341341
ZipEntry entry;
342342
while ((entry= zin.getNextEntry()) != null) {
343-
if ("Oolite.app/Contents/Resources/Config/shipdata.plist".equals(entry.getName())) {
343+
if ("Resources/Config/shipdata.plist".equals(entry.getName())) {
344344
log.debug("found {}", entry.getName());
345345
readShips(url+"!"+entry.getName(), AddonsUtil.getZipEntryStream(zin), registry, oxp);
346346
}
347-
if ("Oolite.app/Contents/Resources/Config/equipment.plist".equals(entry.getName())) {
347+
if ("Resources/Config/equipment.plist".equals(entry.getName())) {
348348
log.debug("found {}", entry.getName());
349349
readEquipment(url+"!"+entry.getName(), AddonsUtil.getZipEntryStream(zin), registry, oxp);
350350
}

‎src/main/java/com/chaudhuri/ooliteaddonscanner2/ExpansionCache.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ public Map<String, Object> getOoliteManifest(String tag) throws IOException, URI
205205
public String getOoliteDownloadUrl(Map<String, Object> manifest) {
206206
log.debug("getOoliteDownloadUrl({})", manifest);
207207

208-
Pattern pattern = Pattern.compile("oolite-\\d+\\.\\d+\\.zip");
208+
Pattern pattern = Pattern.compile("oolite-source-\\d+\\.\\d+\\.zip");
209209

210210
List<Object> assets = (List<Object>)manifest.get("assets");
211211
for (Object oasset: assets) {

‎src/main/java/com/chaudhuri/ooliteaddonscanner2/Main.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import com.chaudhuri.ooliteaddonscanner2.model.CustomSearch;
66
import java.io.File;
77
import java.net.URI;
8-
import java.net.URL;
98
import java.util.Arrays;
109
import org.apache.commons.cli.CommandLine;
1110
import org.apache.commons.cli.DefaultParser;

‎src/test/data/OoliteProject/oolite/releases/latest‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@
241241
"url": "https://api.github.com/repos/OoliteProject/oolite/releases/assets/24448168",
242242
"id": 24448168,
243243
"node_id": "MDEyOlJlbGVhc2VBc3NldDI0NDQ4MTY4",
244-
"name": "oolite-1.90.zip",
244+
"name": "oolite-source-1.92.zip",
245245
"label": null,
246246
"uploader": {
247247
"login": "KonstantinosSykas",
@@ -269,7 +269,7 @@
269269
"download_count": 4241,
270270
"created_at": "2020-08-29T08:58:05Z",
271271
"updated_at": "2020-08-29T09:02:46Z",
272-
"browser_download_url": "https://github.com/OoliteProject/oolite/releases/download/1.90/oolite-1.90.zip"
272+
"browser_download_url": "https://github.com/OoliteProject/oolite/releases/download/1.92/oolite-source-1.92.zip"
273273
},
274274
{
275275
"url": "https://api.github.com/repos/OoliteProject/oolite/releases/assets/24447995",

src/test/data/OoliteProject/oolite/releases/oolite-1.90.zip renamed to src/test/data/OoliteProject/oolite/releases/oolite-source-1.92.zip

13.8 MB
Binary file not shown.

‎src/test/java/com/chaudhuri/ooliteaddonscanner2/ExpansionCacheTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public void testGetOoliteManifest() throws Exception {
106106

107107
// this includes testGetOoliteDownloadUrl()
108108
String url = cache.getOoliteDownloadUrl(m);
109-
assertEquals("https://github.com/OoliteProject/oolite/releases/download/1.90/oolite-1.90.zip", url);
109+
assertEquals("https://github.com/OoliteProject/oolite/releases/download/1.92/oolite-source-1.92.zip", url);
110110

111111
log.debug("map has keys {}", m.keySet());
112112
/*

0 commit comments

Comments
 (0)