Skip to content

Commit

Permalink
1770 Rename menas web to menas (#1786)
Browse files Browse the repository at this point in the history
* #1770 Rename menas-web to menas
  • Loading branch information
AdrianOlosutean authored May 26, 2021
1 parent 70999f5 commit c4dcd92
Show file tree
Hide file tree
Showing 141 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pr_labels_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
name: Test approved or docs
runs-on: ubuntu-latest
steps:
- uses: danielchabr/pr-labels-checker@master
- uses: danielchabr/pr-labels-checker@v3.0
id: checkLabel
with:
hasSome: PR:tested,PR:no testing needed,docs
Expand All @@ -31,7 +31,7 @@ jobs:
name: Merge not blocked
runs-on: ubuntu-latest
steps:
- uses: danielchabr/pr-labels-checker@master
- uses: danielchabr/pr-labels-checker@v3.0
id: checkLabel
with:
hasNone: PR:reviewing,work in progress
Expand Down
6 changes: 3 additions & 3 deletions menas-web/Dockerfile → menas/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ LABEL \
vendor="AbsaOSS" \
copyright="2020 ABSA Group Limited" \
license="Apache License, version 2.0" \
name="Menas Web"
name="Menas"

ADD start_menas_web.sh /docker-entrypoint.d/start_menas_web.sh
ADD start_menas.sh /docker-entrypoint.d/start_menas.sh
COPY nginx.conf nginx.conf
RUN chmod +x /docker-entrypoint.d/start_menas_web.sh && rm -rf /usr/share/nginx/html/*
RUN chmod +x /docker-entrypoint.d/start_menas.sh && rm -rf /usr/share/nginx/html/*

COPY ./ui/dist /usr/share/nginx/html/
File renamed without changes.
4 changes: 2 additions & 2 deletions menas-web/pom.xml → menas/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<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>
<artifactId>menas-web</artifactId>
<artifactId>menas</artifactId>
<packaging>war</packaging>

<parent>
Expand All @@ -31,7 +31,7 @@
<artifactId>dockerfile-maven-plugin</artifactId>
<version>${dockerfile.maven.version}</version>
<configuration>
<repository>${dockerfile.menas-ui.repository}</repository>
<repository>${dockerfile.menas.repository}</repository>
<tag>${dockerfile.tag}</tag>
<buildArgs>
<DOCKER_BASE_ARTIFACT>${dockerfile.base.artifact}</DOCKER_BASE_ARTIFACT>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion menas-web/ui/manifest.json → menas/ui/manifest.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sap.app": {
"id": "menas-web"
"id": "menas"
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions menas-web/ui/package.json → menas/ui/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "menas-web",
"name": "menas",
"version": "3.0.0-SNAPSHOT",
"description": "Menas Client",
"description": "Menas UI Client",
"main": "index.html",
"author": "ABSA Big Data R&D",
"license": "Apache License, Version 2.0",
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion menas-web/ui/ui5.yaml → menas/ui/ui5.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

specVersion: '2.2'
metadata:
name: menas-web
name: menas
type: application
framework:
name: OpenUI5
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
<module>plugins-builtin</module>
<module>spark-jobs</module>
<module>utils</module>
<module>menas-web</module>
<module>menas</module>
</modules>

<properties>
Expand Down Expand Up @@ -200,8 +200,8 @@
<!--other properties-->
<quiet.scalastyle.check>true</quiet.scalastyle.check>
<scalastyle.configLocation>${project.basedir}/scalastyle-config.xml</scalastyle.configLocation>
<dockerfile.menas.repository>docker.io/absaoss/menas</dockerfile.menas.repository>
<dockerfile.menas-ui.repository>docker.io/absaoss/menas-ui</dockerfile.menas-ui.repository>
<dockerfile.rest-api.repository>docker.io/absaoss/menas</dockerfile.rest-api.repository>
<dockerfile.menas.repository>docker.io/absaoss/menas-ui</dockerfile.menas.repository>
<dockerfile.tag>${project.version}</dockerfile.tag>
<!-- Name of property file that will be used by the Docker image. -->
<dockerfile.property.file>docker</dockerfile.property.file>
Expand Down
2 changes: 1 addition & 1 deletion rest-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@
<artifactId>dockerfile-maven-plugin</artifactId>
<version>${dockerfile.maven.version}</version>
<configuration>
<repository>${dockerfile.menas.repository}</repository>
<repository>${dockerfile.rest-api.repository}</repository>
<tag>${dockerfile.tag}</tag>
<buildArgs>
<WAR_FILE>${project.build.finalName}.war</WAR_FILE>
Expand Down

0 comments on commit c4dcd92

Please sign in to comment.