diff --git a/.github/workflows/parparvm-tests.yml b/.github/workflows/parparvm-tests.yml index 74d6461c5c..6001b8346f 100644 --- a/.github/workflows/parparvm-tests.yml +++ b/.github/workflows/parparvm-tests.yml @@ -35,7 +35,7 @@ jobs: sudo apt-get install -y clang - name: Run ParparVM JVM tests - working-directory: vm/tests + working-directory: vm run: mvn -B test - name: Publish ByteCodeTranslator quality previews diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index b3604dc0f8..63d8289add 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -239,16 +239,16 @@ jobs: run: ant -noinput -buildfile Ports/iOSPort/build.xml jar - name: Build iOS VM API - run: ant -noinput -buildfile vm/JavaAPI/build.xml jar + run: mvn -f vm/JavaAPI/pom.xml package - name: Upload a Build Artifact uses: actions/upload-artifact@v4 with: name: JavaAPI.jar - path: vm/JavaAPI/dist/JavaAPI.jar + path: vm/JavaAPI/target/JavaAPI-1.0-SNAPSHOT.jar - name: Build iOS VM - run: ant -noinput -buildfile vm/ByteCodeTranslator/build.xml jar + run: mvn -f vm/ByteCodeTranslator/pom.xml package - name: Build CLDC 11 VM run: ant -noinput -buildfile Ports/CLDC11/build.xml jar @@ -257,7 +257,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: ByteCodeTranslator.jar - path: vm/ByteCodeTranslator/dist/ByteCodeTranslator.jar + path: vm/ByteCodeTranslator/target/ByteCodeTranslator-1.0-SNAPSHOT.jar - name: Upload a Build Artifact uses: actions/upload-artifact@v4 diff --git a/.gitignore b/.gitignore index 0d12a7309f..53d7701c21 100644 --- a/.gitignore +++ b/.gitignore @@ -81,3 +81,4 @@ pom.xml.tag !.brokk/style.md !.brokk/review.md !.brokk/project.properties +dependency-reduced-pom.xml diff --git a/vm/ByteCodeTranslator/pom.xml b/vm/ByteCodeTranslator/pom.xml new file mode 100644 index 0000000000..7b7b2ae294 --- /dev/null +++ b/vm/ByteCodeTranslator/pom.xml @@ -0,0 +1,83 @@ + + 4.0.0 + + + com.codename1.parparvm + parparvm-parent + 1.0-SNAPSHOT + + + ByteCodeTranslator + jar + ByteCodeTranslator + + + + org.ow2.asm + asm + + + org.ow2.asm + asm-commons + + + org.ow2.asm + asm-tree + + + + + src + + + src + + **/*.java + + + + + + org.apache.maven.plugins + maven-shade-plugin + 3.5.0 + + + package + + shade + + + + + com.codename1.tools.translator.ByteCodeTranslator + + + + + + + + maven-antrun-plugin + 3.1.0 + + + package + + + + + + + + run + + + + + + + diff --git a/vm/JavaAPI/pom.xml b/vm/JavaAPI/pom.xml new file mode 100644 index 0000000000..a74120c9bb --- /dev/null +++ b/vm/JavaAPI/pom.xml @@ -0,0 +1,53 @@ + + 4.0.0 + + + com.codename1.parparvm + parparvm-parent + 1.0-SNAPSHOT + + + JavaAPI + jar + JavaAPI + + + src + + + org.apache.maven.plugins + maven-compiler-plugin + 3.11.0 + + 1.5 + 1.5 + + + -Xlint:-options + + + + + maven-antrun-plugin + 3.1.0 + + + package + + + + + + + + run + + + + + + + diff --git a/vm/pom.xml b/vm/pom.xml new file mode 100644 index 0000000000..1a77b37ae0 --- /dev/null +++ b/vm/pom.xml @@ -0,0 +1,50 @@ + + 4.0.0 + + com.codename1.parparvm + parparvm-parent + 1.0-SNAPSHOT + pom + ParparVM Parent + + + ByteCodeTranslator + JavaAPI + tests + + + + 1.5 + 1.5 + UTF-8 + 5.0.3 + 5.10.2 + + + + + + org.ow2.asm + asm + ${asm.version} + + + org.ow2.asm + asm-commons + ${asm.version} + + + org.ow2.asm + asm-tree + ${asm.version} + + + org.junit.jupiter + junit-jupiter + ${junit.jupiter.version} + + + + diff --git a/vm/tests/pom.xml b/vm/tests/pom.xml index fec2ad3e4d..1474388680 100644 --- a/vm/tests/pom.xml +++ b/vm/tests/pom.xml @@ -3,45 +3,49 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.codename1.parparvm + + com.codename1.parparvm + parparvm-parent + 1.0-SNAPSHOT + + parparvm-tests - 1.0-SNAPSHOT ParparVM Java Tests - - 1.8 - 1.8 - UTF-8 - 5.10.2 - 5.0.3 - - + + com.codename1.parparvm + ByteCodeTranslator + 1.0-SNAPSHOT + org.ow2.asm asm - ${asm.version} org.ow2.asm asm-commons - ${asm.version} org.junit.jupiter junit-jupiter - ${junit.jupiter.version} test - - - ../ByteCodeTranslator/src - - + + org.apache.maven.plugins + maven-compiler-plugin + 3.11.0 + + + + 1.8 + 1.8 + + org.apache.maven.plugins maven-surefire-plugin @@ -50,25 +54,6 @@ false - - org.codehaus.mojo - build-helper-maven-plugin - 3.5.0 - - - add-bytecodetranslator-sources - generate-sources - - add-source - - - - ../ByteCodeTranslator/src - - - - - org.jacoco jacoco-maven-plugin