Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(docs): relicensing from EPL-1.0 to EPL-2.0 #756

Merged
merged 1 commit into from
Jan 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
# Copyright Bosch Software Innovations GmbH, 2017.
# Part of the SW360 Portal Project.
#
# All rights reserved. This configuration file is provided to you under the
# terms and conditions of the Eclipse Distribution License v1.0 which
# accompanies this distribution, and is available at
# http://www.eclipse.org/org/documents/edl-v10.php
# This program and the accompanying materials are made
# available under the terms of the Eclipse Public License 2.0
# which is available at https://www.eclipse.org/legal/epl-2.0/
#
# SPDX-License-Identifier: EPL-2.0
#
# initial author: maximilian.huber@tngtech.com
# -----------------------------------------------------------------------------
Expand Down Expand Up @@ -59,4 +60,3 @@ matrix:
# script: scripts/compileWithDocker.sh
allow_failures:
- name: mvn dependency:analyze

18 changes: 8 additions & 10 deletions .travis/testForLicenseHeaders.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
# Copyright Siemens AG, 2017.
# Part of the SW360 Portal Project.
#
# All rights reserved. This configuration file is provided to you under the
# terms and conditions of the Eclipse Distribution License v1.0 which
# accompanies this distribution, and is available at
# http://www.eclipse.org/org/documents/edl-v10.php
# This program and the accompanying materials are made
# available under the terms of the Eclipse Public License 2.0
# which is available at https://www.eclipse.org/legal/epl-2.0/
#
# SPDX-License-Identifier: EPL-2.0
#
# initial author: maximilian.huber@tngtech.com
# -----------------------------------------------------------------------------
Expand All @@ -19,17 +20,14 @@ while read file ; do
if ! head -15 $file | grep -q 'SPDX-License-Identifier:' $file; then
echo "WARN: no 'SPDX-License-Identifier' in $file"
fi
if head -15 $file | grep -q 'http://www.eclipse.org/legal/epl-v10.html'; then
if head -15 $file | grep -q 'https://www.eclipse.org/legal/epl-2.0/'; then
continue # epl found
fi
if head -15 $file | grep -q 'http://www.eclipse.org/org/documents/edl-v10.php'; then
if head -15 $file | grep -q 'SPDX-License-Identifier: EPL-2.0'; then
continue # edl found
fi
if head -15 $file | grep -q 'Modifications applied by Siemens AG'; then
continue
fi

echo "$(tput bold)ERROR: neither epl-1.0 nor edl-1.0 are specified in $file$(tput sgr0)"
echo "$(tput bold)ERROR: no EPL-2.0 licensing is specified in $file$(tput sgr0)"
failure=true
done <<< "$(git ls-files \
| grep -Ev '\.(csv|rdf|ent|dtd|lar|png|gif|psd|ico|jpg|docx|gitignore|cert|jks)' \
Expand Down
13 changes: 5 additions & 8 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

This is the changelog file of the sw360 software. It starts with the first release being provided at eclipse/sw360. For older releases, please refer to the first project location:

https://github.com/sw360/sw360portal
https://github.com/eclipse/sw360

## sw360-6.0.0-M1

Expand Down Expand Up @@ -375,11 +375,8 @@ Because of changes in the couchdb schema you likely need to run a migration scri

## License

SPDX Short Identifier: http://spdx.org/licenses/EPL-1.0
This program and the accompanying materials are made
available under the terms of the Eclipse Public License 2.0
which is available at https://www.eclipse.org/legal/epl-2.0/

SPDX-License-Identifier: EPL-1.0

All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html
SPDX-License-Identifier: EPL-2.0
360 changes: 283 additions & 77 deletions LICENSE

Large diffs are not rendered by default.

14 changes: 6 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ The software is tested with

### PROBLEMS

Running with the tested software shows no problems if you encounter some please report them at:
Running with the tested software shows no problems if you encounter some please report them at:

https://github.com/eclipse/sw360/issues

Expand Down Expand Up @@ -166,12 +166,10 @@ are excluded from the WAR file while packaging. Using below configuration,

### License

SPDX-License-Identifier: EPL-2.0

SPDX Short Identifier: http://spdx.org/licenses/EPL-1.0
This program and the accompanying materials are made
available under the terms of the Eclipse Public License 2.0
which is available at https://www.eclipse.org/legal/epl-2.0/

SPDX-License-Identifier: EPL-1.0

