1
0
mirror of https://gitlab.com/camelot/kickc.git synced 2024-12-10 12:52:46 +00:00

Merge branch '828-update-to-kickass-5-25' into 'master'

Resolve "Update to KickAss 5.25"

Closes #828

See merge request camelot/kickc!51
This commit is contained in:
Jesper Balman Gravgaard 2023-09-03 12:52:41 +00:00
commit ff29404f24
No known key found for this signature in database
10 changed files with 20 additions and 6 deletions

View File

@ -0,0 +1 @@
9c89720b38b42cf93f12706ae83e9b20

View File

@ -0,0 +1 @@
02694dbecf31df6a537f8c92db9408f7d1ded309

View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>cml.kickass</groupId>
<artifactId>kickassembler</artifactId>
<version>5.25-65ce02</version>
<description>POM was created from install:install-file</description>
</project>

View File

@ -0,0 +1 @@
ed253e65ce35f7794d81063c784b48fb

View File

@ -0,0 +1 @@
bd993bd0412662be321ce9eaa585930d72ac1a5a

View File

@ -3,7 +3,7 @@
<groupId>cml.kickass</groupId>
<artifactId>kickassembler</artifactId>
<versioning>
<release>5.24-65ce02.e</release>
<release>5.25-65ce02</release>
<versions>
<version>4.19</version>
<version>5.7</version>
@ -32,7 +32,8 @@
<version>5.24-65ce02.c</version>
<version>5.24-65ce02.d</version>
<version>5.24-65ce02.e</version>
<version>5.25-65ce02</version>
</versions>
<lastUpdated>20220213212400</lastUpdated>
<lastUpdated>20230903123547</lastUpdated>
</versioning>
</metadata>

View File

@ -1 +1 @@
12dc7c134f8dcf276f4031702b11b5d7
00f25e67b07c7f1ac00cbc0b4215a1ff

View File

@ -1 +1 @@
8cc20999d0045eea75ba3fff20b93c212b7cc52a
7a2cfffa2bdf31ea981460383800255457119a53

View File

@ -4,7 +4,7 @@
cp ./repo/cml/kickass/kickassembler/maven-metadata.xml ./repo/cml/kickass/kickassembler/maven-metadata-local.xml
# mvn install:install-file -Dmaven.repo.local=./repo/ -Dfile=/Applications/KickAssembler/KickAss.jar -DgroupId=cml.kickass -DartifactId=kickassembler -Dpackaging=jar -DgeneratePom=true -DcreateChecksum=true -Dversion=5.16
mvn install:install-file -Dmaven.repo.local=./repo/ -Dfile=/Users/jespergravgaard/c64/kickassembler65ce02/out/KickAss65CE02.jar -DgroupId=cml.kickass -DartifactId=kickassembler -Dpackaging=jar -DgeneratePom=true -DcreateChecksum=true -Dversion=5.24-65ce02.e
mvn install:install-file -Dmaven.repo.local=./repo/ -Dfile=/Users/jespergravgaard/c64/kickassembler65ce02/out/KickAss65CE02.jar -DgroupId=cml.kickass -DartifactId=kickassembler -Dpackaging=jar -DgeneratePom=true -DcreateChecksum=true -Dversion=5.25-65ce02
# Finalize by making the local metadata official
pushd ./repo/cml/kickass/kickassembler
@ -12,7 +12,7 @@ mv maven-metadata-local.xml maven-metadata.xml
mv maven-metadata-local.xml.md5 maven-metadata.xml.md5
mv maven-metadata-local.xml.sha1 maven-metadata.xml.sha1
popd
]
# Remove stuff that Maven adds, that we don't need
rm -rf ./repo/classworlds
rm -rf ./repo/junit