You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rz...@apache.org on 2021/12/21 13:12:55 UTC
[tomee] branch master updated (8979325 -> f0fd9c2)
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git.
from 8979325 Regenerate BOMs after dependency updates
new 7b1f8ba TOMEE-3000 - Make sure BOMs are auto-generated during the build so we just need to compare and push if needed. This might be an issue during a release process if git detects changes but we'll see when it comes
new f0fd9c2 Regenerate BOMs after dependency upgrades
The 2 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:
boms/tomee-microprofile-api/pom.xml | 11 -----
boms/tomee-microprofile/pom.xml | 22 ---------
boms/tomee-webprofile-api/pom.xml | 11 -----
boms/tomee-webprofile/pom.xml | 22 ---------
tomee/apache-tomee/pom.xml | 53 +++++++++++++++++++++-
.../org/apache/tomee/bootstrap/GenerateBoms.java | 2 +-
.../src/test/resources/api-pom-template.xml | 0
.../src/test/resources/pom-template.xml | 0
tomee/tomee-bootstrap/pom.xml | 35 --------------
9 files changed, 53 insertions(+), 103 deletions(-)
rename tomee/{tomee-bootstrap => apache-tomee}/src/test/java/org/apache/tomee/bootstrap/GenerateBoms.java (99%)
rename tomee/{tomee-bootstrap => apache-tomee}/src/test/resources/api-pom-template.xml (100%)
rename tomee/{tomee-bootstrap => apache-tomee}/src/test/resources/pom-template.xml (100%)
[tomee] 02/02: Regenerate BOMs after dependency upgrades
Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit f0fd9c269da862c9b95f1371fdb974d14ae58cb9
Author: Richard Zowalla <rz...@apache.org>
AuthorDate: Tue Dec 21 14:12:37 2021 +0100
Regenerate BOMs after dependency upgrades
---
boms/tomee-microprofile-api/pom.xml | 11 -----------
boms/tomee-microprofile/pom.xml | 22 ----------------------
boms/tomee-webprofile-api/pom.xml | 11 -----------
boms/tomee-webprofile/pom.xml | 22 ----------------------
4 files changed, 66 deletions(-)
diff --git a/boms/tomee-microprofile-api/pom.xml b/boms/tomee-microprofile-api/pom.xml
index 0cb99a6..fecb448 100644
--- a/boms/tomee-microprofile-api/pom.xml
+++ b/boms/tomee-microprofile-api/pom.xml
@@ -85,17 +85,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
- <version>1.0</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<version>2.3.9</version>
diff --git a/boms/tomee-microprofile/pom.xml b/boms/tomee-microprofile/pom.xml
index 01c3609..7356e8e 100644
--- a/boms/tomee-microprofile/pom.xml
+++ b/boms/tomee-microprofile/pom.xml
@@ -542,17 +542,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.components</groupId>
- <artifactId>geronimo-connector</artifactId>
- <version>3.1.4</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-transaction</artifactId>
<version>3.1.4</version>
<exclusions>
@@ -596,17 +585,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
- <version>1.0</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo</groupId>
<artifactId>geronimo-health</artifactId>
<version>1.0.1</version>
diff --git a/boms/tomee-webprofile-api/pom.xml b/boms/tomee-webprofile-api/pom.xml
index 91fc16a..b2b351b 100644
--- a/boms/tomee-webprofile-api/pom.xml
+++ b/boms/tomee-webprofile-api/pom.xml
@@ -74,17 +74,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
- <version>1.0</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<version>2.3.9</version>
diff --git a/boms/tomee-webprofile/pom.xml b/boms/tomee-webprofile/pom.xml
index 21ae59f..9e421f1 100644
--- a/boms/tomee-webprofile/pom.xml
+++ b/boms/tomee-webprofile/pom.xml
@@ -333,17 +333,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.components</groupId>
- <artifactId>geronimo-connector</artifactId>
- <version>3.1.4</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-transaction</artifactId>
<version>3.1.4</version>
<exclusions>
@@ -365,17 +354,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
- <version>1.0</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-core</artifactId>
<version>1.2.15</version>
[tomee] 01/02: TOMEE-3000 - Make sure BOMs are auto-generated during the build so we just need to compare and push if needed. This might be an issue during a release process if git detects changes but we'll see when it comes
Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 7b1f8baef12bf2503ce6ccbc0e94900b20b4630e
Author: Richard Zowalla <rz...@apache.org>
AuthorDate: Tue Dec 21 13:39:56 2021 +0100
TOMEE-3000 - Make sure BOMs are auto-generated during the build so we just need to compare and push if needed. This might be an issue during a release process if git detects changes but we'll see when it comes
---
tomee/apache-tomee/pom.xml | 53 +++++++++++++++++++++-
.../org/apache/tomee/bootstrap/GenerateBoms.java | 2 +-
.../src/test/resources/api-pom-template.xml | 0
.../src/test/resources/pom-template.xml | 0
tomee/tomee-bootstrap/pom.xml | 35 --------------
5 files changed, 53 insertions(+), 37 deletions(-)
diff --git a/tomee/apache-tomee/pom.xml b/tomee/apache-tomee/pom.xml
index 67de3af..b66bbc1 100644
--- a/tomee/apache-tomee/pom.xml
+++ b/tomee/apache-tomee/pom.xml
@@ -144,6 +144,14 @@
<version>${tomcat.version}</version>
<scope>provided</scope>
</dependency>
+
+ <!-- needed for BOM generation -->
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>1.18.20</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -157,7 +165,12 @@
<filtering>false</filtering>
</resource>
</resources>
-
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
</build>
<profiles>
@@ -562,6 +575,25 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>3.0.0</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <includeProjectDependencies>true</includeProjectDependencies>
+ <includePluginDependencies>false</includePluginDependencies>
+ <classpathScope>test</classpathScope>
+ <mainClass>org.apache.tomee.bootstrap.GenerateBoms</mainClass>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
@@ -772,6 +804,25 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>3.0.0</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <includeProjectDependencies>true</includeProjectDependencies>
+ <includePluginDependencies>false</includePluginDependencies>
+ <classpathScope>test</classpathScope>
+ <mainClass>org.apache.tomee.bootstrap.GenerateBoms</mainClass>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
diff --git a/tomee/tomee-bootstrap/src/test/java/org/apache/tomee/bootstrap/GenerateBoms.java b/tomee/apache-tomee/src/test/java/org/apache/tomee/bootstrap/GenerateBoms.java
similarity index 99%
rename from tomee/tomee-bootstrap/src/test/java/org/apache/tomee/bootstrap/GenerateBoms.java
rename to tomee/apache-tomee/src/test/java/org/apache/tomee/bootstrap/GenerateBoms.java
index 4941539..727db63 100644
--- a/tomee/tomee-bootstrap/src/test/java/org/apache/tomee/bootstrap/GenerateBoms.java
+++ b/tomee/apache-tomee/src/test/java/org/apache/tomee/bootstrap/GenerateBoms.java
@@ -69,7 +69,7 @@ public class GenerateBoms {
public GenerateBoms() {
/*
* Resolve all project paths relative to this built class
- * that lives in `tomee/tomee-bootstrap/target/test-classes/`
+ * that lives in `tomee/apache-tomee/target/test-classes/`
*
* We walk backwards from that directory till we find the
* project root and then we can build all relative paths
diff --git a/tomee/tomee-bootstrap/src/test/resources/api-pom-template.xml b/tomee/apache-tomee/src/test/resources/api-pom-template.xml
similarity index 100%
rename from tomee/tomee-bootstrap/src/test/resources/api-pom-template.xml
rename to tomee/apache-tomee/src/test/resources/api-pom-template.xml
diff --git a/tomee/tomee-bootstrap/src/test/resources/pom-template.xml b/tomee/apache-tomee/src/test/resources/pom-template.xml
similarity index 100%
rename from tomee/tomee-bootstrap/src/test/resources/pom-template.xml
rename to tomee/apache-tomee/src/test/resources/pom-template.xml
diff --git a/tomee/tomee-bootstrap/pom.xml b/tomee/tomee-bootstrap/pom.xml
index 825bde3..5c5cfb9 100644
--- a/tomee/tomee-bootstrap/pom.xml
+++ b/tomee/tomee-bootstrap/pom.xml
@@ -36,35 +36,6 @@
<tomee.build.name>${project.groupId}.tomee.catalina</tomee.build.name>
</properties>
- <build>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>3.0.0</version>
- <executions>
- <execution>
- <!--<phase>package</phase>-->
- <goals>
- <goal>java</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <includeProjectDependencies>true</includeProjectDependencies>
- <includePluginDependencies>false</includePluginDependencies>
- <classpathScope>test</classpathScope>
- <mainClass>org.apache.tomee.bootstrap.GenerateBoms</mainClass>
- </configuration>
- </plugin>
- </plugins>
- </build>
<dependencies>
<dependency>
<groupId>org.apache.tomcat</groupId>
@@ -93,12 +64,6 @@
<artifactId>openejb-core</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>1.18.20</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>