diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml index 2c5bafbcfb..cea30d03a7 100644 --- a/.github/workflows/ant.yml +++ b/.github/workflows/ant.yml @@ -22,7 +22,7 @@ jobs: - name: Build with Maven run: | cd maven - xvfb-run -a mvn install + xvfb-run -a mvn install -Plocal-dev-javase - name: Fetch archetype projects @@ -34,8 +34,8 @@ jobs: run: | unzip cn1-maven-archetypes.zip cd cn1-maven-archetypes-master - xvfb-run -a mvn install archetype:update-local-catalog - xvfb-run -a mvn archetype:crawl + xvfb-run -a mvn install archetype:update-local-catalog -Plocal-dev-javase + xvfb-run -a mvn archetype:crawl -Plocal-dev-javase - name: Run Maven Unit Tests run: | pwd diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 73be8315a4..f154e817ea 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -30,7 +30,7 @@ jobs: - name: Run Unit Tests run: | cd maven - mvn clean verify -DunitTests=true -pl core-unittests -am -Dmaven.javadoc.skip=true + mvn clean verify -DunitTests=true -pl core-unittests -am -Dmaven.javadoc.skip=true -Plocal-dev-javase cd .. - name: Install dependencies run: | @@ -53,8 +53,8 @@ jobs: mkdir -p build/tempJavaSources mkdir -p dist mkdir -p dist/javadoc - wget https://github.com/codenameone/JavaDocSourceEmbed/releases/download/refs%2Fheads%2Fmaster/JavaDocSourceEmbed-1.0-SNAPSHOT.jar - java -jar JavaDocSourceEmbed-1.0-SNAPSHOT.jar src build/tempJavaSources + # Skip JavaDocSourceEmbed due to gist access issues in CI + cp -r src/* build/tempJavaSources/ find build/tempJavaSources ../Ports/CLDC11/src -name "*.java" | /usr/bin/grep -v /impl/ | /usr/bin/xargs javadoc --allow-script-in-comments -protected -d dist/javadoc -windowtitle "Codename One API" || true cd dist/javadoc zip -r ../../javadocs.zip * diff --git a/.github/workflows/release-on-maven-central.yml b/.github/workflows/release-on-maven-central.yml index ff71ccc52e..9efc7f1cfa 100644 --- a/.github/workflows/release-on-maven-central.yml +++ b/.github/workflows/release-on-maven-central.yml @@ -25,18 +25,21 @@ jobs: git config --global user.name "GitHub Actions Bot" git config --global user.email "github-actions@codenameone.com" + - name: Check Maven Version + run: mvn -v + - name: Deploy with Maven run: | cat $HOME/.m2/settings.xml cd maven bash update-version.sh "$GITHUB_REF_NAME" export GPG_TTY=$(tty) - xvfb-run -a mvn deploy -Psign-artifacts -Dgpg.passphrase=$MAVEN_GPG_PASSPHRASE + xvfb-run -a mvn deploy -Psign-artifacts -Dgpg.passphrase=$MAVEN_GPG_PASSPHRASE -Plocal-dev-javase cd .. git clone https://github.com/shannah/cn1-maven-archetypes cd cn1-maven-archetypes bash update-version.sh "$GITHUB_REF_NAME" - xvfb-run -a mvn deploy -Psign-artifacts -Dgpg.passphrase=$MAVEN_GPG_PASSPHRASE + xvfb-run -a mvn deploy -Psign-artifacts -Dgpg.passphrase=$MAVEN_GPG_PASSPHRASE -Plocal-dev-javase env: MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} MAVEN_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} diff --git a/.gitignore b/.gitignore index 651ab100ba..28db48121c 100644 --- a/.gitignore +++ b/.gitignore @@ -69,4 +69,5 @@ target pom.xml.versionsBackup pom.xml.releaseBackup pom.xml.tag -!maven/**/*.zip \ No newline at end of file +!maven/**/*.zip +**/.flattened-pom.xml diff --git a/README.md b/README.md index f258e1e60c..685620525d 100644 --- a/README.md +++ b/README.md @@ -185,9 +185,11 @@ The setup is covered in depth in [this article and video](https://www.codenameon ~~~~ git clone https://github.com/codenameone/CodenameOne cd CodenameOne/maven -mvn install +mvn install -Plocal-dev-javase ~~~~ +NOTE: The `-Plocal-dev-javase` profile is necessary for building the javase port. Without it, you'll get build errors. + This will build and install Codename One in your local Maven repository. This process can take a while since it automatically downloads dependencies with a size of ~1GB. @@ -196,7 +198,7 @@ To build the archetype projects from source, you should check out the [cn1-maven ~~~~ git clone https://github.com/shannah/cn1-maven-archetypes cd cn1-maven-archetypes -mvn install +mvn install -Plocal-dev-javase ~~~~ @@ -204,7 +206,7 @@ Now that Codename One is installed in your local Maven repository, you can use t A new testing project can be quickly generated with the [Codename One initializr](https://start.codenameone.com). After downloading and extracting the project, open its pom.xml file and and look for the `` and `` properties. -Then change these to point to the version that got installed into your *local* maven repository by `mvn install`. The locally built version will usually be a SNAPSHOT version (e.g. 7.0.21-SNAPSHOT). +Then change these to point to the version that got installed into your *local* maven repository by `mvn install -Plocal-dev-javase`. The locally built version will usually be a SNAPSHOT version (e.g. 7.0.21-SNAPSHOT). ### Quick Start with Ant diff --git a/maven/javase/pom.xml b/maven/javase/pom.xml index 834f20eb1e..1a76566ef0 100644 --- a/maven/javase/pom.xml +++ b/maven/javase/pom.xml @@ -53,7 +53,10 @@ local-dev-javase - true + + codename1.platform + javase + diff --git a/maven/pom.xml b/maven/pom.xml index f1530ede8a..dcf57b567b 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -409,7 +409,7 @@ org.sonatype.central central-publishing-maven-plugin - 0.7.0 + 0.8.0 true central diff --git a/maven/sqlite-jdbc/dependency-reduced-pom.xml b/maven/sqlite-jdbc/dependency-reduced-pom.xml index 517d306e9c..2f7d5d4c38 100644 --- a/maven/sqlite-jdbc/dependency-reduced-pom.xml +++ b/maven/sqlite-jdbc/dependency-reduced-pom.xml @@ -1,98 +1,99 @@ - - - - codenameone - com.codenameone - 8.0-SNAPSHOT - - 4.0.0 - sqlite-jdbc - 8.0-SNAPSHOT - - - - maven-source-plugin - 3.2.1 - - - - jar - - - - - - maven-shade-plugin - 3.3.0 - - - package - - shade - - - - - org.slf4j - com.codename1.compat.sqlite.slf4j - - - - - - - - maven-dependency-plugin - 3.1.2 - - - copy-javadoc - package - - copy - - - - - org.xerial - sqlite-jdbc - ${sqlite.jdbc.version} - javadoc - sqlite-jdbc-javadoc.jar - - - ${project.build.directory} - - - - - - maven-jar-plugin - 3.2.0 - - - attach-javadoc - package - - jar - - - javadoc - - - true - - - - sqlite-jdbc-javadoc.jar - - - - - - - - - 3.46.1.0 - - + + + + codenameone + com.codenameone + 8.0-SNAPSHOT + + 4.0.0 + sqlite-jdbc + sqlite-jdbc + 8.0-SNAPSHOT + + + + maven-source-plugin + 3.2.1 + + + + jar + + + + + + maven-shade-plugin + 3.3.0 + + + package + + shade + + + + + org.slf4j + com.codename1.compat.sqlite.slf4j + + + + + + + + maven-dependency-plugin + 3.1.2 + + + copy-javadoc + package + + copy + + + + + org.xerial + sqlite-jdbc + ${sqlite.jdbc.version} + javadoc + sqlite-jdbc-javadoc.jar + + + ${project.build.directory} + + + + + + maven-jar-plugin + 3.2.0 + + + attach-javadoc + package + + jar + + + javadoc + + + true + + + + sqlite-jdbc-javadoc.jar + + + + + + + + + 3.46.1.0 + +