Skip to content

Commit

Permalink
Merge branch 'hygieia:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
VivekBuzruk committed Jun 7, 2021
2 parents 3c4f119 + 00bf008 commit 2a84d3e
Show file tree
Hide file tree
Showing 1,157 changed files with 57,687 additions and 233,952 deletions.
2 changes: 2 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
node_modules
.git
13 changes: 13 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Editor configuration, see https://editorconfig.org
root = true

[*]
charset = utf-8
indent_style = space
indent_size = 2
insert_final_newline = true
trim_trailing_whitespace = true

[*.md]
max_line_length = off
trim_trailing_whitespace = false
21 changes: 0 additions & 21 deletions .github/stale.yml

This file was deleted.

79 changes: 39 additions & 40 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,48 +1,47 @@
.DS_Store
*.class

#java certificates
*.crt
# See http://help.github.com/ignore-files/ for more about ignoring files.

# Mobile Tools for Java (J2ME)
.mtj.tmp/
# compiled output
/dist
/tmp
/out-tsc

# Package Files #
*.war
*.ear
# dependencies
/node
/node_modules

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
# profiling files
chrome-profiler-events.json
speed-measure-plugin.json

*.iws
# IDEs and editors
/.idea
*.iml
*.ipr
out
build
.gradle
gradle.properties
.idea
common/src/querydsl
common/src/generated
core/src/generated
*.log
target
UI/node
UI/src/app/local-testing.js
*.releaseBackup
docker-compose.override.yml
logs
.project
.settings
.pmd
.pmdruleset.xml
.classpath
.README.md.html

# Eclipse specific ignore settings
.c9/
*.launch
.settings/
.project
.pmdruleset.xml
.pmd
.classpath
application.properties
*.sublime-workspace

