This is an automated email from the ASF dual-hosted git repository. imesha pushed a commit to branch development in repository https://gitbox.apache.org/repos/asf/oodt.git
commit 8f1f2f6f52377f1534c069a835abc6d17adb8e19 Author: Imesha Sudasingha <[email protected]> AuthorDate: Fri Jul 30 22:04:03 2021 +0530 Add docker builds to relevant pom files --- core/pom.xml | 47 ++++++++++++++++++++++ deployment/pom.xml | 10 ++++- filemgr/pom.xml | 12 +++++- pom.xml | 7 +--- .../oodt_opsui_sample_app}/pom.xml | 34 ++++++---------- webapp/components/pom.xml | 8 +++- webapp/fmbrowser/pom.xml | 6 ++- webapp/fmprod/pom.xml | 9 ++++- {deployment => webapp}/pom.xml | 40 +++++++++--------- webapp/wmonitor/pom.xml | 5 ++- webapp/wmservices/pom.xml | 7 +++- 11 files changed, 123 insertions(+), 62 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 6a7c606..4614965 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -40,6 +40,10 @@ the License. <wicket.version>1.4.17</wicket.version> <jetty.version>6.1.25</jetty.version> <sonar.language>java</sonar.language> + <!-- Docker --> + <docker.build.disabled>true</docker.build.disabled> + <docker.image.name/> + <docker.working.dir>${project.basedir}</docker.working.dir> </properties> <distributionManagement> <site> @@ -428,6 +432,12 @@ the License. </dependency> <dependency> <groupId>org.apache.oodt</groupId> + <artifactId>oodt-reactjs-opsui</artifactId> + <version>${project.parent.version}</version> + <type>pom</type> + </dependency> + <dependency> + <groupId>org.apache.oodt</groupId> <artifactId>curator-sso</artifactId> <version>${project.parent.version}</version> </dependency> @@ -1082,5 +1092,42 @@ mm </plugins> </build> </profile> + <profile> + <id>docker</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>3.0.0</version> + <configuration> + <skip>${docker.build.disabled}</skip> + </configuration> + <executions> + <execution> + <id>docker-clean</id> + <phase>install</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>docker</executable> + <workingDirectory>${docker.working.dir}</workingDirectory> + <arguments> + <argument>build</argument> + <argument>-t</argument> + <argument>${docker.image.name}</argument> + <argument>.</argument> + </arguments> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> </profiles> </project> diff --git a/deployment/pom.xml b/deployment/pom.xml index e739ba1..da871df 100644 --- a/deployment/pom.xml +++ b/deployment/pom.xml @@ -15,7 +15,8 @@ License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.oodt</groupId> @@ -27,7 +28,7 @@ <packaging>pom</packaging> <name>OODT Deployment</name> <description>Contains the docker based deployments for OODT</description> - + <dependencies> <dependency> <groupId>org.apache.oodt</groupId> @@ -43,5 +44,10 @@ <artifactId>workflow-services</artifactId> <type>war</type> </dependency> + <dependency> + <groupId>org.apache.oodt</groupId> + <artifactId>oodt-reactjs-opsui</artifactId> + <type>pom</type> + </dependency> </dependencies> </project> \ No newline at end of file diff --git a/filemgr/pom.xml b/filemgr/pom.xml index 31172d0..7725882 100644 --- a/filemgr/pom.xml +++ b/filemgr/pom.xml @@ -25,11 +25,19 @@ </parent> <artifactId>cas-filemgr</artifactId> <name>Catalog and Archive File Management Component</name> - <description>The file management component of a Catalog and Archive Service. This component + <description> + The file management component of a Catalog and Archive Service. This component purposefully separates data stores and metadata stores as standard interfaces, and provides some out of the box backend implementations of them (including one based on the javax.sql.DataSource interface). This component provides everything that you need - to catalog, archive and manage files, and directories, and their associated metadata.</description> + to catalog, archive and manage files, and directories, and their associated metadata. + </description> + + <properties> + <docker.build.disabled>false</docker.build.disabled> + <docker.image.name>oodt/filemgr:latest</docker.image.name> + </properties> + <!-- All dependencies should be listed in core/pom.xml and be ordered alphabetically by package and artifact. Once the dependency is in the core pom, it can then be used in other modules without the version tags. For example, within core/pom.xml: diff --git a/pom.xml b/pom.xml index 434ba2a..48584e5 100644 --- a/pom.xml +++ b/pom.xml @@ -46,15 +46,12 @@ the License. <module>pge</module> <module>mvn/plugins/cas-install</module> <module>mvn/archetypes</module> - <module>webapp/components</module> - <module>webapp/fmbrowser</module> - <module>webapp/wmonitor</module> - <module>webapp/fmprod</module> - <module>webapp/wmservices</module> + <module>webapp</module> <module>pcs/core</module> <module>pcs/opsui</module> <module>pcs/services</module> <module>deployment</module> + <module>react-components/oodt_opsui_sample_app</module> </modules> <scm> diff --git a/deployment/pom.xml b/react-components/oodt_opsui_sample_app/pom.xml similarity index 55% copy from deployment/pom.xml copy to react-components/oodt_opsui_sample_app/pom.xml index e739ba1..e0bdb2c 100644 --- a/deployment/pom.xml +++ b/react-components/oodt_opsui_sample_app/pom.xml @@ -15,33 +15,23 @@ License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.oodt</groupId> <artifactId>oodt-core</artifactId> <version>1.9-SNAPSHOT</version> - <relativePath>../core/pom.xml</relativePath> + <relativePath>../../core/pom.xml</relativePath> </parent> - <artifactId>oodt-deployment</artifactId> + <artifactId>oodt-reactjs-opsui</artifactId> <packaging>pom</packaging> - <name>OODT Deployment</name> - <description>Contains the docker based deployments for OODT</description> - - <dependencies> - <dependency> - <groupId>org.apache.oodt</groupId> - <artifactId>cas-filemgr</artifactId> - </dependency> - <dependency> - <groupId>org.apache.oodt</groupId> - <artifactId>cas-product</artifactId> - <type>war</type> - </dependency> - <dependency> - <groupId>org.apache.oodt</groupId> - <artifactId>workflow-services</artifactId> - <type>war</type> - </dependency> - </dependencies> + <name>OODT ReactJs OPSUI</name> + <description>OODT OPSUI implemented with ReactJs</description> + + <properties> + <docker.build.disabled>false</docker.build.disabled> + <docker.image.name>oodt/opsui:latest</docker.image.name> + </properties> + </project> \ No newline at end of file diff --git a/webapp/components/pom.xml b/webapp/components/pom.xml index 1ae4154..3b34f73 100644 --- a/webapp/components/pom.xml +++ b/webapp/components/pom.xml @@ -20,13 +20,17 @@ the License. <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.oodt</groupId> - <artifactId>oodt-core</artifactId> + <artifactId>oodt-webapps</artifactId> <version>1.9-SNAPSHOT</version> - <relativePath>../../core/pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>oodt-webapp-components</artifactId> <packaging>jar</packaging> <name>OODT Wicket Web Components</name> + + <properties> + <docker.build.disabled>true</docker.build.disabled> + </properties> <!-- All dependencies should be listed in core/pom.xml and be ordered alphabetically by package and artifact. Once the dependency is in the core pom, it can then be used in other modules without the version tags. For example, within core/pom.xml: diff --git a/webapp/fmbrowser/pom.xml b/webapp/fmbrowser/pom.xml index c4faeb3..208898a 100644 --- a/webapp/fmbrowser/pom.xml +++ b/webapp/fmbrowser/pom.xml @@ -20,9 +20,9 @@ the License. <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.oodt</groupId> - <artifactId>oodt-core</artifactId> + <artifactId>oodt-webapps</artifactId> <version>1.9-SNAPSHOT</version> - <relativePath>../../core/pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>fmbrowser</artifactId> <packaging>war</packaging> @@ -32,6 +32,8 @@ the License. <jetty.version>6.1.25</jetty.version> <slf4j.version>1.5.8</slf4j.version> <log4j.version>1.2.14</log4j.version> + <!-- Disable docker build --> + <docker.build.disabled>true</docker.build.disabled> </properties> <!-- All dependencies should be listed in core/pom.xml and be ordered alphabetically by package and artifact. Once the dependency is in the core pom, it can then be used in other modules without the version tags. diff --git a/webapp/fmprod/pom.xml b/webapp/fmprod/pom.xml index 6cd0aac..28e1038 100644 --- a/webapp/fmprod/pom.xml +++ b/webapp/fmprod/pom.xml @@ -19,9 +19,9 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.oodt</groupId> - <artifactId>oodt-core</artifactId> + <artifactId>oodt-webapps</artifactId> <version>1.9-SNAPSHOT</version> - <relativePath>../../core/pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>cas-product</artifactId> <packaging>war</packaging> @@ -31,6 +31,11 @@ component. All-in-all, this project contributes an OODT LargeProductHandler component, that can be used to deliver and format a CAS product structure into an OODT XML Query Result Set.</description> + + <properties> + <docker.build.disabled>true</docker.build.disabled> + </properties> + <!-- All dependencies should be listed in core/pom.xml and be ordered alphabetically by package and artifact. Once the dependency is in the core pom, it can then be used in other modules without the version tags. For example, within core/pom.xml: diff --git a/deployment/pom.xml b/webapp/pom.xml similarity index 58% copy from deployment/pom.xml copy to webapp/pom.xml index e739ba1..af1c457 100644 --- a/deployment/pom.xml +++ b/webapp/pom.xml @@ -15,7 +15,8 @@ License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.oodt</groupId> @@ -23,25 +24,22 @@ <version>1.9-SNAPSHOT</version> <relativePath>../core/pom.xml</relativePath> </parent> - <artifactId>oodt-deployment</artifactId> + <artifactId>oodt-webapps</artifactId> <packaging>pom</packaging> - <name>OODT Deployment</name> - <description>Contains the docker based deployments for OODT</description> - - <dependencies> - <dependency> - <groupId>org.apache.oodt</groupId> - <artifactId>cas-filemgr</artifactId> - </dependency> - <dependency> - <groupId>org.apache.oodt</groupId> - <artifactId>cas-product</artifactId> - <type>war</type> - </dependency> - <dependency> - <groupId>org.apache.oodt</groupId> - <artifactId>workflow-services</artifactId> - <type>war</type> - </dependency> - </dependencies> + <name>OODT Webapps</name> + <description>OODT Webapps</description> + + <properties> + <docker.build.disabled>false</docker.build.disabled> + <docker.image.name>oodt/tomcat:latest</docker.image.name> + </properties> + + <modules> + <module>components</module> + <module>fmbrowser</module> + <module>fmprod</module> + <module>wmonitor</module> + <module>wmservices</module> + </modules> + </project> \ No newline at end of file diff --git a/webapp/wmonitor/pom.xml b/webapp/wmonitor/pom.xml index a8cf2a1..b37055f 100644 --- a/webapp/wmonitor/pom.xml +++ b/webapp/wmonitor/pom.xml @@ -20,9 +20,9 @@ the License. <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.oodt</groupId> - <artifactId>oodt-core</artifactId> + <artifactId>oodt-webapps</artifactId> <version>1.9-SNAPSHOT</version> - <relativePath>../../core/pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>wmonitor</artifactId> <packaging>war</packaging> @@ -32,6 +32,7 @@ the License. <jetty.version>6.1.25</jetty.version> <slf4j.version>1.5.8</slf4j.version> <log4j.version>1.2.14</log4j.version> + <docker.build.disabled>true</docker.build.disabled> </properties> <!-- All dependencies should be listed in core/pom.xml and be ordered alphabetically by package and artifact. Once the dependency is in the core pom, it can then be used in other modules without the version tags. diff --git a/webapp/wmservices/pom.xml b/webapp/wmservices/pom.xml index b5574e7..7985fe8 100644 --- a/webapp/wmservices/pom.xml +++ b/webapp/wmservices/pom.xml @@ -13,9 +13,9 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.oodt</groupId> - <artifactId>oodt-core</artifactId> + <artifactId>oodt-webapps</artifactId> <version>1.9-SNAPSHOT</version> - <relativePath>../../core/pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>workflow-services</artifactId> <packaging>war</packaging> @@ -23,6 +23,9 @@ <description> A set of REST-ful services for the Workflow Manager. </description> + <properties> + <docker.build.disabled>true</docker.build.disabled> + </properties> <build> <plugins> <plugin>