All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html
SPDX-License-Identifier: EPL-2.0
9 changes: 4 additions & 5 deletions backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@
<!--
~ Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
~
~ SPDX-License-Identifier: EPL-1.0
~ This program and the accompanying materials are made
~ available under the terms of the Eclipse Public License 2.0
~ which is available at https://www.eclipse.org/legal/epl-2.0/
~
~ All rights reserved. This program and the accompanying materials
~ are made available under the terms of the Eclipse Public License v1.0
~ which accompanies this distribution, and is available at
~ http://www.eclipse.org/legal/epl-v10.html
~ SPDX-License-Identifier: EPL-2.0
-->

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Expand Down
9 changes: 4 additions & 5 deletions backend/src-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@
<!--
~ Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
~
~ SPDX-License-Identifier: EPL-1.0
~ This program and the accompanying materials are made
~ available under the terms of the Eclipse Public License 2.0
~ which is available at https://www.eclipse.org/legal/epl-2.0/
~
~ All rights reserved. This program and the accompanying materials
~ are made available under the terms of the Eclipse Public License v1.0
~ which accompanies this distribution, and is available at
~ http://www.eclipse.org/legal/epl-v10.html
~ SPDX-License-Identifier: EPL-2.0
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
/*
* Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
*
* SPDX-License-Identifier: EPL-1.0
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
* SPDX-License-Identifier: EPL-2.0
*/
package org.eclipse.sw360.common.utils;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
/*
* Copyright Siemens AG, 2014-2015. Part of the SW360 Portal Project.
*
* SPDX-License-Identifier: EPL-1.0
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
* SPDX-License-Identifier: EPL-2.0
*/
package org.eclipse.sw360.components.summary;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
/*
* Copyright Siemens AG, 2014-2015. Part of the SW360 Portal Project.
*
* SPDX-License-Identifier: EPL-1.0
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
* SPDX-License-Identifier: EPL-2.0
*/
package org.eclipse.sw360.components.summary;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
/*
* Copyright Siemens AG, 2014-2016. Part of the SW360 Portal Project.
*
* SPDX-License-Identifier: EPL-1.0
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
* SPDX-License-Identifier: EPL-2.0
*/
package org.eclipse.sw360.components.summary;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
/*
* Copyright Siemens AG, 2016. Part of the SW360 Portal Project.
*
* SPDX-License-Identifier: EPL-1.0
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
* SPDX-License-Identifier: EPL-2.0
*/
package org.eclipse.sw360.components.summary;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
/*
* Copyright Siemens AG, 2014-2015. Part of the SW360 Portal Project.
*
* SPDX-License-Identifier: EPL-1.0
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
* SPDX-License-Identifier: EPL-2.0
*/
package org.eclipse.sw360.components.summary;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
/*
* Copyright Siemens AG, 2014-2018. Part of the SW360 Portal Project.
*
* SPDX-License-Identifier: EPL-1.0
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
* SPDX-License-Identifier: EPL-2.0
*/
package org.eclipse.sw360.components.summary;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
/*
* Copyright Siemens AG, 2014-2015. Part of the SW360 Portal Project.
*
* SPDX-License-Identifier: EPL-1.0
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
* SPDX-License-Identifier: EPL-2.0
*/
package org.eclipse.sw360.components.summary;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
/*
* Copyright Siemens AG, 2014-2015. Part of the SW360 Portal Project.
*
* SPDX-License-Identifier: EPL-1.0
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
* SPDX-License-Identifier: EPL-2.0
*/
package org.eclipse.sw360.components.summary;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
/*
* Copyright Siemens AG, 2014-2015. Part of the SW360 Portal Project.
*
* SPDX-License-Identifier: EPL-1.0
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
* SPDX-License-Identifier: EPL-2.0
*/
package org.eclipse.sw360.components.summary;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
/*
* Copyright Siemens AG, 2014-2015. Part of the SW360 Portal Project.
*
* SPDX-License-Identifier: EPL-1.0
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
* SPDX-License-Identifier: EPL-2.0
*/
package org.eclipse.sw360.datahandler.couchdb;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
/*
* Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
*
* SPDX-License-Identifier: EPL-1.0
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
* SPDX-License-Identifier: EPL-2.0
*/

package org.eclipse.sw360.datahandler.db;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
/*
* Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
*
* SPDX-License-Identifier: EPL-1.0
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
* SPDX-License-Identifier: EPL-2.0
*/

package org.eclipse.sw360.datahandler.db;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
/*
* Copyright Siemens AG, 2016, 2019. Part of the SW360 Portal Project.
*
* SPDX-License-Identifier: EPL-1.0
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
* SPDX-License-Identifier: EPL-2.0
*/
package org.eclipse.sw360.datahandler.db;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
/*
* Copyright Siemens AG, 2018. Part of the SW360 Portal Project.
*
* SPDX-License-Identifier: EPL-1.0
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
* which is available at https://www.eclipse.org/legal/epl-2.0/
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
* SPDX-License-Identifier: EPL-2.0
*/
package org.eclipse.sw360.datahandler.db;

Expand Down
Loading