You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/04/12 08:24:01 UTC
[isis] branch master updated: ISIS-2445: rename artifact isis-parent -> isis-bom
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 51c68122a3 ISIS-2445: rename artifact isis-parent -> isis-bom
51c68122a3 is described below
commit 51c68122a3de6242d35662a87b31d92dc58ee112
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Apr 12 10:23:54 2022 +0200
ISIS-2445: rename artifact isis-parent -> isis-bom
- as this is the Bill of Material
---
.../workflows/ci-build-artifacts-push-maven.yml | 2 +-
.../ROOT/pages/2022/2.0.0-RC1/mignotes.adoc | 15 +++++++++
antora/pom.xml | 4 +--
{parent => bom}/pom.xml | 7 ++--
core/pom.xml | 6 ++--
pom.xml | 6 ++--
tooling/pom.xml | 4 +--
.../projectmodel/test/GradleSettingsTest.java | 39 +++++++++++-----------
8 files changed, 51 insertions(+), 32 deletions(-)
diff --git a/.github/workflows/ci-build-artifacts-push-maven.yml b/.github/workflows/ci-build-artifacts-push-maven.yml
index ef25f77753..367e47e140 100644
--- a/.github/workflows/ci-build-artifacts-push-maven.yml
+++ b/.github/workflows/ci-build-artifacts-push-maven.yml
@@ -81,7 +81,7 @@ jobs:
# -Denforcer.failFast=true ... fail fast on convergence issues (enforcer plugin)
# -T 1C ... 1 build thread per core
MVN_ADDITIONAL_OPTS: >-
- -f isis-parent/pom.xml
+ -f bom/pom.xml
-Dgithub
-Denforcer.failFast=true
-DinstallAtEnd=true -DdeployAtEnd=true
diff --git a/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-RC1/mignotes.adoc b/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-RC1/mignotes.adoc
index 34974c81d7..fed629bd70 100644
--- a/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-RC1/mignotes.adoc
+++ b/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-RC1/mignotes.adoc
@@ -53,3 +53,18 @@ and introducing `Railway<F, S>`
|===
+== Maven
+
+Following Maven artifacts changed:
+[cols="2a,3a", options="header"]
+
+|===
+
+| previously
+| new
+
+| `org.apache.isis:isis-parent` renamed
+| renamed to `org.apache.isis:isis-bom`
+
+|===
+
diff --git a/antora/pom.xml b/antora/pom.xml
index 158149d05d..b5f208ee6d 100644
--- a/antora/pom.xml
+++ b/antora/pom.xml
@@ -16,9 +16,9 @@
<parent>
<groupId>org.apache.isis</groupId>
- <artifactId>isis-parent</artifactId>
+ <artifactId>isis-bom</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath>../isis-parent/pom.xml</relativePath>
+ <relativePath>../bom/pom.xml</relativePath>
</parent>
<artifactId>antora</artifactId>
diff --git a/parent/pom.xml b/bom/pom.xml
similarity index 99%
rename from parent/pom.xml
rename to bom/pom.xml
index d8373b6293..d3bc533a00 100644
--- a/parent/pom.xml
+++ b/bom/pom.xml
@@ -50,7 +50,7 @@ under the License.
</parent>
<groupId>org.apache.isis</groupId>
- <artifactId>isis-parent</artifactId>
+ <artifactId>isis-bom</artifactId>
<version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -73,7 +73,10 @@ under the License.
<!-- APACHE ISIS customisation 2/15: start -->
<name>Apache Isis</name>
- <description>Parent for the core framework + extensions, starter parent pom for starter apps.</description>
+ <description>
+ Apache Isis Bill of Material (BOM).
+ Als the parent POM for the core framework + extensions, starter parent pom for starter apps.
+ </description>
<url>https://isis.apache.org</url>
<inceptionYear>2010</inceptionYear>
diff --git a/core/pom.xml b/core/pom.xml
index 38b442be0d..9afb5082c8 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -16,9 +16,9 @@
<parent>
<groupId>org.apache.isis</groupId>
- <artifactId>isis-parent</artifactId>
+ <artifactId>isis-bom</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath>../isis-parent/pom.xml</relativePath>
+ <relativePath>../bom/pom.xml</relativePath>
</parent>
<groupId>org.apache.isis.core</groupId>
@@ -171,7 +171,7 @@
<shiro.version>1.9.0</shiro.version>
<simpleslackapi.version>1.3.0</simpleslackapi.version>
<slf4j-api.version>1.7.36</slf4j-api.version> <!-- also provided by spring-boot-starter-logging, needed to solve convergence issues -->
- <spring-boot.version>2.6.6</spring-boot.version> <!-- has no effect here, needs to be set in isis-parent/pom.xml -->
+ <spring-boot.version>2.6.6</spring-boot.version> <!-- has no effect here, needs to be set in bom/pom.xml -->
<summernote.version>0.8.11</summernote.version>
<swagger-core.version>1.6.5</swagger-core.version>
diff --git a/pom.xml b/pom.xml
index db7b2de6fe..5789b16fb7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<description>
Convenience aggregator POM that references all modules, some explicitely,
others via profiles, that are not activiated per default.
- The parent POM of the core framework is isis-parent/pom.xml.
+ The parent POM of the core framework is bom/pom.xml.
</description>
<properties>
@@ -61,7 +61,7 @@
also keep profiles in sync with the site documentation
https://github.com/apache/isis/blob/master/antora/components/conguide/modules/ROOT/pages/building-apache-isis.adoc
-->
- <module>parent</module>
+ <module>bom</module>
<module>core</module>
<module>extensions</module>
<module>mappings</module>
@@ -84,7 +84,7 @@
</property>
</activation>
<modules>
- <module>parent</module>
+ <module>bom</module>
<module>core</module>
<module>extensions</module>
<module>mappings</module>
diff --git a/tooling/pom.xml b/tooling/pom.xml
index a1759e2220..ac8f380bae 100644
--- a/tooling/pom.xml
+++ b/tooling/pom.xml
@@ -16,9 +16,9 @@
<parent>
<groupId>org.apache.isis</groupId>
- <artifactId>isis-parent</artifactId>
+ <artifactId>isis-bom</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath>../isis-parent/pom.xml</relativePath>
+ <relativePath>../bom/pom.xml</relativePath>
</parent>
<groupId>org.apache.isis.tooling</groupId>
diff --git a/tooling/projectmodel/src/test/java/org/apache/isis/tooling/projectmodel/test/GradleSettingsTest.java b/tooling/projectmodel/src/test/java/org/apache/isis/tooling/projectmodel/test/GradleSettingsTest.java
index 353a135f9c..7eed6e39f4 100644
--- a/tooling/projectmodel/src/test/java/org/apache/isis/tooling/projectmodel/test/GradleSettingsTest.java
+++ b/tooling/projectmodel/src/test/java/org/apache/isis/tooling/projectmodel/test/GradleSettingsTest.java
@@ -43,7 +43,8 @@ import lombok.val;
class GradleSettingsTest extends ProjectModelTestAbstract {
boolean hasUnresolvableGradleBuildArtifacts;
-
+
+ @Override
@BeforeEach
void setUp() throws Exception {
super.setUp();
@@ -54,7 +55,7 @@ class GradleSettingsTest extends ProjectModelTestAbstract {
void writeGradleSettingsToStdout() throws IOException {
GradleSettings gradleSettings = GradleSettingsFactory.generateFromMaven(projRootFolder, "isis");
assertNotNull(gradleSettings);
-
+
System.out.println();
System.out.println();
System.out.println(String.format("// generated by %s", this.getClass().getName()));
@@ -62,21 +63,21 @@ class GradleSettingsTest extends ProjectModelTestAbstract {
System.out.println();
System.out.println(GradleSettingsWriter.toString(gradleSettings));
}
-
+
@Test
void testGradleSettingGenerator() throws IOException {
GradleSettings gradleSettings = GradleSettingsFactory.generateFromMaven(projRootFolder, "isis");
-
+
assertNotNull(gradleSettings);
-
+
val knownBuildArtifactNames = new HashSet<String>();
-
+
gradleSettings.getBuildArtifactsByArtifactKey().forEach((artifactKey, buildArtifact)->{
knownBuildArtifactNames.add(buildArtifact.getName());
});
-
+
gradleSettings.getBuildArtifactsByArtifactKey().forEach((artifactKey, buildArtifact)->{
-
+
if(buildArtifact.isRoot()) {
return; // skip project's root
}
@@ -85,26 +86,26 @@ class GradleSettingsTest extends ProjectModelTestAbstract {
.ifPresent(buildFile->{
checkBuildFile(buildFile, knownBuildArtifactNames);
});
-
+
});
-
+
assertFalse(hasUnresolvableGradleBuildArtifacts);
}
-
+
// -- HELPER
@SneakyThrows
- private void checkBuildFile(File buildFile, Set<String> knownBuildArtifactNames) {
+ private void checkBuildFile(final File buildFile, final Set<String> knownBuildArtifactNames) {
//System.out.println(String.format("checking %s", buildFile.getAbsolutePath()));
-
+
val lines = _Text.readLinesFromFile(buildFile, StandardCharsets.UTF_8);
for(val line : lines) {
checkBuildFileLine(buildFile, line, knownBuildArtifactNames);
}
-
+
}
- private void checkBuildFileLine(File buildFile, String line, Set<String> knownBuildArtifactNames) {
+ private void checkBuildFileLine(final File buildFile, final String line, final Set<String> knownBuildArtifactNames) {
val buildArtifactName = parseBuildArtifactName(line);
if(buildArtifactName==null) {
return;
@@ -114,9 +115,9 @@ class GradleSettingsTest extends ProjectModelTestAbstract {
System.err.println(String.format("not found '%s' in file '%s'", buildArtifactName, buildFile));
}
}
-
- // compile project(':isis-parent:isis-schema')
- private String parseBuildArtifactName(String line) {
+
+ // compile project(':isis-bom:isis-schema')
+ private String parseBuildArtifactName(final String line) {
int p = line.indexOf("project('");
if(p<0) {
return null;
@@ -129,5 +130,5 @@ class GradleSettingsTest extends ProjectModelTestAbstract {
val buildArtifactName = line.substring(start, end);
return buildArtifactName;
}
-
+
}