From 99476f7d8231d0c78c43057767397f1ff5964ea9 Mon Sep 17 00:00:00 2001 From: Alexander Kriegisch Date: Wed, 5 May 2021 16:21:53 +0700 Subject: Provision libraries in 'lib' automatically Upon special request by Andy Clement, I included 'lib' as a child module in the parent POM again, making several modules which refer to downloaded library files dependent the 'lib' module. I am not sure I caught all of them, but I hope so. Now after cloning the project and configuring the token for reading from GitHub Packages (sorry!), you can just run a Maven build for the main project and no longer need to fail the first build, read the Maven Enforcer message and run 'cd lib && mvn compile' as a first step. This convenience comes at the price of a more complex POM and two new profiles: - Profile 'provision-libs' is auto-activated by the absence of a marker file, kicking off the library provisioning process and creating same marker file at the end, if successful. Therefore, during subsequent builds libraries will not be re-provisioned, because the marker file exists and Maven skips all download and (un)zip steps, which saves build time and bandwidth. Otherwise offline builds would not work either. - Profile 'clean-libs' needs to be activated manually, because by default 'mvn clean' will not erase provisioned libraries. In most cases, even after a clean a developer does not want to re-provision all libraries if they have not changed (e.g. new JDT Core build). But if you do wish too erase the libraries and the marker file, just call 'cd lib && mvn -P clean-libs clean'. Please note: The Maven Enforcer build step, which additionally checks for existence of other files, still exists and was moved from the parent POM to 'libs'. No matter if provisioning was just done or skipped because the main marker file exists, a quick heuristic check for that list of files is done during each build, failing the build with a comprehensive message if an inconsistency was found. The error message says which files are missing and tells the user: "There is an inconsistency in module subdirectory 'lib'. Please run 'mvn --projects lib -P clean-libs clean compile'. This should take care of cleaning and freshly downloading all necessary libraries to that directory, where some tests expect them to be." This should cover the topic. Signed-off-by: Alexander Kriegisch --- .gitignore | 3 +- ajde.core/pom.xml | 5 + ajdoc/pom.xml | 6 + bcel-builder/pom.xml | 8 + build/pom.xml | 5 + docs/pom.xml | 9 + lib/pom.xml | 1267 ++++++++++++++++++++++------------------- org.aspectj.ajdt.core/pom.xml | 6 + pom.xml | 51 +- run-all-junit-tests/pom.xml | 6 + taskdefs/pom.xml | 6 + testing-util/pom.xml | 5 + testing/pom.xml | 6 + tests/pom.xml | 6 + util/pom.xml | 9 + weaver/pom.xml | 6 + 16 files changed, 773 insertions(+), 631 deletions(-) diff --git a/.gitignore b/.gitignore index 002bcb352..d0b7450be 100644 --- a/.gitignore +++ b/.gitignore @@ -31,7 +31,8 @@ log.txt # No idea where these come from bin/ -# Downloaded libraries used during tests +# Downloaded libraries used during tests + marker file +/lib/provisioned.marker /lib/ant/ /lib/commons/ /lib/docbook/ diff --git a/ajde.core/pom.xml b/ajde.core/pom.xml index 59b588f69..3121c4f49 100644 --- a/ajde.core/pom.xml +++ b/ajde.core/pom.xml @@ -12,6 +12,11 @@ ajde.core + + + org.aspectj + lib + org.aspectj util diff --git a/ajdoc/pom.xml b/ajdoc/pom.xml index 787f27600..e071e10c3 100644 --- a/ajdoc/pom.xml +++ b/ajdoc/pom.xml @@ -28,6 +28,12 @@ + + + org.aspectj + lib + test + org.aspectj util diff --git a/bcel-builder/pom.xml b/bcel-builder/pom.xml index b1c8038bb..2188c7918 100644 --- a/bcel-builder/pom.xml +++ b/bcel-builder/pom.xml @@ -11,4 +11,12 @@ bcel-builder + + + + org.aspectj + lib + + + diff --git a/build/pom.xml b/build/pom.xml index 477689b27..302d90388 100644 --- a/build/pom.xml +++ b/build/pom.xml @@ -12,6 +12,11 @@ build + + + org.aspectj + lib + ant diff --git a/docs/pom.xml b/docs/pom.xml index bc20408d8..edefc4f93 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -87,6 +87,15 @@ + + + + + org.aspectj + lib + + + diff --git a/lib/pom.xml b/lib/pom.xml index 1e624c460..50c870682 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -33,626 +33,719 @@ + provisioned.marker apache-ant ${lib.ant.name}-${lib.ant.version} - - + - - org.apache.maven.plugins - maven-enforcer-plugin - - - - enforce-libraries-exist - none - - - + + + provision-libs - - com.googlecode.maven-download-plugin - download-maven-plugin - 1.6.1 - - - download-ant-binaries - generate-resources - - wget - - - https://archive.apache.org/dist/ant/binaries/${lib.ant.artifact}-bin.zip - ant - 3fa9f816a0c4c63249efad8e6225f2e83794f0c0 - - - - download-ant-sources - generate-resources - - wget - - - https://archive.apache.org/dist/ant/source/${lib.ant.artifact}-src.zip - ant - b9f3c8c31bb6c9069ad5b655059a17769af12f20 - - - - download-beanutils-sources - generate-resources - - wget - - - https://github.com/apache/commons-beanutils/archive/refs/tags/${lib.commons.beanutils.tag}.zip - commons - commons-beanutils-${lib.commons.beanutils.version}-sources.jar - b2c02afe7e6475cd7c811932b8415d171a8afa00 - - - - download-collections-sources - generate-resources - - wget - - - https://github.com/apache/commons-collections/archive/refs/tags/${lib.commons.collections.tag}.zip - commons - commons-collections-${lib.commons.collections.version}-sources.jar - 824cacd0aafe21a94fb142388fd62f28a12df5ef - - - - download-digester-sources - generate-resources - - wget - - - https://github.com/apache/commons-digester/archive/refs/tags/${lib.commons.digester.tag}.zip - commons - commons-digester-${lib.commons.digester.version}-sources.jar - 49f653c7ea726301c564f9662b72c051fee9390a - - - - download-logging-sources - generate-resources - - wget - - - https://github.com/apache/commons-logging/archive/refs/tags/${lib.commons.logging.tag}.zip - commons - commons-logging-${lib.commons.logging.version}-sources.jar - c61a373f6d50ff8fcfba900934f7254d44f9735b - - - - download-docbook-dtd - generate-resources - - wget - - - https://www.oasis-open.org/docbook/xml/4.1.2/docbkx412.zip - docbook - docbkx412.zip - b9ae7a41056bfaf885581812d60651b7b5531519 - - - - download-docbook-xsl - generate-resources - - wget - - - https://sourceforge.net/projects/docbook/files/OldFiles/docbook-xsl-1.44.zip/download - docbook - docbook-xsl-1.44.zip - 626e7bee806ea14812f6f95cc2d187ab6ba9114a - - - - - - + + + + ${lib.provisioned.marker} + + - - org.apache.maven.plugins - maven-dependency-plugin - 3.1.2 - - - copy - generate-resources - - copy - - - - - - - org.aspectj - org.eclipse.jdt.core - ${jdt.core.version} - jar - false - jdtcore-aj - jdtcore-for-aspectj.jar - - - - org.aspectj - org.eclipse.jdt.core - ${jdt.core.version} - java-source - sources - false - jdtcore-aj - jdtcore-for-aspectj-src.zip - - - - - com.googlecode.jarjar - jarjar - 1.3 - jar - false - jarjar - jarjar-1.3.jar - - - - junit - junit - 3.8.1 - jar - false - junit - junit.jar - - - - - junit - junit - 3.8.1 - jar - false - ant/lib - junit.jar - - - - junit - junit - 3.8.1 - jar - sources - false - junit - junit-src.zip - - - - - - - saxon - saxon - 6.5.3 - jar - false - saxon - saxon.jar - - - - regexp - regexp - ${lib.regexp.version} - jar - false - regexp - jakarta-regexp-1.2.jar - - - - - - - commons-beanutils - commons-beanutils - ${lib.commons.beanutils.version} - jar - false + + + + + + com.googlecode.maven-download-plugin + download-maven-plugin + 1.6.1 + + + download-ant-binaries + generate-resources + + wget + + + https://archive.apache.org/dist/ant/binaries/${lib.ant.artifact}-bin.zip + ant + 3fa9f816a0c4c63249efad8e6225f2e83794f0c0 + + + + download-ant-sources + generate-resources + + wget + + + https://archive.apache.org/dist/ant/source/${lib.ant.artifact}-src.zip + ant + b9f3c8c31bb6c9069ad5b655059a17769af12f20 + + + + download-beanutils-sources + generate-resources + + wget + + + https://github.com/apache/commons-beanutils/archive/refs/tags/${lib.commons.beanutils.tag}.zip commons - commons-beanutils-${lib.commons.beanutils.version}.jar - - - - - commons-collections - commons-collections - 2.0 - jar - false + commons-beanutils-${lib.commons.beanutils.version}-sources.jar + b2c02afe7e6475cd7c811932b8415d171a8afa00 + + + + download-collections-sources + generate-resources + + wget + + + https://github.com/apache/commons-collections/archive/refs/tags/${lib.commons.collections.tag}.zip commons - commons-collections-2.0.jar - - - - - commons-digester - commons-digester - ${lib.commons.digester.version} - jar - false + commons-collections-${lib.commons.collections.version}-sources.jar + 824cacd0aafe21a94fb142388fd62f28a12df5ef + + + + download-digester-sources + generate-resources + + wget + + + https://github.com/apache/commons-digester/archive/refs/tags/${lib.commons.digester.tag}.zip commons - commons-digester-${lib.commons.digester.version}.jar - - - - - commons-logging - commons-logging - ${lib.commons.logging.version} - jar - false + commons-digester-${lib.commons.digester.version}-sources.jar + 49f653c7ea726301c564f9662b72c051fee9390a + + + + download-logging-sources + generate-resources + + wget + + + https://github.com/apache/commons-logging/archive/refs/tags/${lib.commons.logging.tag}.zip commons - commons-logging-${lib.commons.logging.version}.jar - - - - - - fop - fop - 0.20.5 - jar - false + commons-logging-${lib.commons.logging.version}-sources.jar + c61a373f6d50ff8fcfba900934f7254d44f9735b + + + + download-docbook-dtd + generate-resources + + wget + + + https://www.oasis-open.org/docbook/xml/4.1.2/docbkx412.zip docbook - fop.jar - - - - batik - batik-1.5-fop - 0.20-5 - jar - false + docbkx412.zip + b9ae7a41056bfaf885581812d60651b7b5531519 + + + + download-docbook-xsl + generate-resources + + wget + + + https://sourceforge.net/projects/docbook/files/OldFiles/docbook-xsl-1.44.zip/download docbook - batik.jar - + docbook-xsl-1.44.zip + 626e7bee806ea14812f6f95cc2d187ab6ba9114a + + + + + + - - - - - + + + org.apache.maven.plugins + maven-dependency-plugin + 3.1.2 + + + copy + generate-resources + + copy + + + - - org.codehaus.mojo - truezip-maven-plugin - 1.2 - - - - unzip-ant-binaries - process-resources - - copy - - - true - - ant/${lib.ant.artifact}-bin.zip/${lib.ant.artifact} - ant - - - - - zip-ant-sources - process-resources - - copy - - - true - - ant/${lib.ant.artifact}-src.zip/${lib.ant.artifact}/src/main - ant/ant-src.zip - - - - - zip-beanutils-binaries - process-resources - - copy - - - true - - commons/commons-beanutils-${lib.commons.beanutils.version}.jar - commons/commons.jar - - - - - zip-collections-binaries - process-resources - - copy - - - true - - commons/commons-collections-${lib.commons.collections.version}.jar - commons/commons.jar - - - - - zip-digester-binaries - process-resources - - copy - - - true - - commons/commons-digester-${lib.commons.digester.version}.jar - commons/commons.jar - - - - - zip-logging-binaries - process-resources - - copy - - - true - - commons/commons-logging-${lib.commons.logging.version}.jar - commons/commons.jar - - - - - zip-beanutils-sources - process-resources - - copy - - - true - - commons/commons-beanutils-${lib.commons.beanutils.version}-sources.jar/commons-beanutils-${lib.commons.beanutils.tag}/src/java - commons/commons-src.zip - - - - - zip-collections-sources - process-resources - - copy - - - true - - commons/commons-collections-${lib.commons.collections.version}-sources.jar/commons-collections-${lib.commons.collections.tag}/src/java - commons/commons-src.zip - - - - - zip-digester-sources - process-resources - - copy - - - true - - commons/commons-digester-${lib.commons.digester.version}-sources.jar/commons-digester-${lib.commons.digester.tag}/src/java - commons/commons-src.zip - - - - - zip-logging-sources - process-resources - - copy - - - true - - commons/commons-logging-${lib.commons.logging.version}-sources.jar/commons-logging-${lib.commons.logging.tag}/src/java - commons/commons-src.zip - - - - - unzip-docbook-dtd - process-resources - - copy - - - true - - docbook/docbkx412.zip - docbook/docbook-dtd - - - - - unzip-docbook-xsl - process-resources - - copy - - - true - - docbook/docbook-xsl-1.44.zip/docbook-xsl-1.44 - docbook/docbook-xsl - - - - + org.aspectj + org.eclipse.jdt.core + ${jdt.core.version} + jar + false + jdtcore-aj + jdtcore-for-aspectj.jar + + + + org.aspectj + org.eclipse.jdt.core + ${jdt.core.version} + java-source + sources + false + jdtcore-aj + jdtcore-for-aspectj-src.zip + - mvn -Dfile=jdiff.jar -DrepositoryId=github -Durl=https://maven.pkg.github.com/kriegaex/aspectj-packages - -DgroupId=jdiff -DartifactId=jdiff -Dpackaging=jar -Dversion=1.3 - deploy:deploy-file + + + com.googlecode.jarjar + jarjar + 1.3 + jar + false + jarjar + jarjar-1.3.jar + + + + junit + junit + 3.8.1 + jar + false + junit + junit.jar + + + + + junit + junit + 3.8.1 + jar + false + ant/lib + junit.jar + + + + junit + junit + 3.8.1 + jar + sources + false + junit + junit-src.zip + - mvn -Dfile=jdiff-src.zip -DrepositoryId=github -Durl=https://maven.pkg.github.com/kriegaex/aspectj-packages - -DgroupId=jdiff -DartifactId=jdiff -Dpackaging=jar -Dversion=1.3 - -Dtypes=java-source -Dclassifier=sources - deploy:deploy-file + + + + + saxon + saxon + 6.5.3 + jar + false + saxon + saxon.jar + + + + regexp + regexp + ${lib.regexp.version} + jar + false + regexp + jakarta-regexp-1.2.jar + + + + + + + commons-beanutils + commons-beanutils + ${lib.commons.beanutils.version} + jar + false + commons + commons-beanutils-${lib.commons.beanutils.version}.jar + + + + + commons-collections + commons-collections + 2.0 + jar + false + commons + commons-collections-2.0.jar + + + + + commons-digester + commons-digester + ${lib.commons.digester.version} + jar + false + commons + commons-digester-${lib.commons.digester.version}.jar + + + + + commons-logging + commons-logging + ${lib.commons.logging.version} + jar + false + commons + commons-logging-${lib.commons.logging.version}.jar + + + + + + fop + fop + 0.20.5 + jar + false + docbook + fop.jar + + + + batik + batik-1.5-fop + 0.20-5 + jar + false + docbook + batik.jar + + + + + + + + + + + org.codehaus.mojo + truezip-maven-plugin + 1.2 + + + + unzip-ant-binaries + process-resources + + copy + + + true + + ant/${lib.ant.artifact}-bin.zip/${lib.ant.artifact} + ant + + + + + zip-ant-sources + process-resources + + copy + + + true + + ant/${lib.ant.artifact}-src.zip/${lib.ant.artifact}/src/main + ant/ant-src.zip + + + + + zip-beanutils-binaries + process-resources + + copy + + + true + + commons/commons-beanutils-${lib.commons.beanutils.version}.jar + commons/commons.jar + + + + + zip-collections-binaries + process-resources + + copy + + + true + + commons/commons-collections-${lib.commons.collections.version}.jar + commons/commons.jar + + + + + zip-digester-binaries + process-resources + + copy + + + true + + commons/commons-digester-${lib.commons.digester.version}.jar + commons/commons.jar + + + + + zip-logging-binaries + process-resources + + copy + + + true + + commons/commons-logging-${lib.commons.logging.version}.jar + commons/commons.jar + + + + + zip-beanutils-sources + process-resources + + copy + + + true + + commons/commons-beanutils-${lib.commons.beanutils.version}-sources.jar/commons-beanutils-${lib.commons.beanutils.tag}/src/java + commons/commons-src.zip + + + + + zip-collections-sources + process-resources + + copy + + + true + + commons/commons-collections-${lib.commons.collections.version}-sources.jar/commons-collections-${lib.commons.collections.tag}/src/java + commons/commons-src.zip + + + + + zip-digester-sources + process-resources + + copy + + + true + + commons/commons-digester-${lib.commons.digester.version}-sources.jar/commons-digester-${lib.commons.digester.tag}/src/java + commons/commons-src.zip + + + + + zip-logging-sources + process-resources + + copy + + + true + + commons/commons-logging-${lib.commons.logging.version}-sources.jar/commons-logging-${lib.commons.logging.tag}/src/java + commons/commons-src.zip + + + + + unzip-docbook-dtd + process-resources + + copy + + + true + + docbook/docbkx412.zip + docbook/docbook-dtd + + + + + unzip-docbook-xsl + process-resources + + copy + + + true + + docbook/docbook-xsl-1.44.zip/docbook-xsl-1.44 + docbook/docbook-xsl + + + + + + + - The second command yields an error, trying to re-upload a POM, but that is no problem because the POM would - be identical to the one already uploaded with the first command. - --> - - + + org.codehaus.mojo + build-helper-maven-plugin + + + create-marker-file + process-resources + + bsh-property + + + + + + + + + + + + + org.aspectj + org.eclipse.jdt.core + + + + + + + + clean-libs + + + + + org.apache.maven.plugins + maven-clean-plugin + + + clean-up-libs + clean + + clean + + + + + . + + ${lib.provisioned.marker} + ant/** + commons/** + docbook/** + jarjar/** + + + jdtcore-aj/** + junit/** + regexp/** + saxon/** + + false + + + + + + + + + + + + + + + + org.apache.maven.plugins - maven-clean-plugin + maven-enforcer-plugin - clean-up-libs - clean + enforce-libraries-exist + process-resources - clean + enforce - - - . - - ant/** - commons/** - docbook/** - jarjar/** - - - jdtcore-aj/** - junit/** - regexp/** - saxon/** - - false - - + + + + + There is an inconsistency in module subdirectory 'lib'. Please run 'mvn --projects lib -P clean-libs clean compile'. This should take care of cleaning and freshly downloading all necessary libraries to that directory, where some tests expect them to be. + + + ${lib.provisioned.marker} + ant/bin/ant.bat + ant/lib/junit.jar + commons/commons.jar + docbook/docbook-dtd/docbookx.dtd + docbook/docbook-xsl/html/chunk.xsl + docbook/fop.jar + docbook/batik.jar + jarjar/jarjar-1.3.jar + jdtcore-aj/jdtcore-for-aspectj.jar + junit/junit.jar + regexp/jakarta-regexp-1.2.jar + saxon/saxon.jar + + + + true - - - - org.aspectj - org.eclipse.jdt.core - - - diff --git a/org.aspectj.ajdt.core/pom.xml b/org.aspectj.ajdt.core/pom.xml index f77796cb2..747fce918 100644 --- a/org.aspectj.ajdt.core/pom.xml +++ b/org.aspectj.ajdt.core/pom.xml @@ -12,6 +12,12 @@ org.aspectj.ajdt.core + + + org.aspectj + lib + test + org.aspectj bridge diff --git a/pom.xml b/pom.xml index 8f5a31b2a..a6da6f707 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,6 @@ 1.0.1 LOGGING_1_0_1 9.1 - ${maven.multiModuleProjectDirectory}/lib @@ -47,6 +46,7 @@ + lib util bridge testing-util @@ -73,7 +73,6 @@ @@ -279,51 +278,11 @@ junit:junit:jar + org.aspectj:lib:jar - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-libraries-exist - - enforce - - - - - - - Please go to module subdirectory 'lib' and run 'mvn compile' there. This should take care of downloading all necessary libraries to that directory, where some tests expect them to be. - - - ${lib.directory}/ant/bin/ant.bat - ${lib.directory}/ant/lib/junit.jar - ${lib.directory}/commons/commons.jar - ${lib.directory}/docbook/docbook-dtd/docbookx.dtd - ${lib.directory}/docbook/docbook-xsl/html/chunk.xsl - ${lib.directory}/docbook/fop.jar - ${lib.directory}/docbook/batik.jar - ${lib.directory}/jarjar/jarjar-1.3.jar - ${lib.directory}/jdtcore-aj/jdtcore-for-aspectj.jar - ${lib.directory}/junit/junit.jar - ${lib.directory}/regexp/jakarta-regexp-1.2.jar - ${lib.directory}/saxon/saxon.jar - - - - true - - - - - @@ -364,6 +323,12 @@ asm-renamed ${asm.version} + + + org.aspectj + lib + ${project.version} + diff --git a/run-all-junit-tests/pom.xml b/run-all-junit-tests/pom.xml index fb21ee685..c1d3a1fe4 100644 --- a/run-all-junit-tests/pom.xml +++ b/run-all-junit-tests/pom.xml @@ -13,6 +13,12 @@ + + + org.aspectj + lib + test + org.aspectj util diff --git a/taskdefs/pom.xml b/taskdefs/pom.xml index db1c8a3cc..d44faf2ca 100644 --- a/taskdefs/pom.xml +++ b/taskdefs/pom.xml @@ -12,6 +12,12 @@ taskdefs + + + org.aspectj + lib + test + org.aspectj util diff --git a/testing-util/pom.xml b/testing-util/pom.xml index 384852893..0acc00a08 100644 --- a/testing-util/pom.xml +++ b/testing-util/pom.xml @@ -12,6 +12,11 @@ testing-util + + + org.aspectj + lib + org.aspectj util diff --git a/testing/pom.xml b/testing/pom.xml index eeb45de81..dfd975838 100644 --- a/testing/pom.xml +++ b/testing/pom.xml @@ -12,6 +12,12 @@ testing + + + org.aspectj + lib + test + org.aspectj util diff --git a/tests/pom.xml b/tests/pom.xml index ae2fbcca4..95f91d838 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -13,6 +13,12 @@ + + + org.aspectj + lib + test + org.aspectj util diff --git a/util/pom.xml b/util/pom.xml index fd34a7700..4d65e69ec 100644 --- a/util/pom.xml +++ b/util/pom.xml @@ -11,4 +11,13 @@ util + + + + org.aspectj + lib + test + + + diff --git a/weaver/pom.xml b/weaver/pom.xml index acac5dfde..b812ffba1 100644 --- a/weaver/pom.xml +++ b/weaver/pom.xml @@ -12,6 +12,12 @@ weaver + + + org.aspectj + lib + test + org.aspectj util -- cgit v1.2.3 From 2bc4985745f9568436a47e74feddd5a90f1bf4d7 Mon Sep 17 00:00:00 2001 From: Alexander Kriegisch Date: Wed, 5 May 2021 16:41:56 +0700 Subject: Remove obsolete separate GitHub build step for provisioning libraries Signed-off-by: Alexander Kriegisch --- .github/workflows/maven.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index bd6b9de64..585f75ac3 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -31,9 +31,6 @@ jobs: ./mvnw -B --version ant -version - - name: Download + install test libraries - run: ./mvnw -B --settings .mvn/settings-read-github-packages.xml --file lib/pom.xml compile - - name: Compile + package code run: ./mvnw -B --settings .mvn/settings-read-github-packages.xml --file pom.xml -DskipTests package -- cgit v1.2.3 From 45cf22e08c42573c0da63f1486059e2eb6348f51 Mon Sep 17 00:00:00 2001 From: Alexander Kriegisch Date: Wed, 5 May 2021 17:41:54 +0700 Subject: Bump download-maven-plugin 1.6.1 -> 1.6.3 In the previous GitHub build, there were warnings in the log because of failed downloads. Actually, the default is to fail the build, but that did not happen. Let us try a more recent version, maybe it fixes an old bug, even though in the diff between the versions I did not see anything obvious here. Anyway, I created an issue ticket: https://github.com/maven-download-plugin/maven-download-plugin/issues/185 BTW, our build only failed later during the Maven Enforcer sanity check, because several files from the check list were missing after a seemingly successful provisioning. Actually, I am glad I added this "redundant" double-checking step to the build, otherwise the build would not have failed in the 'lib' module but much later in a hard to detect spot. Signed-off-by: Alexander Kriegisch --- lib/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pom.xml b/lib/pom.xml index 50c870682..22a8a15bb 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -58,7 +58,7 @@ com.googlecode.maven-download-plugin download-maven-plugin - 1.6.1 + 1.6.3 download-ant-binaries -- cgit v1.2.3 From 3134e569917ce3f8c8054fd1b4c05e9bd981a365 Mon Sep 17 00:00:00 2001 From: Alexander Kriegisch Date: Thu, 6 May 2021 11:54:37 +0700 Subject: Improve 'name' tags in POMs I tripped over not finding aspectjtools in my IntelliJ Maven view many times, because it was listed as "AspectJ Compiler". So I renamed it to "AspectJ Tools (Compiler)". Now it resembles more the artifact ID and still retains the information that it is the artifact containing AJC. For the 'lib' module I removed the 'name' tag again, because it is not one of the main artifacts we publish. Now the POMs are more like Andy might have intended them to be, using a human-readable 'name' only for the main artifacts. Signed-off-by: Alexander Kriegisch --- aspectjtools/pom.xml | 2 +- lib/pom.xml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/aspectjtools/pom.xml b/aspectjtools/pom.xml index 7860f3a5a..7f9f1063a 100644 --- a/aspectjtools/pom.xml +++ b/aspectjtools/pom.xml @@ -11,7 +11,7 @@ aspectjtools - AspectJ Compiler + AspectJ Tools (Compiler) diff --git a/lib/pom.xml b/lib/pom.xml index 22a8a15bb..78e5d8d47 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -12,7 +12,6 @@ lib - AspectJ Test Libraries This module downloads + installs libraries used by many tests, especially those running as Ant jobs. You should not build this module during every build because it is somewhat slow, downloading stuff from 3rd-party websites, -- cgit v1.2.3 From a57efcafcfbab31635048cac9e02bbc55276573c Mon Sep 17 00:00:00 2001 From: Alexander Kriegisch Date: Fri, 7 May 2021 05:23:14 +0700 Subject: Move Enforcer Plugin to 'compile' phase in 'lib' There is a strange effect in Maven builds: Depending on which profiles are active when building the project - even seemingly unrelated ones like 'create-docs' or 'clean-libs' - the execution order of plugins in the 'process-resources' phase can vary. Specifically, Build Helper vs. Enforcer in module 'lib', which both were in the same phase, can sometimes be executed in lexical order, which I expected, or the other way around, which makes the build fail if the existence of the marker file is checked by Enforcer before Build Helper even had a chance to create it. Probably, this is because Build Helper is defined inside a profile and Enforcer outside of any. Therefore, the safest way to ensure correct ordering of the two is to place Enforcer in a later phase, in this case 'compile'. Signed-off-by: Alexander Kriegisch --- lib/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pom.xml b/lib/pom.xml index 78e5d8d47..e2a186b38 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -708,7 +708,7 @@ enforce-libraries-exist - process-resources + compile enforce -- cgit v1.2.3