Skip to content

Commit

Permalink
Fix #98 - CBI contains incorrect license declarations
Browse files Browse the repository at this point in the history
EPL 2.0 updates:
- Update license headers in all java source files
- Update checkstyle for EPL 2.0 java source headers
- Update license headers in non-java files where they exist
- Update {about,notice,license}.html resources to EPL 2.0
- Update main pom.xml links to project resources at Github

Signed-off-by: Mat Booth <mat.booth@gmail.com>
  • Loading branch information
mbooth101 authored and akurtakov committed Jan 31, 2022
1 parent 5f36087 commit dd82d29
Show file tree
Hide file tree
Showing 142 changed files with 4,110 additions and 2,977 deletions.
8 changes: 5 additions & 3 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@

###############################################################################
# Copyright (c) 2016 Eclipse Foundation and others
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# This program and the accompanying materials
# are made available under the terms of the Eclipse Public License 2.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
# https://www.eclipse.org/legal/epl-2.0
#
# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Mikaël Barbero - initial implementation
Expand Down
8 changes: 5 additions & 3 deletions checkstyle/src/main/resources/EPL-LICENSE.regexp.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
^/\*{79}$
^ \* Copyright \(c\) [0-9]{4}(, [0-9]{4})? .*
^ \* All rights reserved. This program and the accompanying materials$
^ \* are made available under the terms of the Eclipse Public License v1.0$
^ \* This program and the accompanying materials$
^ \* are made available under the terms of the Eclipse Public License 2.0$
^ \* which accompanies this distribution, and is available at$
^ \* http://www.eclipse.org/legal/epl-v10.html$
^ \* https://www.eclipse.org/legal/epl-2.0$
^ \*( )?$
^ \* SPDX-License-Identifier: EPL-2.0$
^ \*( )?$
^ \* Contributors:( )?$
^ \* .* - .*$
Expand Down
2 changes: 1 addition & 1 deletion checkstyle/src/main/resources/eclipse_checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,6 @@
<module name="RegexpHeader">
<!-- See https://www.eclipse.org/legal/copyrightandlicensenotice.php for format -->
<property name="headerFile" value="${checkstyle.header.file}"/>
<property name="multiLines" value="9"/>
<property name="multiLines" value="11"/>
</module>
</module>
8 changes: 5 additions & 3 deletions cli-tools/signing/jar/config.sample
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@

##############################################################################
# Copyright (c) 2005, 2016 Eclipse Foundation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# This program and the accompanying materials
# are made available under the terms of the Eclipse Public License 2.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
# https://www.eclipse.org/legal/epl-2.0
#
# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Denis Roy (Eclipse Foundation)
Expand Down
8 changes: 5 additions & 3 deletions cli-tools/signing/jar/config.secret.sample
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@

##############################################################################
# Copyright (c) 2005, 2016 Eclipse Foundation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# This program and the accompanying materials
# are made available under the terms of the Eclipse Public License 2.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
# https://www.eclipse.org/legal/epl-2.0
#
# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Denis Roy (Eclipse Foundation)
Expand Down
8 changes: 5 additions & 3 deletions cli-tools/signing/jar/jar_processor_signer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@

##############################################################################
# Copyright (c) 2005-2016 Eclipse Foundation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# This program and the accompanying materials
# are made available under the terms of the Eclipse Public License 2.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
# https://www.eclipse.org/legal/epl-2.0
#
# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Denis Roy (Eclipse Foundation)
Expand Down
8 changes: 5 additions & 3 deletions cli-tools/signing/jar/sign
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@

##############################################################################
# Copyright (c) 2005-2016 Eclipse Foundation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# This program and the accompanying materials
# are made available under the terms of the Eclipse Public License 2.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
# https://www.eclipse.org/legal/epl-2.0
#
# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Denis Roy (Eclipse Foundation)
Expand Down
8 changes: 5 additions & 3 deletions cli-tools/signing/jar/sign-lib.shs
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@

##############################################################################
# Copyright (c) 2016 Eclipse Foundation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# This program and the accompanying materials
# are made available under the terms of the Eclipse Public License 2.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
# https://www.eclipse.org/legal/epl-2.0
#
# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Mikaël Barbero (Eclipse Foundation)
Expand Down
8 changes: 5 additions & 3 deletions cli-tools/signing/jar/sign_queue_process.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@

