Skip to content

Commit

Permalink
Changed license from EPL v1 to EPL v2 (#466)
Browse files Browse the repository at this point in the history
* updated license headers
* added NOTICE files
* moved about.html to NOTICE files
* changed main project license
* updated build.properties
* added files to check to prevent error about missing about.html
* removed license info on p2 feature

Signed-off-by: Kai Kreuzer <[email protected]>
  • Loading branch information
kaikreuzer authored and wborn committed Jan 16, 2019
1 parent eb8abdc commit 10acf5c
Show file tree
Hide file tree
Showing 202 changed files with 1,941 additions and 1,512 deletions.
416 changes: 245 additions & 171 deletions LICENSE

Large diffs are not rendered by default.

13 changes: 13 additions & 0 deletions bundles/org.openhab.core.compat1x.test/NOTICE
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
This content is produced and maintained by the openHAB project.

* Project home: https://www.openhab.org

== Declared Project Licenses

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/.

== Source Code

https://github.com/openhab/openhab-core
28 changes: 0 additions & 28 deletions bundles/org.openhab.core.compat1x.test/about.html

This file was deleted.

2 changes: 1 addition & 1 deletion bundles/org.openhab.core.compat1x.test/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ source.. = src/test/java/
output.. = target/test-classes/
bin.includes = META-INF/,\
.,\
about.html
NOTICE
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
/**
* Copyright (c) 2015-2019 by the respective copyright holders.
* Copyright (c) 2010-2019 Contributors to the openHAB project
*
* 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
* See the NOTICE file(s) distributed with this work for additional
* information.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.core.compat1x.internal;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
/**
* Copyright (c) 2015-2019 by the respective copyright holders.
* Copyright (c) 2010-2019 Contributors to the openHAB project
*
* 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
* See the NOTICE file(s) distributed with this work for additional
* information.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.core.compat1x.internal;

Expand Down
13 changes: 13 additions & 0 deletions bundles/org.openhab.core.compat1x/NOTICE
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
This content is produced and maintained by the openHAB project.

* Project home: https://www.openhab.org

== Declared Project Licenses

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/.

== Source Code

https://github.com/openhab/openhab-core
28 changes: 0 additions & 28 deletions bundles/org.openhab.core.compat1x/about.html

This file was deleted.

2 changes: 1 addition & 1 deletion bundles/org.openhab.core.compat1x/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ bin.includes = META-INF/,\
.,\
lib/,\
OSGI-INF/,\
about.html
NOTICE
source.. = src/main/java/
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
/**
* Copyright (c) 2015-2019 by the respective copyright holders.
* Copyright (c) 2010-2019 Contributors to the openHAB project
*
* 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
* See the NOTICE file(s) distributed with this work for additional
* information.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.core.autoupdate;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
/**
* Copyright (c) 2015-2019 by the respective copyright holders.
* Copyright (c) 2010-2019 Contributors to the openHAB project
*
* 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
* See the NOTICE file(s) distributed with this work for additional
* information.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.core.autoupdate.internal;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
/**
* Copyright (c) 2015-2019 by the respective copyright holders.
* Copyright (c) 2010-2019 Contributors to the openHAB project
*
* 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
* See the NOTICE file(s) distributed with this work for additional
* information.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.core.binding;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
/**
* Copyright (c) 2015-2019 by the respective copyright holders.
* Copyright (c) 2010-2019 Contributors to the openHAB project
*
* 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
* See the NOTICE file(s) distributed with this work for additional
* information.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.core.binding;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
/**
* Copyright (c) 2015-2019 by the respective copyright holders.
* Copyright (c) 2010-2019 Contributors to the openHAB project
*
* 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
* See the NOTICE file(s) distributed with this work for additional
* information.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.core.binding;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
/**
* Copyright (c) 2015-2019 by the respective copyright holders.
* Copyright (c) 2010-2019 Contributors to the openHAB project
*
* 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
* See the NOTICE file(s) distributed with this work for additional
* information.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.core.binding;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
/**
* Copyright (c) 2015-2019 by the respective copyright holders.
* Copyright (c) 2010-2019 Contributors to the openHAB project
*
* 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
* See the NOTICE file(s) distributed with this work for additional
* information.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.core.binding;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
/**
* Copyright (c) 2015-2019 by the respective copyright holders.
* Copyright (c) 2010-2019 Contributors to the openHAB project
*
* 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
* See the NOTICE file(s) distributed with this work for additional
* information.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.core.binding.internal;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
/**
* Copyright (c) 2015-2019 by the respective copyright holders.
* Copyright (c) 2010-2019 Contributors to the openHAB project
*
* 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
* See the NOTICE file(s) distributed with this work for additional
* information.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.core.binding.internal;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
/**
* Copyright (c) 2015-2019 by the respective copyright holders.
* Copyright (c) 2010-2019 Contributors to the openHAB project
*
* 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
* See the NOTICE file(s) distributed with this work for additional
* information.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.core.compat1x.internal;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
/**
* Copyright (c) 2015-2019 by the respective copyright holders.
* Copyright (c) 2010-2019 Contributors to the openHAB project
*
* 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
* See the NOTICE file(s) distributed with this work for additional
* information.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.core.compat1x.internal;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
/**
* Copyright (c) 2015-2019 by the respective copyright holders.
* Copyright (c) 2010-2019 Contributors to the openHAB project
*
* 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
* See the NOTICE file(s) distributed with this work for additional
* information.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.core.compat1x.internal;

Expand Down
Loading

0 comments on commit 10acf5c

Please sign in to comment.