# IDE - VSCode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
.history/*

# misc
/.sass-cache
/connect.lock
/coverage
/libpeerconnection.log
npm-debug.log
yarn-error.log
/target
testem.log
/typings

# System Files
.DS_Store
Thumbs.db
Binary file removed .mvn/wrapper/maven-wrapper.jar
Binary file not shown.
1 change: 0 additions & 1 deletion .mvn/wrapper/maven-wrapper.properties

This file was deleted.

39 changes: 17 additions & 22 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,37 +1,32 @@
language: java
jdk:
- openjdk8
language: node_js
node_js:
- "10"
dist: trusty
sudo: required
branches:
only:
- master
- gerrit-integration
- "/^v[0-9]+\\.[0-9]+\\.[0-9]+.*$/"
sudo: required
cache:
directories:
- "$TRAVIS_BUILD_DIR/UI/node_modules"
install: true
- "$TRAVIS_BUILD_DIR/hygieia/node_modules"
before_install:
- export TZ=America/New_York
- export NG_CLI_ANALYTICS=ci
before_script:
- sudo chown -R $USER:$GROUP $TRAVIS_BUILD_DIR
- npm install -g @angular/cli
script:
- ng lint
- npm run test-headless
- if [ "$TRAVIS_PULL_REQUEST" != "false" ] || [ "$TRAVIS_BRANCH" = "master" ]; then mvn clean install -q -U; fi
- if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_BRANCH" = "master" ]; then cp ./travis-utilities/deploy-snapshot.sh . && ./deploy-snapshot.sh; fi
- if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [[ "$TRAVIS_BRANCH" =~ ^v[0-9]+\.[0-9]+\.[0-9]+.*$ ]]; then cp ./travis-utilities/release.sh . && ./release.sh; fi

notifications:
webhooks:
urls: https://webhooks.gitter.im/e/48597b0f75dd571734bc
on_success: always
on_failure: always
on_start: always
email:
recipients:
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
on_success: always
on_failure: always
after_failure:
- sudo free -m -t
- sudo dmesg
after_success:
- codecov
19 changes: 0 additions & 19 deletions CHANGELOG.md

This file was deleted.

41 changes: 33 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,36 @@
FROM docker.io/nginx:latest
# build environment
FROM node:10.16.0 as builder

COPY default.conf /etc/nginx/conf.d/default.conf.templ
COPY conf-builder.sh /usr/bin/conf-builder.sh
COPY html /usr/share/nginx/html
RUN chown nginx:nginx /usr/share/nginx/html
# set working directory
RUN mkdir /usr/src/app
WORKDIR /usr/src/app

EXPOSE 80 443
ENV PATH /usr/src/app/node_modules/.bin:$PATH

CMD conf-builder.sh &&\
nginx -g "daemon off;"
COPY package.json /usr/src/app/package.json
RUN npm install
RUN npm install -g @angular/[email protected] --unsafe

COPY . /usr/src/app

RUN npm run build --output-path=dist

FROM httpd:2.4-alpine

# copy compiled app to server
COPY --from=builder /usr/src/app/dist/hygieia-ui /usr/local/apache2/htdocs/

COPY ./httpd/.htaccess /usr/local/apache2/htdocs/.htaccess

# copy startup script
COPY ./startup.sh /startup.sh

# make script executable
RUN chmod +x /startup.sh

# expose port 80
EXPOSE 80

ENTRYPOINT ["/startup.sh"]

CMD ["httpd-foreground"]
1 change: 0 additions & 1 deletion Hygieia2.md

This file was deleted.

2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@
APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "{}"
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
Expand Down
4 changes: 0 additions & 4 deletions MAINTAINERS

This file was deleted.

32 changes: 16 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@
<col width="100%" />
</colgroup>
<tbody><tr><td>
<h1><b>We are excited to announce the transfer of Hygieia Project to its own <a href="https://github.com/Hygieia">GitHub Organization.</a> This move is being made to allow for us to manage the apis and individual collectors in their own repositories which renders for better product management. All components of Hygieia are now available under the <a href="https://github.com/Hygieia">Hygieia Organization</a>.</b></h1>
<h1><b>We are excited to announce the transfer of Hygieia Project to its own <a href="https://github.com/hygieia">GitHub Organization.</a> This move is being made to allow for us to manage the apis and individual collectors in their own repositories which renders for better product management. All components of Hygieia are now available under the <a href="https://github.com/hygieia">Hygieia Organization</a>.</b></h1>

<h2>View our <a href="https://github.com/Hygieia/Hygieia/wiki/Hygieia-2020-Roadmap">2020 Hygieia Roadmap</a>.
<h2>View our <a href="https://github.com/hygieia/hygieia/wiki/Hygieia-2021-Roadmap">2021 Hygieia Roadmap</a>.

</td> </tr> </tbody> </table>
</div>
<div align="center">
<img width="250" align="top" src="/UI/src/assets/img/Hygieia_Logo.png"><a href="https://www.blackducksoftware.com/about/news-events/releases/2015-open-source-rookies-year"><img width="55" align="top" hspace="20" src="https://github.com/Hygieia/Hygieia/blob/gh-pages/media/images/Rookies_Award_Badge.png"></a>
<img width="250" align="top" src="/UI/src/assets/img/Hygieia_Logo.png"><a href="https://www.blackducksoftware.com/about/news-events/releases/2015-open-source-rookies-year"><img width="55" align="top" hspace="20" src="https://github.com/hygieia/hygieia/blob/gh-pages/media/images/Rookies_Award_Badge.png"></a>
</div>
<div align="center">
<p> <b>Pronunciation: <i>hi-gee-ya <a href="https://en.wikipedia.org/wiki/Hygieia"></i>(Origin: Greek)</a> </p>
</div>

<div align="center">
<!-- Build Status -->
<a href="https://travis-ci.com/Hygieia/Hygieia?branch=master"><img src="https://api.travis-ci.com/Hygieia/Hygieia.svg?branch=master" alt="Build Status"/></a>
<a href="https://travis-ci.com/hygieia/hygieia?branch=master"><img src="https://api.travis-ci.com/hygieia/hygieia.svg?branch=master" alt="Build Status"/></a>
<!-- Codacy Badge -->
<a href="https://www.codacy.com/app/amit-mawkin/Hygieia"><img src="https://api.codacy.com/project/badge/grade/de1a2a557f8e458e9a959be8c2e7fcba"
alt="Codacy Badge"/></a>
Expand All @@ -34,13 +34,13 @@

<div align="center">
<h2>
<a href="http://hygieia.github.io/Hygieia/getting_started.html"><img src="https://github.com/hygieia/Hygieia/blob/gh-pages/media/images/Buttons/Documentation.png" alt="Documentation" width="125" align="center"></a>
<a href="http://hygieia.github.io/hygieia/getting_started.html"><img src="https://github.com/hygieia/Hygieia/blob/gh-pages/media/images/Buttons/Documentation.png" alt="Documentation" width="125" align="center"></a>
<span>|</span>
<a href="http://hygieia.github.io/Hygieia/screenshots.html"><img src="https://github.com/Hygieia/Hygieia/blob/gh-pages/media/images/Buttons/Screenshots.png" alt="Screenshots" width="125" align="center"></a>
<a href="http://hygieia.github.io/hygieia/screenshots.html"><img src="https://github.com/hygieia/hygieia/blob/gh-pages/media/images/Buttons/Screenshots.png" alt="Screenshots" width="125" align="center"></a>
<span>|</span>
<a href="http://hygieia.github.io/Hygieia/contribute.html"><img src="https://github.com/Hygieia/Hygieia/blob/gh-pages/media/images/Buttons/Contribute.png" alt="Contribute" width="125" align="center"></a>
<a href="http://hygieia.github.io/hygieia/contribute.html"><img src="https://github.com/hygieia/hygieia/blob/gh-pages/media/images/Buttons/Contribute.png" alt="Contribute" width="125" align="center"></a>
<span>|</span>
<a href="http://hygieia.github.io/Hygieia/contact.html"><img src="https://github.com/Hygieia/Hygieia/blob/gh-pages/media/images/Buttons/Contact.png" alt="Contact" width="125" align="center"></a>
<a href="http://hygieia.github.io/hygieia/contact.html"><img src="https://github.com/hygieia/hygieia/blob/gh-pages/media/images/Buttons/Contact.png" alt="Contact" width="125" align="center"></a>
</h2>
</div>

Expand All @@ -51,7 +51,7 @@

<tbody>
<tr>
<td><a href="https://github.com/Hygieia/ExecDashboard"><img src="https://github.com/Hygieia/Hygieia/blob/gh-pages/media/images/ReadmeIcons/Hygieia3.png" alt="Hygieia3.0" height="145" width="940"/></a></td>
<td><a href="https://github.com/hygieia/ExecDashboard"><img src="https://github.com/hygieia/hygieia/blob/gh-pages/media/images/ReadmeIcons/Hygieia3.png" alt="Hygieia3.0" height="145" width="940"/></a></td>
</tr>
</tbody>
</table>
Expand All @@ -65,14 +65,14 @@

<tbody>
<tr>
<td><a href="http://hygieia.github.io/Hygieia/getting_started.html"><img src="https://github.com/Hygieia/Hygieia/blob/gh-pages/media/images/ReadmeIcons/About.png" alt="About Icon" height="145" width="280"/></a></td>
<td><a href="https://www.youtube.com/watch?v=SoNTA78j0tc"><img src="https://github.com/Hygieia/Hygieia/blob/gh-pages/media/images/ReadmeIcons/Video.png" alt="Video Icon" align="center" height="145" width="280"/></td>
<td><a href="http://hygieia.github.io/Hygieia/architecture.html"><img src="https://github.com/Hygieia/Hygieia/blob/gh-pages/media/images/ReadmeIcons/Architecture.png" alt="Architecture Icon" align="center" height="145" width="280"/></a></td>
<td><a href="http://hygieia.github.io/hygieia/getting_started.html"><img src="https://github.com/hygieia/hygieia/blob/gh-pages/media/images/ReadmeIcons/About.png" alt="About Icon" height="145" width="280"/></a></td>
<td><a href="https://www.youtube.com/watch?v=SoNTA78j0tc"><img src="https://github.com/hygieia/hygieia/blob/gh-pages/media/images/ReadmeIcons/Video.png" alt="Video Icon" align="center" height="145" width="280"/></td>
<td><a href="http://hygieia.github.io/hygieia/architecture.html"><img src="https://github.com/hygieia/hygieia/blob/gh-pages/media/images/ReadmeIcons/Architecture.png" alt="Architecture Icon" align="center" height="145" width="280"/></a></td>
</tr>
<tr>
<td><a href="http://hygieia.github.io/Hygieia/framework.html"><img src="https://github.com/Hygieia/Hygieia/blob/gh-pages/media/images/ReadmeIcons/Framework.png" alt="Framework Icon" align="center" height="145" width="280"/></td>
<td><a href="http://hygieia.github.io/Hygieia/setup.html"><img src="https://github.com/Hygieia/Hygieia/blob/gh-pages/media/images/ReadmeIcons/Installation.png" alt="Install Icon" align="center" height="145" width="280"/></a></td>
<td><a href="https://github.com/Hygieia/Hygieia/graphs/contributors"><img src="https://github.com/Hygieia/Hygieia/blob/gh-pages/media/images/ReadmeIcons/TopContributors.png" alt="Contributors Icon" align="center" height="145" width="280"/></a></td>
<td><a href="http://hygieia.github.io/hygieia/framework.html"><img src="https://github.com/hygieia/hygieia/blob/gh-pages/media/images/ReadmeIcons/Framework.png" alt="Framework Icon" align="center" height="145" width="280"/></td>
<td><a href="https://hygieia.github.io/hygieia/newUI.html"><img src="https://github.com/hygieia/hygieia/blob/gh-pages/media/images/ReadmeIcons/Installation.png" alt="Install Icon" align="center" height="145" width="280"/></a></td>
<td><a href="https://github.com/hygieia/hygieia/graphs/contributors"><img src="https://github.com/hygieia/hygieia/blob/gh-pages/media/images/ReadmeIcons/TopContributors.png" alt="Contributors Icon" align="center" height="145" width="280"/></a></td>
</tr>
</tbody>
</table>
</table>
1 change: 0 additions & 1 deletion Setup.md

This file was deleted.

11 changes: 0 additions & 11 deletions UI-protractor-tests/.gitignore

This file was deleted.

Loading

0 comments on commit 2a84d3e

Please sign in to comment.