##############################################################################
# Copyright (c) 2005-2016 Eclipse Foundation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# This program and the accompanying materials
# are made available under the terms of the Eclipse Public License 2.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
# https://www.eclipse.org/legal/epl-2.0
#
# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Denis Roy (Eclipse Foundation)
Expand Down
8 changes: 5 additions & 3 deletions cli-tools/signing/jar/tests/init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@

##############################################################################
# Copyright (c) 2016 Eclipse Foundation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# This program and the accompanying materials
# are made available under the terms of the Eclipse Public License 2.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
# https://www.eclipse.org/legal/epl-2.0
#
# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Mikaël Barbero (Eclipse Foundation)
Expand Down
8 changes: 5 additions & 3 deletions cli-tools/signing/jar/tests/tcpecho.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@

##############################################################################
# Copyright (c) 2016 Eclipse Foundation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# This program and the accompanying materials
# are made available under the terms of the Eclipse Public License 2.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
# https://www.eclipse.org/legal/epl-2.0
#
# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Mikaël Barbero (Eclipse Foundation)
Expand Down
8 changes: 5 additions & 3 deletions cli-tools/signing/jar/tests/test_jar_processor_signer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@

##############################################################################
# Copyright (c) 2016 Eclipse Foundation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# This program and the accompanying materials
# are made available under the terms of the Eclipse Public License 2.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
# https://www.eclipse.org/legal/epl-2.0
#
# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Mikaël Barbero (Eclipse Foundation)
Expand Down
8 changes: 5 additions & 3 deletions cli-tools/signing/jar/tests/test_sign.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@

##############################################################################
# Copyright (c) 2016 Eclipse Foundation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# This program and the accompanying materials
# are made available under the terms of the Eclipse Public License 2.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
# https://www.eclipse.org/legal/epl-2.0
#
# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Mikaël Barbero (Eclipse Foundation)
Expand Down
8 changes: 5 additions & 3 deletions cli-tools/signing/jar/tests/test_sign_queue_process.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@

##############################################################################
# Copyright (c) 2016 Eclipse Foundation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# This program and the accompanying materials
# are made available under the terms of the Eclipse Public License 2.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
# https://www.eclipse.org/legal/epl-2.0
#
# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# Mikaël Barbero (Eclipse Foundation)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015, 2019 Eclipse Foundation and others
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
* https://www.eclipse.org/legal/epl-2.0
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Mikaël Barbero - initial implementation
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015, 2019 Eclipse Foundation and others
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
* https://www.eclipse.org/legal/epl-2.0
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Mikaël Barbero - initial implementation
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2016 Eclipse Foundation and others
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
* https://www.eclipse.org/legal/epl-2.0
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Mikael Barbero - initial implementation
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 Eclipse Foundation and others
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
* https://www.eclipse.org/legal/epl-2.0
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Mikael Barbero - initial implementation
Expand Down
8 changes: 5 additions & 3 deletions common/src/main/java/org/eclipse/cbi/common/util/Paths.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015 Eclipse Foundation and others
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
* https://www.eclipse.org/legal/epl-2.0
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Mikael Barbero - initial implementation
Expand Down
8 changes: 5 additions & 3 deletions common/src/main/java/org/eclipse/cbi/common/util/Record.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2016 Eclipse Foundation and others
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
* https://www.eclipse.org/legal/epl-2.0
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Mikael Barbero - initial implementation
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2016 Eclipse Foundation and others
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
* https://www.eclipse.org/legal/epl-2.0
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Mikael Barbero - initial implementation
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2016 Eclipse Foundation and others
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
* https://www.eclipse.org/legal/epl-2.0
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Mikael Barbero - initial implementation
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2016 Eclipse Foundation and others
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
* https://www.eclipse.org/legal/epl-2.0
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Mikael Barbero - initial implementation
Expand Down
8 changes: 5 additions & 3 deletions common/src/main/java/org/eclipse/cbi/common/util/Zips.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
/*******************************************************************************
* Copyright (c) 2015, 2018 Eclipse Foundation and others
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
* https://www.eclipse.org/legal/epl-2.0
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Mikael Barbero - initial implementation
Expand Down
Loading

0 comments on commit dd82d29

Please sign in to comment.