This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/main by this push:
new 38099bb05a Revert "Revert "Revert a too aggressive sed on the version
upgrade""
38099bb05a is described below
commit 38099bb05abc2a371f0658eae63bef4e3ca97e1f
Author: Jean-Louis Monteiro <[email protected]>
AuthorDate: Thu Jan 5 15:13:11 2023 +0100
Revert "Revert "Revert a too aggressive sed on the version upgrade""
This reverts commit ec0fbe8329bab0d80e2a83f2d8fafea75d022bc6.
---
.../org/apache/tomee/installer/InstallerTest.java | 114 ++++++++++-----------
1 file changed, 57 insertions(+), 57 deletions(-)
diff --git
a/tomee/tomee-common/src/test/java/org/apache/tomee/installer/InstallerTest.java
b/tomee/tomee-common/src/test/java/org/apache/tomee/installer/InstallerTest.java
index ec4cb7e8fa..6e3ce9e0ee 100644
---
a/tomee/tomee-common/src/test/java/org/apache/tomee/installer/InstallerTest.java
+++
b/tomee/tomee-common/src/test/java/org/apache/tomee/installer/InstallerTest.java
@@ -25,77 +25,77 @@ public class InstallerTest {
@Test
public void normalizeVersion() {
- assertVersion("openejb-api-10.0.0-SNAPSHOT.jar",
"openejb-api-8.0.7-20210418.032427-163.jar");
- assertVersion("openejb-client-10.0.0-SNAPSHOT.jar",
"openejb-client-8.0.7-20210418.032621-163.jar");
- assertVersion("openejb-core-10.0.0-SNAPSHOT.jar",
"openejb-core-8.0.7-20210418.032600-163.jar");
- assertVersion("openejb-core-eclipselink-10.0.0-SNAPSHOT.jar",
"openejb-core-eclipselink-8.0.7-20210418.033130-163.jar");
- assertVersion("openejb-cxf-10.0.0-SNAPSHOT.jar",
"openejb-cxf-8.0.7-20210418.032810-163.jar");
- assertVersion("openejb-cxf-rs-10.0.0-SNAPSHOT.jar",
"openejb-cxf-rs-8.0.7-20210418.032736-163.jar");
- assertVersion("openejb-cxf-transport-10.0.0-SNAPSHOT.jar",
"openejb-cxf-transport-8.0.7-20210418.032721-163.jar");
- assertVersion("openejb-derbynet-10.0.0-SNAPSHOT.jar",
"openejb-derbynet-10.0.0-SNAPSHOT.jar");
- assertVersion("openejb-ejbd-10.0.0-SNAPSHOT.jar",
"openejb-ejbd-8.0.7-20210418.032656-163.jar");
- assertVersion("openejb-hsql-10.0.0-SNAPSHOT.jar",
"openejb-hsql-8.0.7-20210418.032814-163.jar");
- assertVersion("openejb-http-10.0.0-SNAPSHOT.jar",
"openejb-http-8.0.7-20210418.032703-163.jar");
- assertVersion("openejb-javaagent-10.0.0-SNAPSHOT.jar",
"openejb-javaagent-8.0.7-20210418.032436-163.jar");
+ assertVersion("openejb-api-8.0.7-SNAPSHOT.jar",
"openejb-api-8.0.7-20210418.032427-163.jar");
+ assertVersion("openejb-client-8.0.7-SNAPSHOT.jar",
"openejb-client-8.0.7-20210418.032621-163.jar");
+ assertVersion("openejb-core-8.0.7-SNAPSHOT.jar",
"openejb-core-8.0.7-20210418.032600-163.jar");
+ assertVersion("openejb-core-eclipselink-8.0.7-SNAPSHOT.jar",
"openejb-core-eclipselink-8.0.7-20210418.033130-163.jar");
+ assertVersion("openejb-cxf-8.0.7-SNAPSHOT.jar",
"openejb-cxf-8.0.7-20210418.032810-163.jar");
+ assertVersion("openejb-cxf-rs-8.0.7-SNAPSHOT.jar",
"openejb-cxf-rs-8.0.7-20210418.032736-163.jar");
+ assertVersion("openejb-cxf-transport-8.0.7-SNAPSHOT.jar",
"openejb-cxf-transport-8.0.7-20210418.032721-163.jar");
+ assertVersion("openejb-derbynet-8.0.7-SNAPSHOT.jar",
"openejb-derbynet-8.0.7-SNAPSHOT.jar");
+ assertVersion("openejb-ejbd-8.0.7-SNAPSHOT.jar",
"openejb-ejbd-8.0.7-20210418.032656-163.jar");
+ assertVersion("openejb-hsql-8.0.7-SNAPSHOT.jar",
"openejb-hsql-8.0.7-20210418.032814-163.jar");
+ assertVersion("openejb-http-8.0.7-SNAPSHOT.jar",
"openejb-http-8.0.7-20210418.032703-163.jar");
+ assertVersion("openejb-javaagent-8.0.7-SNAPSHOT.jar",
"openejb-javaagent-8.0.7-20210418.032436-163.jar");
assertVersion("openejb-javaagent.jar", "openejb-javaagent.jar");
- assertVersion("openejb-jee-10.0.0-SNAPSHOT.jar",
"openejb-jee-8.0.7-20210418.032447-163.jar");
- assertVersion("openejb-jee-accessors-10.0.0-SNAPSHOT.jar",
"openejb-jee-accessors-8.0.7-20210418.032458-163.jar");
- assertVersion("openejb-jpa-integration-10.0.0-SNAPSHOT.jar",
"openejb-jpa-integration-8.0.7-20210418.032423-164.jar");
- assertVersion("openejb-loader-10.0.0-SNAPSHOT.jar",
"openejb-loader-8.0.7-20210418.032432-163.jar");
- assertVersion("openejb-rest-10.0.0-SNAPSHOT.jar",
"openejb-rest-8.0.7-20210418.032713-163.jar");
- assertVersion("openejb-server-10.0.0-SNAPSHOT.jar",
"openejb-server-8.0.7-20210418.032647-163.jar");
- assertVersion("openejb-webservices-10.0.0-SNAPSHOT.jar",
"openejb-webservices-8.0.7-20210418.032756-163.jar");
- assertVersion("tomee-catalina-10.0.0-SNAPSHOT.jar",
"tomee-catalina-10.0.0-SNAPSHOT.jar");
- assertVersion("tomee-common-10.0.0-SNAPSHOT.jar",
"tomee-common-10.0.0-SNAPSHOT.jar");
- assertVersion("tomee-config-10.0.0-SNAPSHOT.jar",
"tomee-config-8.0.7-20210418.032613-163.jar");
- assertVersion("tomee-jaxrs-10.0.0-SNAPSHOT.jar",
"tomee-jaxrs-10.0.0-SNAPSHOT.jar");
- assertVersion("tomee-jdbc-10.0.0-SNAPSHOT.jar",
"tomee-jdbc-8.0.7-20210418.032642-163.jar");
- assertVersion("tomee-loader-10.0.0-SNAPSHOT.jar",
"tomee-loader-10.0.0-SNAPSHOT.jar");
- assertVersion("tomee-mojarra-10.0.0-SNAPSHOT.jar",
"tomee-mojarra-8.0.7-20210418.032823-163.jar");
+ assertVersion("openejb-jee-8.0.7-SNAPSHOT.jar",
"openejb-jee-8.0.7-20210418.032447-163.jar");
+ assertVersion("openejb-jee-accessors-8.0.7-SNAPSHOT.jar",
"openejb-jee-accessors-8.0.7-20210418.032458-163.jar");
+ assertVersion("openejb-jpa-integration-8.0.7-SNAPSHOT.jar",
"openejb-jpa-integration-8.0.7-20210418.032423-164.jar");
+ assertVersion("openejb-loader-8.0.7-SNAPSHOT.jar",
"openejb-loader-8.0.7-20210418.032432-163.jar");
+ assertVersion("openejb-rest-8.0.7-SNAPSHOT.jar",
"openejb-rest-8.0.7-20210418.032713-163.jar");
+ assertVersion("openejb-server-8.0.7-SNAPSHOT.jar",
"openejb-server-8.0.7-20210418.032647-163.jar");
+ assertVersion("openejb-webservices-8.0.7-SNAPSHOT.jar",
"openejb-webservices-8.0.7-20210418.032756-163.jar");
+ assertVersion("tomee-catalina-8.0.7-SNAPSHOT.jar",
"tomee-catalina-8.0.7-SNAPSHOT.jar");
+ assertVersion("tomee-common-8.0.7-SNAPSHOT.jar",
"tomee-common-8.0.7-SNAPSHOT.jar");
+ assertVersion("tomee-config-8.0.7-SNAPSHOT.jar",
"tomee-config-8.0.7-20210418.032613-163.jar");
+ assertVersion("tomee-jaxrs-8.0.7-SNAPSHOT.jar",
"tomee-jaxrs-8.0.7-SNAPSHOT.jar");
+ assertVersion("tomee-jdbc-8.0.7-SNAPSHOT.jar",
"tomee-jdbc-8.0.7-20210418.032642-163.jar");
+ assertVersion("tomee-loader-8.0.7-SNAPSHOT.jar",
"tomee-loader-8.0.7-SNAPSHOT.jar");
+ assertVersion("tomee-mojarra-8.0.7-SNAPSHOT.jar",
"tomee-mojarra-8.0.7-20210418.032823-163.jar");
assertVersion("tomee-plume-webapp-9.0.0-M7-SNAPSHOT.jar",
"tomee-plume-webapp-9.0.0-M7-SNAPSHOT.jar");
- assertVersion("tomee-security-10.0.0-SNAPSHOT.jar",
"tomee-security-8.0.7-20210418.033034-163.jar");
- assertVersion("tomee-webservices-10.0.0-SNAPSHOT.jar",
"tomee-webservices-8.0.7-20210418.032838-163.jar");
+ assertVersion("tomee-security-8.0.7-SNAPSHOT.jar",
"tomee-security-8.0.7-20210418.033034-163.jar");
+ assertVersion("tomee-webservices-8.0.7-SNAPSHOT.jar",
"tomee-webservices-8.0.7-20210418.032838-163.jar");
}
@Test
public void normalizeOddVersion() {
- assertVersion("openejb-api-10.0.0-SNAPSHOT.jar",
"openejb-api-8.0.7-20210418.032427-163.jar");
- assertVersion("openejb-client-10.0.0-SNAPSHOT.jar",
"openejb-client-8.0.7-20210418.032621-163.jar");
- assertVersion("openejb-core-10.0.0-SNAPSHOT.jar",
"openejb-core-8.0.7-20210418.032600-163.jar");
- assertVersion("openejb-core-eclipselink-10.0.0-SNAPSHOT.jar",
"openejb-core-eclipselink-8.0.7-20210418.033130-163.jar");
- assertVersion("openejb-cxf-10.0.0-SNAPSHOT.jar",
"openejb-cxf-8.0.7-20210418.032810-163.jar");
- assertVersion("openejb-cxf-rs-10.0.0-SNAPSHOT.jar",
"openejb-cxf-rs-8.0.7-20210418.032736-163.jar");
- assertVersion("openejb-cxf-transport-10.0.0-SNAPSHOT.jar",
"openejb-cxf-transport-8.0.7-20210418.032721-163.jar");
- assertVersion("openejb-derbynet-10.0.0-SNAPSHOT.jar",
"openejb-derbynet-10.0.0-SNAPSHOT.jar");
- assertVersion("openejb-ejbd-10.0.0-SNAPSHOT.jar",
"openejb-ejbd-8.0.7-20210418.032656-163.jar");
- assertVersion("openejb-hsql-10.0.0-SNAPSHOT.jar",
"openejb-hsql-8.0.7-20210418.032814-163.jar");
- assertVersion("openejb-http-10.0.0-SNAPSHOT.jar",
"openejb-http-8.0.7-20210418.032703-163.jar");
- assertVersion("openejb-javaagent-10.0.0-SNAPSHOT.jar",
"openejb-javaagent-8.0.7-20210418.032436-163.jar");
+ assertVersion("openejb-api-8.0.7-SNAPSHOT.jar",
"openejb-api-8.0.7-20210418.032427-163.jar");
+ assertVersion("openejb-client-8.0.7-SNAPSHOT.jar",
"openejb-client-8.0.7-20210418.032621-163.jar");
+ assertVersion("openejb-core-8.0.7-SNAPSHOT.jar",
"openejb-core-8.0.7-20210418.032600-163.jar");
+ assertVersion("openejb-core-eclipselink-8.0.7-SNAPSHOT.jar",
"openejb-core-eclipselink-8.0.7-20210418.033130-163.jar");
+ assertVersion("openejb-cxf-8.0.7-SNAPSHOT.jar",
"openejb-cxf-8.0.7-20210418.032810-163.jar");
+ assertVersion("openejb-cxf-rs-8.0.7-SNAPSHOT.jar",
"openejb-cxf-rs-8.0.7-20210418.032736-163.jar");
+ assertVersion("openejb-cxf-transport-8.0.7-SNAPSHOT.jar",
"openejb-cxf-transport-8.0.7-20210418.032721-163.jar");
+ assertVersion("openejb-derbynet-8.0.7-SNAPSHOT.jar",
"openejb-derbynet-8.0.7-SNAPSHOT.jar");
+ assertVersion("openejb-ejbd-8.0.7-SNAPSHOT.jar",
"openejb-ejbd-8.0.7-20210418.032656-163.jar");
+ assertVersion("openejb-hsql-8.0.7-SNAPSHOT.jar",
"openejb-hsql-8.0.7-20210418.032814-163.jar");
+ assertVersion("openejb-http-8.0.7-SNAPSHOT.jar",
"openejb-http-8.0.7-20210418.032703-163.jar");
+ assertVersion("openejb-javaagent-8.0.7-SNAPSHOT.jar",
"openejb-javaagent-8.0.7-20210418.032436-163.jar");
assertVersion("openejb-javaagent.jar", "openejb-javaagent.jar");
- assertVersion("openejb-jee-10.0.0-SNAPSHOT.jar",
"openejb-jee-8.0.7-20210418.032447-163.jar");
- assertVersion("openejb-jee-accessors-10.0.0-SNAPSHOT.jar",
"openejb-jee-accessors-8.0.7-20210418.032458-163.jar");
- assertVersion("openejb-jpa-integration-10.0.0-SNAPSHOT.jar",
"openejb-jpa-integration-8.0.7-20210418.032423-164.jar");
- assertVersion("openejb-loader-10.0.0-SNAPSHOT.jar",
"openejb-loader-8.0.7-20210418.032432-163.jar");
- assertVersion("openejb-rest-10.0.0-SNAPSHOT.jar",
"openejb-rest-8.0.7-20210418.032713-163.jar");
- assertVersion("openejb-server-10.0.0-SNAPSHOT.jar",
"openejb-server-8.0.7-20210418.032647-163.jar");
- assertVersion("openejb-webservices-10.0.0-SNAPSHOT.jar",
"openejb-webservices-8.0.7-20210418.032756-163.jar");
- assertVersion("tomee-catalina-10.0.0-SNAPSHOT.jar",
"tomee-catalina-10.0.0-SNAPSHOT.jar");
- assertVersion("tomee-common-10.0.0-SNAPSHOT.jar",
"tomee-common-10.0.0-SNAPSHOT.jar");
- assertVersion("tomee-config-10.0.0-SNAPSHOT.jar",
"tomee-config-8.0.7-20210418.032613-163.jar");
- assertVersion("tomee-jaxrs-10.0.0-SNAPSHOT.jar",
"tomee-jaxrs-10.0.0-SNAPSHOT.jar");
- assertVersion("tomee-jdbc-10.0.0-SNAPSHOT.jar",
"tomee-jdbc-8.0.7-20210418.032642-163.jar");
- assertVersion("tomee-loader-10.0.0-SNAPSHOT.jar",
"tomee-loader-10.0.0-SNAPSHOT.jar");
- assertVersion("tomee-mojarra-10.0.0-SNAPSHOT.jar",
"tomee-mojarra-8.0.7-20210418.032823-163.jar");
+ assertVersion("openejb-jee-8.0.7-SNAPSHOT.jar",
"openejb-jee-8.0.7-20210418.032447-163.jar");
+ assertVersion("openejb-jee-accessors-8.0.7-SNAPSHOT.jar",
"openejb-jee-accessors-8.0.7-20210418.032458-163.jar");
+ assertVersion("openejb-jpa-integration-8.0.7-SNAPSHOT.jar",
"openejb-jpa-integration-8.0.7-20210418.032423-164.jar");
+ assertVersion("openejb-loader-8.0.7-SNAPSHOT.jar",
"openejb-loader-8.0.7-20210418.032432-163.jar");
+ assertVersion("openejb-rest-8.0.7-SNAPSHOT.jar",
"openejb-rest-8.0.7-20210418.032713-163.jar");
+ assertVersion("openejb-server-8.0.7-SNAPSHOT.jar",
"openejb-server-8.0.7-20210418.032647-163.jar");
+ assertVersion("openejb-webservices-8.0.7-SNAPSHOT.jar",
"openejb-webservices-8.0.7-20210418.032756-163.jar");
+ assertVersion("tomee-catalina-8.0.7-SNAPSHOT.jar",
"tomee-catalina-8.0.7-SNAPSHOT.jar");
+ assertVersion("tomee-common-8.0.7-SNAPSHOT.jar",
"tomee-common-8.0.7-SNAPSHOT.jar");
+ assertVersion("tomee-config-8.0.7-SNAPSHOT.jar",
"tomee-config-8.0.7-20210418.032613-163.jar");
+ assertVersion("tomee-jaxrs-8.0.7-SNAPSHOT.jar",
"tomee-jaxrs-8.0.7-SNAPSHOT.jar");
+ assertVersion("tomee-jdbc-8.0.7-SNAPSHOT.jar",
"tomee-jdbc-8.0.7-20210418.032642-163.jar");
+ assertVersion("tomee-loader-8.0.7-SNAPSHOT.jar",
"tomee-loader-8.0.7-SNAPSHOT.jar");
+ assertVersion("tomee-mojarra-8.0.7-SNAPSHOT.jar",
"tomee-mojarra-8.0.7-20210418.032823-163.jar");
assertVersion("tomee-plume-webapp-9.0.0-M7-SNAPSHOT.jar",
"tomee-plume-webapp-9.0.0-M7-SNAPSHOT.jar");
- assertVersion("tomee-security-10.0.0-SNAPSHOT.jar",
"tomee-security-8.0.7-20210418.033034-163.jar");
- assertVersion("tomee-webservices-10.0.0-SNAPSHOT.jar",
"tomee-webservices-8.0.7-20210418.032838-163.jar");
+ assertVersion("tomee-security-8.0.7-SNAPSHOT.jar",
"tomee-security-8.0.7-20210418.033034-163.jar");
+ assertVersion("tomee-webservices-8.0.7-SNAPSHOT.jar",
"tomee-webservices-8.0.7-20210418.032838-163.jar");
}
private static void assertVersion(final String expected, final String
jarName) {
- final String s = Installer.removeDatestamp("10.0.0-SNAPSHOT", jarName);
+ final String s = Installer.removeDatestamp("8.0.7-SNAPSHOT", jarName);
assertEquals(expected, s);
}
}
