Merge pull request #454 from zalando/clean-up

Clean up OSS guidelines

Author: bocytko

.github/ISSUE_TEMPLATE.md

@@ -1,30 +1,3 @@
 ## Task Headline
 
 Issue description and motivation (what and a why).
-
-### Tasks
-
-These are the concrete tasks to complete before the issue is marked as done:
-
-- [ ] task 1
-- [ ] task 2
-
-### Expected delivery
-
-What is the concrete outcome of this work:
-
-
-## Stakeholders
-
-Who do we need to align with to make this happen? Add the department to get in touch with.
-
-- [ ] Department name
-
-
-## How do we measure the task was completed
-
-How do we measure impact:
-
-  1.
-  1.
-  1.

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,30 +1,3 @@
-Issue: #
-
 ## Description
 
 Describe the motivation and context for the proposed change.
-
-## Types of Changes
-
-_What types of changes does your code introduce? Remove the points which aren't applicable:_
-
-- New feature (non-breaking change which adds functionality)
-- Bug fix (non-breaking change which fixes an issue)
-- Configuration change
-- Refactoring/improvements
-
-## Tasks
-
-  - [x] Created Task 1
-  - [x] Created Task 2
-  - [ ] To-do Task 3
-
-## Checklist
-
-_Go over all the following points, and put an `x` in all the boxes that apply:_
-
-- [ ] My change requires a change to the documentation and I have updated it accordingly.
-
-## Screenshots/Videos (OPTIONAL)
-
-Here's a sample PR template: [link](../../master/CONTRIBUTING.md#example-template-for-pull-request)

CONTRIBUTING.md

@@ -2,86 +2,6 @@
 
 👍🎉 First off, thanks for taking the time to contribute! 🎉👍
 
