Merge branch 'main' of https://github.com/eclipse-aaspe/aaspe

eclipse-aaspe · Jun 7, 2024 · 4a267d2 · 4a267d2
2 parents 3639a6c + 8486760
commit 4a267d2
Show file tree

Hide file tree

Showing 5 changed files with 112 additions and 3 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -96,11 +96,14 @@ tbd:
 
 Mechanics of how to actually contribute (e.g., merge/pull requests) are described in [AASX Project Explorer Devdoc](https://admin-shell-io.github.io/aasx-package-explorer/devdoc/getting-started/intro.html).
 
-To help you familiarize with the concept of Asset Administration Shell we provide the screencasts (both in English and German) at: https://admin-shell-io.com/screencasts/.
+To help you familiarize with the concept of Asset Administration Shell, we provide screencasts (both in English and German) at: https://admin-shell-io.com/screencasts/.
 
 For further information about the Asset Administration Shell, see the publication Details of the Asset Administration Shell by Plattform Industrie 4.0.
 
-We provide a couple of sample admin shells (packaged as .aasx) for you to test and play with the software at: http://www.admin-shell-io.com/samples/
+We provide a couple of sample admin shells (packaged as .aasx) for you to test and play with the software at: http://www.admin-shell-io.com/samples/.
+
+For a complete list of all contributing individuals and companies, please visit our [CONTRIBUTORS](CONTRIBUTORS.md) page.
+
 
 ### Terms of Use
 

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -0,0 +1,66 @@
+# Contributors
+
+Thanks to all the companies and individuals who generously dedicate their time to making this project better. We're grateful for everyone who supports and
+contributes to this project.
+
+## Contributing Companies
+
+> NOTE: The names of contributing companies and individuals are sorted alphabetically solely for improved readability and do not reflect any value or hierarchy.
+
+Our heartfelt thanks go to the following companies and institutes, whose support and collaboration have been invaluable to the success of this project. Their
+contributions matter greatly and are deeply appreciated:
+
+| Company                                                                       | Logo                                                                                                                                                                             |
+|-------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| [Festo Vertrieb GmbH & Co. KG](https://www.festo.com)                         | <img src="https://www.festo.com/media/fox/frontend/img/svg/logo_blue.svg" alt="Festo Logo" style="max-width:250px;">                                                             |
+| [Das Fraunhofer IOSB-INA](https://www.iosb-ina.fraunhofer.de/)                | <img src="https://www.iosb-ina.fraunhofer.de/content/dam/iosb/iosb-ina/images/Logo%20IOSB-INA.png" alt="Fraunhofer IOSB-INA Logo" style="max-width:250px;">                      |
+| [Industrial Digital Twin Association e.V. (IDTA)](https://www.idtwin.org/)    | <img src="https://industrialdigitaltwin.org/wp-content/themes/idta/vendor/images/idta-logo.png" alt="IDTWIN Logo" style="max-width:250px;">                                      |
+| [Otto Von Guericke University](https://www.ovgu.de)                           | <img src="https://www.ovgu.de/pub/theme/ovgu_min_theme/skin/img/logo_std.png" alt="OVGU Logo" style="max-width:250px;">                                                          |
+| [metaphacts GmbH](https://metaphacts.com)                                     | <img src="https://metaphacts.com/templates/jt_starter/images/logo.svg" alt="Microsoft Logo" style="max-width:250px;">                                                            |
+| [Microsoft Corporation](https://www.microsoft.com/de-de/)                     | <img src="https://img-prod-cms-rt-microsoft-com.akamaized.net/cms/api/am/imageFileData/RE1Mu3b?ver=5c31" alt="Microsoft Logo" style="max-width:250px;">                          |
+| [Phoenix Contact GmbH & Co. KG](https://www.phoenixcontact.com/)              | <img src="https://static.phoenixcontact.com/common/assets/images/signal-chain.svg" alt="Phoenix Contact Logo" style="max-width:250px;">                                          |
+| [Robert Bosch GmbH](https://www.bosch.de)                                     | <img src="https://upload.wikimedia.org/wikipedia/de/thumb/3/31/Bosch-logotype.svg/512px-Bosch-logotype.svg.png?20190123165734" alt="Robert Bosch Logo" style="max-width:250px;"> |
+| [Schneider Electric SE](https://www.se.com)                                   | <img src="https://www.se.com/ww/en/assets/wiztopic/615aeb0184d20b323d58575e/Schneider-Electric-logo-jpg-_original.jpg" alt="SICK AG Logo" style="max-width:250px;">              |
+| [SICK AG](https://www.sick.com)                                               | <img src="https://upload.wikimedia.org/wikipedia/commons/thumb/f/f1/Logo_SICK_AG_2009.svg/800px-Logo_SICK_AG_2009.svg.png" alt="SICK AG Logo" style="max-width:250px;">          |
+| [TUD Dresden University of Technology](https://tu-dresden.de/)                | <img src="https://tu-dresden.de/++theme++tud.theme.webcms2/img/tud-logo.svg" alt="TU Dresden Logo" style="max-width:250px;">                                                     |
+| [ZHAW Zürcher Hochschule für Angewandte Wissenschaften](https://www.zhaw.ch/) | <img src="https://upload.wikimedia.org/wikipedia/commons/thumb/e/e6/ZHAW_Logo.svg/514px-ZHAW_Logo.svg.png" alt="ZHAW Logo" style="max-width:250px;">                             |
+
+## Contributing People
+
+We are profoundly grateful to the following individuals for their time, effort, and dedication. Their contributions have been instrumental in the development
+and success of this project:
+
+* [AlexanderWollbrink](https://github.com/AlexanderWollbrink) ([Fraunhofer IOSB-INA](https://www.iosb-ina.fraunhofer.de/))
+* [Andreas Orzelski](https://github.com/aorzelskiGH) ([Phoenix Contact](https://www.phoenixcontact.com/))
+* [Andreas Textor](https://github.com/atextor)
+* [Bastian Roessl](mailto:[email protected]) ([Fraunhofer IOSB-INA](https://www.iosb-ina.fraunhofer.de/))
+* [Birgit Boss](https://github.com/BirgitBoss) ([Robert Bosch GmbH](https://www.bosch-connected-industry.com/))
+* [bischof-keb](https://github.com/bischof-keb)
+* [Erich Barnstedt](https://github.com/barnstee) ([Microsoft Corporation](https://www.microsoft.com/de-de/))
+* [Harish Itian](https://github.com/harishpakala) ([Otto Von Guericke University](https://www.ovgu.de))
+* [Hossein Rimaz](https://github.com/mhrimaz) ([metaphacts GmbH](https://metaphacts.com))
+* [heidese-sick](https://github.com/heidese-sick) ([SICK AG](https://www.sick.com/de/en/))
+* [Jan Roger Rossebø](https://github.com/rosseboe)
+* [jjtikekar](https://github.com/jjtikekar) ([Fraunhofer IOSB-INA](https://www.iosb-ina.fraunhofer.de/))
+* [Juilee Tikekar](https://github.com/juileetikekar) ([Industrial Digital Twin Association e.V. (IDTA)](https://www.idtwin.org/))
+* [Kazeem Oladipupo](https://github.com/Kaz040) ([Otto Von Guericke University](https://www.ovgu.de))
+* [krahlro-sick](https://github.com/krahlro-sick) ([SICK AG](https://www.sick.com/de/en/))
+* [Marko Ristin](https://github.com/mristin) ([ZHAW Zürcher Hochschule für Angewandte Wissenschaften](https://www.zhaw.ch/))
+* [Marta Fullen](https://github.com/martafullen) ([Fraunhofer IOSB-INA](https://www.iosb-ina.fraunhofer.de/))
+* [Michael Hoffmeister](https://github.com/MichaelHoffmeisterFesto) ([Festo](https://www.festo.com))
+* [Moritz Marseu](https://github.com/mmarseu) ([Festo](https://www.festo.com))
+* [Mubariz Hajimuradov](https://github.com/muba00)
+* [Nico Braunisch](mailto:[email protected]) ([TU Dresden](https://tu-dresden.de/))
+* [Oliver Fries](https://github.com/Freezor) ([Fraunhofer IOSB-INA](https://www.iosb-ina.fraunhofer.de/))
+* [Pascal Neuperger](https://github.com/logmanoriginal)
+* [Sebastian Wagner](https://github.com/SWagnerSE) ([Schneider Electric Automation GmbH](https://www.se.com/ww/en/))
+
+## You would like to join this list? How can you help the project?
+
+If you would like to contribute to this project and see your name on this list, we are currently looking for contributions in the following areas:
+
+- [X] Bug fixes
+- [X] Documentation improvements
+- [ ] Feature enhancements
+
+For more information, please refer to our [CONTRIBUTING](CONTRIBUTING.md) guide.
diff --git a/README.md b/README.md
@@ -55,7 +55,8 @@ If you want to request new features or report bugs, please
 
 ## Contributing
 
-Please see [CONTRIBUTING](CONTRIBUTING.md) for instructions on joining the development and general contribution guidelines.
+Please see [CONTRIBUTING](CONTRIBUTING.md) for instructions on joining the development and general contribution guidelines. 
+For a complete list of all contributing individuals and companies, please visit our [CONTRIBUTORS](CONTRIBUTORS.md) page.
 
 ## Documentation
 

diff --git a/contributors.txt b/contributors.txt
@@ -0,0 +1,34 @@
+[email protected]
+[email protected]
+49699333+dependabot[bot]@users.noreply.github.com
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
diff --git a/src/AasxPackageExplorer.sln b/src/AasxPackageExplorer.sln
@@ -48,6 +48,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		Notes_V3.md = Notes_V3.md
 		README-packages.md = README-packages.md
+		..\CHANGELOG.md = ..\CHANGELOG.md
+		..\CODE_OF_CONDUCT.md = ..\CODE_OF_CONDUCT.md
+		..\CONTRIBUTING.md = ..\CONTRIBUTING.md
+		..\CONTRIBUTORS.md = ..\CONTRIBUTORS.md
+		..\README.md = ..\README.md
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AasxDictionaryImport", "AasxDictionaryImport\AasxDictionaryImport.csproj", "{DEC389BC-59BC-48E5-B163-6E44CE782C4A}"