You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2021/12/05 23:56:55 UTC
[maven-archetype] branch ARCHETYPE-623 updated (3f7b804 -> aeae39e)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch ARCHETYPE-623
in repository https://gitbox.apache.org/repos/asf/maven-archetype.git.
discard 3f7b804 [ARCHETYPE-623] Require Java 8
add 7a6badd Bump mrm-maven-plugin from 1.2.0 to 1.3.0
add 9e9a42e (ci) correct xsd namespace
add 09a103b [ARCHETYPE-615] - Upgrade maven-artifact-transfer to 0.13.1
add 8bbea09 [ARCHETYPE-601] Update to commons-lang3 3.8.1
add b3ef146 [ARCHETYPE-565] - Unable to resolve groovy.json classes when planting
add 02b30ea Revert "[ARCHETYPE-622] - maven-archetype-plugin integration-test doesn't use Maven settings from the main build"
new aeae39e [ARCHETYPE-623] Require Java 8
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (3f7b804)
\
N -- N -- N refs/heads/ARCHETYPE-623 (aeae39e)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
archetype-common/pom.xml | 2 +-
.../archetype/old/descriptor/sample-archetype.xml | 2 +-
maven-archetype-plugin/pom.xml | 8 +--
.../archetype.properties | 0
.../archetype/pom.xml | 4 +-
.../META-INF/archetype-post-generate.groovy} | 10 +--
.../META-INF/maven/archetype-metadata.xml | 17 +++--
.../src/main/resources/archetype-resources/pom.xml | 0
.../invoker.properties | 0
.../pom.xml | 2 +-
.../project.properties | 2 +-
.../verify.groovy | 6 +-
.../invoker.properties | 19 ------
.../ARCHETYPE-622_main_build_settings/pom.xml | 73 ----------------------
.../src/main/resources/archetype-resources/pom.xml | 50 ---------------
.../archetype-resources/src/main/java/App.java | 36 -----------
.../resources/projects/basic/archetype.properties | 21 -------
.../src/test/resources/projects/basic/goal.txt | 1 -
.../resources/projects/basic/reference/pom.xml | 49 ---------------
.../src/main/java/build/archetype/App.java | 36 -----------
.../test/resources/projects/basic/verify.groovy | 21 -------
.../test-settings.xml | 55 ----------------
.../ARCHETYPE-622_main_build_settings/verify.bsh | 63 -------------------
.../mojos/CreateProjectFromArchetypeMojo.java | 2 +-
.../maven/archetype/mojos/IntegrationTestMojo.java | 27 +-------
.../ui/generation/ArchetypeSelectorUtils.java | 2 +-
.../DefaultArchetypeSelectionQueryer.java | 2 +-
.../ui/generation/DefaultArchetypeSelector.java | 2 +-
pom.xml | 2 +-
29 files changed, 33 insertions(+), 481 deletions(-)
copy maven-archetype-plugin/src/it/projects/{property-setting-cli => ARCHETYPE-565_groovy-json}/archetype.properties (100%)
copy maven-archetype-plugin/src/it/projects/{ARCHETYPE-536_groovy-grape => ARCHETYPE-565_groovy-json}/archetype/pom.xml (93%)
copy maven-archetype-plugin/src/it/projects/{ARCHETYPE-536_groovy-grape/verify.groovy => ARCHETYPE-565_groovy-json/archetype/src/main/resources/META-INF/archetype-post-generate.groovy} (77%)
rename maven-archetype-plugin/src/it/projects/{ARCHETYPE-622_main_build_settings => ARCHETYPE-565_groovy-json/archetype}/src/main/resources/META-INF/maven/archetype-metadata.xml (80%)
copy maven-archetype-plugin/src/it/projects/{ARCHETYPE-536_groovy-grape => ARCHETYPE-565_groovy-json}/archetype/src/main/resources/archetype-resources/pom.xml (100%)
copy maven-archetype-plugin/src/it/projects/{ARCHETYPE-536_groovy-grape => ARCHETYPE-565_groovy-json}/invoker.properties (100%)
copy maven-archetype-plugin/src/it/projects/{ARCHETYPE-536_groovy-grape => ARCHETYPE-565_groovy-json}/pom.xml (97%)
copy maven-archetype-plugin/src/it/projects/{ARCHETYPE-536_groovy-grape => ARCHETYPE-565_groovy-json}/project.properties (95%)
copy maven-archetype-plugin/src/it/projects/{ARCHETYPE-517_failing-goals => ARCHETYPE-565_groovy-json}/verify.groovy (76%)
delete mode 100644 maven-archetype-plugin/src/it/projects/ARCHETYPE-622_main_build_settings/invoker.properties
delete mode 100644 maven-archetype-plugin/src/it/projects/ARCHETYPE-622_main_build_settings/pom.xml
delete mode 100644 maven-archetype-plugin/src/it/projects/ARCHETYPE-622_main_build_settings/src/main/resources/archetype-resources/pom.xml
delete mode 100644 maven-archetype-plugin/src/it/projects/ARCHETYPE-622_main_build_settings/src/main/resources/archetype-resources/src/main/java/App.java
delete mode 100644 maven-archetype-plugin/src/it/projects/ARCHETYPE-622_main_build_settings/src/test/resources/projects/basic/archetype.properties
delete mode 100644 maven-archetype-plugin/src/it/projects/ARCHETYPE-622_main_build_settings/src/test/resources/projects/basic/goal.txt
delete mode 100644 maven-archetype-plugin/src/it/projects/ARCHETYPE-622_main_build_settings/src/test/resources/projects/basic/reference/pom.xml
delete mode 100644 maven-archetype-plugin/src/it/projects/ARCHETYPE-622_main_build_settings/src/test/resources/projects/basic/reference/src/main/java/build/archetype/App.java
delete mode 100644 maven-archetype-plugin/src/it/projects/ARCHETYPE-622_main_build_settings/src/test/resources/projects/basic/verify.groovy
delete mode 100644 maven-archetype-plugin/src/it/projects/ARCHETYPE-622_main_build_settings/test-settings.xml
delete mode 100644 maven-archetype-plugin/src/it/projects/ARCHETYPE-622_main_build_settings/verify.bsh
[maven-archetype] 01/01: [ARCHETYPE-623] Require Java 8
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch ARCHETYPE-623
in repository https://gitbox.apache.org/repos/asf/maven-archetype.git
commit aeae39e48128194c4c4e279eacd554957aa83ae9
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Dec 5 12:15:11 2021 +0100
[ARCHETYPE-623] Require Java 8
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 4c223e1..6e63003 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,7 +75,7 @@
<properties>
<maven.archetype.scm.devConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-archetype.git</maven.archetype.scm.devConnection>
<mavenVersion>3.0</mavenVersion>
- <javaVersion>7</javaVersion>
+ <javaVersion>8</javaVersion>
<netbeans.hint.useExternalMaven>true</netbeans.hint.useExternalMaven>
<wagonVersion>3.3.3</wagonVersion>
<surefire.version>2.22.2</surefire.version>