-# Getting Started
-
-This repository has two purposes:
-- Maintaining the OST website
-- Storing documentation related to the team goals and strategy
-
-## Creating Issue and Pull Request
-
-Submitting changes requires an issue to describe what you want to change and why. Secondly you will need to start a new pull request where your progress is tracked and all discussions related to your implementation is kept.
-
-- Fork the repository
-- Create an issue
-- Open a pull request and use the label - `pr: Work in Progress`
-- See below [template](#example-template-for-pr)
-
-
-## Making and Submitting Changes to the Pull Request
-
-As you work through the issue, make sure you commit your changes in logical chunks, include a commit message that describe what you changed and why.
-
-- Commit with a meaningful message
-- Sign the commit
-- Once the PR is ready, please remove the label - `pr: Work in Progress`
-- See below [template](#example-template-for-commit-message)
-
-
-### Example Template for Pull Request
-
-We have included a template on Github for creating new pull requests. An example is shown below to give you an idea of what information we need, to understand your submitted changes. A pull request should:
-
-- Use a clear title
-- Have a reference to the issue it is fixing
-- Have a description of 2-3 sentences to explain the changes being made
-- Indicate if it's a new feature, bug fix or refactor
-- Outline the tasks being done to solve the issue
-
-```
-Issue #15 - Initial website layout
-
-This PR creates the initial scaffold structure for the team website. The Catwatch data is called via the `fetch` API and
-displayed in `index.html` page. CSS Flexbox is used as the CSS layout model.
-
-Types of Changes
-
-What types of changes does your code introduce? Put an `x` in all the boxes that apply and remove the other points which aren't applicable:
-
-- [x] New feature (non-breaking change which adds functionality)
-- [ ] Bug fix (non-breaking change which fixes an issue)
-- [ ] Configuration change
-- [ ] Refactor/improvements
-- [ ] Documentation / non-code
-
-Tasks:
-
-- [x] Create index.html
-- [x] Setup css and js code
-- [ ] Follow Zalando dress-code standard
-
-Checklist
-
-Go over all the following points, and put an `x` in all the boxes that apply:
-
-- [ ] My change requires a change to the documentation & I have updated it accordingly.
-
-
-Screenshot: (optional)
-
-  - Attach a screenshot image file
-```
-
-
-### Example template for commit message
-
-```
-git commit -m "Initial scaffold for the website layout" -s
-```
-
-The `-s` in the above commit message signs your commit.
-
-
 # Development
 
 To build the documentation locally, you need at least:
@@ -122,4 +42,4 @@ find ./assets -iname "*.jpg" -exec jpegoptim -p --strip-com --strip-iptc -m 90 -
 # Contact
 
 - **Email**: opensource@zalando.de
-- **Issue tracker**: https://github.com/zalando/ost/issues
+- **Issue tracker**: https://github.com/zalando/zalando.github.io/issues

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 Zalando SE
+Copyright (c) 2018-2025 Zalando SE
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,37 +1,12 @@
-# Zalando Open Source Team 
+# Zalando Open Source 
 
-The repository of the Zalando Open Source Team (Contact: opensource@zalando.de). Includes the team website and issue tracker with the tasks we are currently working on.
-
-
-## The purpose of the open source team
-The Zalando Open Source Team is responsible for nurturing and growing Open Source and open practices at Zalando. 
-We work across departments as internal consultants to remove barriers for contributing, producing and consuming Open
-Source code. 
-
-We advise and assist on:
-
-- Creating and nurturing Open Source communities around Zalando Open Source projects
-- Align community interests with Zalando business interests
-- Efficient and compliant adoption of Open Source code by Zalando teams
-- Recruiting from Open Source communities 
-- Best practices for applying open source to internal projects
-
-We are also here to demystify and simply answer questions, so no matter if you are working at Zalando or not, get in touch: opensource@zalando.de
-
-## Purpose of this repository
-This repository primary serves as the public website, issue tracker and history of the Open Source Team. We do however plan to share additional resources and tooling in the future via this repository.
-
-## Have a look at what we are working on 
-
-- Our project backlog is public, and can be found under the [projects page](https://github.com/zalando/ost/projects/1) 
-- The Issue tracker is also open to view and add issues to [Issue tracker](https://github.com/zalando/ost/issues)
-
-If you have general questions around Open Source @ zalando, the quickest way to get in touch is via email: opensource@zalando.de.
+This repository contains the source code of our website showcasing Open Source at Zalando: https://opensource.zalando.com
+In addition, it includes guidelines that companies willing to adopt Open Source can use as a baseline.
 
 ## Contributing
 
 Please read [CONTRIBUTING.md](CONTRIBUTING.md) for details on our code of conduct, and the process for submitting pull requests to us.
 
 ## License
 
-This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details
+This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details.

_docs/index.md

@@ -8,23 +8,22 @@ banner:
   image: laptop.jpg
 ---
 
-#### Despite widespread use, there are still many misconceptions and uncertainties for Zalando employees engaging in Open Source. Questions on legal issues, licensing and what is deemed confidential or internal information is common. 
+#### Note: this page used to host Open Source guidelines for Zalando employees. In 2022, the page has been moved to an internal documentation site, discoverable in Zalando developer portal (Sunrise) and other internal channels using the keyword "opensource".
 
-This website is therefore a guide, primarily for Zalando employees, on how to adopt, modify and release Open Source code. There are a few references to internal Zalando sites or services, but with an effort to limit our use of internal lingo or acronyms.
+After moving these guidelines to an internal site, we extended them as follows:
 
-#### Topics
-- [Open Source Licensing Guide]({{"docs/resources/licensing" | relative_url }})
-  Policies and guidance on which licenses can be used internally at Zalando and in Zalando open source projects
+1. Replaced Google Forms with GitHub Issues to track requests for releasing new Open Source projects and allow-listing end-user licenses and CLAs (Contributor License Agreements).
+2. Extended the list of allowed CLAs with approval dates and notes from the legal team.
+3. Added a list of *Formerly Open Source Projects*, such as Akka, Redis, Terraform, together with legal considerations for the licenses these projects migrated to and with recommended Open Source alternatives.
+4. Split release guidelines into two separate guides: *Guide for maintainers* who would like to release a new project and a *Guide for leads* who are asked for approval of open-sourcing a project.
+5. Moved away from a strict incubation and graduation processes to a more flexible approach. Projects are now open-sourced continuously or archived after a long period of inactivity.
 
-- [Adopting open source code]({{"docs/using/index" | relative_url }})
-  Policies on what to be aware of when adopting open source code in a Zalando project. This applies to both adding dependencies and to contributing upstream.
+### Archived OSS guidelines
+To view the archived content, check the [source code history](https://github.com/zalando/zalando.github.io/tree/ca22fd9dfa96f6a25a6a5ea8b94c9ad815461cb4/_docs) on GitHub. The material includes:
 
-- [Releasing an open source project]({{"docs/releasing/index" | relative_url }})
-  A step by step guide on what to do before you can release a project and guidelines on how to
-  maintain a project
-  
-- [State of open source at Zalando 2018 Report]({{ "docs/reports/2019/january-2019" | relative_url}})
-  The 2018 report on how open source is doing at Zalando with key numbers and insights, as well as a roadmap forward
-
-- [Anti-Harassment Policy]({{"docs/resources/harassment-policy" | relative_url }})
-  Policy on how we manage online harassment and support our maintainers and contributors as when working with open source as part of their work at Zalando. 
+- [Anti-harassment policy](https://github.com/zalando/zalando.github.io/blob/ca22fd9dfa96f6a25a6a5ea8b94c9ad815461cb4/_docs/resources/harassment-policy.md)
+- [Releasing a new project](https://github.com/zalando/zalando.github.io/blob/ca22fd9dfa96f6a25a6a5ea8b94c9ad815461cb4/_docs/releasing/index.md)
+- [Release sign-off guide for leads](https://github.com/zalando/zalando.github.io/blob/ca22fd9dfa96f6a25a6a5ea8b94c9ad815461cb4/_docs/releasing/lead-sign-off-guide.md)
+- [OSS licensing guide](https://github.com/zalando/zalando.github.io/blob/ca22fd9dfa96f6a25a6a5ea8b94c9ad815461cb4/_docs/resources/licensing.md)
+- [Contributing upstream](https://github.com/zalando/zalando.github.io/blob/ca22fd9dfa96f6a25a6a5ea8b94c9ad815461cb4/_docs/using/contributing.md)
+- [Employee copyright](https://github.com/zalando/zalando.github.io/blob/ca22fd9dfa96f6a25a6a5ea8b94c9ad815461cb4/_docs/using/employee-copyright.md)