Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/gradle/plugins/command-manager/…
Browse files Browse the repository at this point in the history
…org.apache.logging.log4j-log4j-slf4j-impl-2.24.2
  • Loading branch information
AlexRuiz7 authored Jan 10, 2025
2 parents 70443db + 610f0d9 commit 876d152
Show file tree
Hide file tree
Showing 68 changed files with 2,706 additions and 2,034 deletions.
23 changes: 23 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
---
name: "Feature template"
about: "[Internal] Used within Wazuh dev team to describe a new development of a produt's feature."
title: ""
labels: ["type/enhancement", "level/task"]
assignees: ""
---

## Description

...

## Functional requirements

- ...

## Implementation restrictions

- ...

## Plan

- [ ] ...
20 changes: 14 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
/*
* Copyright OpenSearch Contributors
* SPDX-License-Identifier: Apache-2.0
* Copyright (C) 2024, Wazuh Inc.
*
* The OpenSearch Contributors require contributions made to
* this file be licensed under the Apache-2.0 license or a
* compatible open source license.
*/
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
plugins { id "com.diffplug.spotless" version "6.25.0" }
repositories { mavenCentral() }

Expand Down
20 changes: 14 additions & 6 deletions formatter/license-header.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
/*
* Copyright OpenSearch Contributors
* SPDX-License-Identifier: Apache-2.0
* Copyright (C) 2024, Wazuh Inc.
*
* The OpenSearch Contributors require contributions made to
* this file be licensed under the Apache-2.0 license or a
* compatible open source license.
*/
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
20 changes: 14 additions & 6 deletions gradle/formatting.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
/*
* Copyright OpenSearch Contributors
* SPDX-License-Identifier: Apache-2.0
* Copyright (C) 2024, Wazuh Inc.
*
* The OpenSearch Contributors require contributions made to
* this file be licensed under the Apache-2.0 license or a
* compatible open source license.
*/
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

allprojects {
project.apply plugin: "com.diffplug.spotless"
Expand Down
40 changes: 0 additions & 40 deletions imposter/README.md

This file was deleted.

46 changes: 0 additions & 46 deletions imposter/security/login.js

This file was deleted.

19 changes: 0 additions & 19 deletions imposter/wazuh-server-config.yaml

This file was deleted.

Loading

0 comments on commit 876d152

Please sign in to comment.