diff --git a/deployments/intersmash-deployments-provider/pom.xml b/deployments/intersmash-deployments-provider/pom.xml index 538865db1..215d5af69 100644 --- a/deployments/intersmash-deployments-provider/pom.xml +++ b/deployments/intersmash-deployments-provider/pom.xml @@ -25,21 +25,10 @@ - org.apache.maven.plugins maven-surefire-plugin - - - org.apache.maven.plugins - maven-deploy-plugin - @@ -94,5 +83,35 @@ eap + + doc + + + + org.apache.maven.plugins + maven-source-plugin + + + org.apache.maven.plugins + maven-javadoc-plugin + + + + + + publish + + + + org.apache.maven.plugins + maven-deploy-plugin + + + org.apache.maven.plugins + maven-gpg-plugin + + + + diff --git a/deployments/intersmash-deployments-provider/src/test/java/org/jboss/intersmash/deployments/IntersmashSharedDeploymentsTest.java b/deployments/intersmash-deployments-provider/src/test/java/org/jboss/intersmash/deployments/IntersmashSharedDeploymentsTest.java index d156acf8c..4d232c5a2 100644 --- a/deployments/intersmash-deployments-provider/src/test/java/org/jboss/intersmash/deployments/IntersmashSharedDeploymentsTest.java +++ b/deployments/intersmash-deployments-provider/src/test/java/org/jboss/intersmash/deployments/IntersmashSharedDeploymentsTest.java @@ -22,13 +22,6 @@ import org.junit.jupiter.api.Test; public class IntersmashSharedDeploymentsTest { - @Test - public void testBareMetalBootableJarIsAvailable() { - // jakarta - assertBootableJarIsAvailable(IntersmashSharedDeployments.bootableJarDemoBareMetal()); - // javax - assertBootableJarIsAvailable(IntersmashSharedDeployments.bootableJarJavaxDemoBareMetal()); - } @Test public void testOpenShiftBootableJarIsAvailable() { @@ -38,22 +31,6 @@ public void testOpenShiftBootableJarIsAvailable() { assertBootableJarIsAvailable(IntersmashSharedDeployments.bootableJarJavaxDemoOpenShift()); } - @Test - public void testBareMetalAndOpenShiftBootableJarAreNotTheSame() { - // jakarta - assertBareMetalAndOpenShiftBootableJarAreNotTheSame(IntersmashSharedDeployments.bootableJarDemoBareMetal(), - IntersmashSharedDeployments.bootableJarDemoOpenShift()); - // javax - assertBareMetalAndOpenShiftBootableJarAreNotTheSame(IntersmashSharedDeployments.bootableJarJavaxDemoBareMetal(), - IntersmashSharedDeployments.bootableJarJavaxDemoOpenShift()); - } - - private static void assertBareMetalAndOpenShiftBootableJarAreNotTheSame(final Path bareMetalBootableJarPath, - final Path openShiftBootableJarPath) { - Assertions.assertNotEquals(bareMetalBootableJarPath.toAbsolutePath().toString(), - openShiftBootableJarPath.toAbsolutePath().toString()); - } - private static void assertBootableJarIsAvailable(final Path openShiftApp) { Assertions.assertNotNull(openShiftApp); Assertions.assertTrue(Files.exists(openShiftApp)); diff --git a/deployments/intersmash-deployments-shared/intersmash-deployments-shared-wildfly/wildfly-bootable-jar-javax/maven/bootable-jar-baremetal b/deployments/intersmash-deployments-shared/intersmash-deployments-shared-wildfly/wildfly-bootable-jar-javax/maven/bootable-jar-baremetal deleted file mode 100644 index e69de29bb..000000000 diff --git a/deployments/intersmash-deployments-shared/intersmash-deployments-shared-wildfly/wildfly-bootable-jar/maven/bootable-jar-baremetal b/deployments/intersmash-deployments-shared/intersmash-deployments-shared-wildfly/wildfly-bootable-jar/maven/bootable-jar-baremetal deleted file mode 100644 index e69de29bb..000000000 diff --git a/deployments/intersmash-deployments-shared/pom.xml b/deployments/intersmash-deployments-shared/pom.xml index 234dcefff..0df260f9b 100644 --- a/deployments/intersmash-deployments-shared/pom.xml +++ b/deployments/intersmash-deployments-shared/pom.xml @@ -56,14 +56,6 @@ org.apache.maven.plugins maven-surefire-plugin - - - org.apache.maven.plugins - maven-deploy-plugin - diff --git a/deployments/pom.xml b/deployments/pom.xml index c8e019a67..8a8e6cf74 100644 --- a/deployments/pom.xml +++ b/deployments/pom.xml @@ -84,34 +84,18 @@ - - - - - org.apache.maven.plugins - maven-deploy-plugin - - - - - openshift + publish - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - none - - + maven-deploy-plugin + + + org.apache.maven.plugins + maven-gpg-plugin diff --git a/pom.xml b/pom.xml index 5d3e5b6dc..0138f95a7 100644 --- a/pom.xml +++ b/pom.xml @@ -2,11 +2,37 @@ 4.0.0 + org.jboss.intersmash intersmash-parent 0.0.1-SNAPSHOT pom + Intersmash Parent: Aggregator + Intersmash - Run your cloud-native tests with Java! + http://github.com/Intersmash/intersmash + + + + The Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + + + Fabio Burzigotti + fburzigo@redhat.com + Red Hat + http://www.redhat.com + + + + + scm:git:git://github.com/Intersmash/intersmash.git + scm:git:ssh://github.com:Intersmash/intersmash.git + http://github.com/Intersmash/intersmash/tree/main + tools @@ -75,7 +101,7 @@ 3.2.0 3.0.0-M1 3.2.1 - 3.3.0 + 3.5.0 org.apache.maven.plugins maven-deploy-plugin @@ -595,6 +647,26 @@ demos + + publish + + + + + org.apache.maven.plugins + maven-deploy-plugin + + + org.apache.maven.plugins + maven-gpg-plugin + + + + diff --git a/tools/intersmash-tools-core/pom.xml b/tools/intersmash-tools-core/pom.xml index b8ec02ca2..91bcbde03 100644 --- a/tools/intersmash-tools-core/pom.xml +++ b/tools/intersmash-tools-core/pom.xml @@ -70,4 +70,37 @@ test + + + + doc + + + + org.apache.maven.plugins + maven-source-plugin + + + org.apache.maven.plugins + maven-javadoc-plugin + + + + + + publish + + + + org.apache.maven.plugins + maven-deploy-plugin + + + org.apache.maven.plugins + maven-gpg-plugin + + + + + diff --git a/tools/intersmash-tools-provisioners/pom.xml b/tools/intersmash-tools-provisioners/pom.xml index ee0bb2f66..16d496bf9 100644 --- a/tools/intersmash-tools-provisioners/pom.xml +++ b/tools/intersmash-tools-provisioners/pom.xml @@ -250,4 +250,40 @@ + + + + doc + + + + org.apache.maven.plugins + maven-source-plugin + + + org.apache.maven.plugins + maven-javadoc-plugin + + none + + + + + + + publish + + + + org.apache.maven.plugins + maven-deploy-plugin + + + org.apache.maven.plugins + maven-gpg-plugin + + + + + diff --git a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/RhSsoTemplateOpenShiftApplication.java b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/RhSsoTemplateOpenShiftApplication.java index 76ab0dabd..85947ec29 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/RhSsoTemplateOpenShiftApplication.java +++ b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/RhSsoTemplateOpenShiftApplication.java @@ -16,7 +16,7 @@ * * The application will be deployed by: * *

* See {@link RhSsoTemplate} for available templates the diff --git a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/template/Eap7Template.java b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/template/Eap7Template.java index 0b8b8f242..2c1ded2e3 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/template/Eap7Template.java +++ b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/application/openshift/template/Eap7Template.java @@ -18,7 +18,7 @@ import org.jboss.intersmash.tools.provision.openshift.template.OpenShiftTemplate; /** - * OpenShift template for EAP 7.z (i.e. WildFly Jakarta EE 8 <= 26.1.2) applications. + * OpenShift template for EAP 7.z (i.e. WildFly Jakarta EE 8 <= 26.1.2) applications. *

* See e.g.: https://github.com/jboss-container-images/jboss-eap-7-openshift-image */ diff --git a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/KeycloakOperatorProvisioner.java b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/KeycloakOperatorProvisioner.java index f7e1fb8ab..0a0c73a9b 100644 --- a/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/KeycloakOperatorProvisioner.java +++ b/tools/intersmash-tools-provisioners/src/main/java/org/jboss/intersmash/tools/provision/openshift/KeycloakOperatorProvisioner.java @@ -250,7 +250,7 @@ private void waitForKeycloakResourceReadiness() { /** * Get a reference to keycloak object. Use get() to get the actual object, or null in case it does not * exist on tested cluster. - * @return A concrete {@link Resource} instance representing the {@link org.jboss.intersmash.tools.provision.openshift.operator.keycloak.keycloak.Keycloak} resource definition + * @return A concrete {@link Resource} instance representing the {@link Keycloak} resource definition */ public Resource keycloak() { return keycloakClient() diff --git a/tools/pom.xml b/tools/pom.xml index c164e84e4..401f35d94 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -18,51 +18,21 @@ intersmash-tools-provisioners - - - - - org.apache.maven.plugins - maven-deploy-plugin - - - - - doc + publish - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar - - - + maven-deploy-plugin org.apache.maven.plugins - maven-javadoc-plugin - - - attach-sources - - jar - - - + maven-gpg-plugin -