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.

Sign up for GitHub

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

Jump to bottom

Licence change: From EPL1 to EPL2 #135

Merged
merged 7 commits into from
May 31, 2024
Merged

Licence change: From EPL1 to EPL2 #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cc6f09d
Licence change: From EPL1 to EPL2
cstamas May 30, 2024
e2ca448
Add comment
cstamas May 30, 2024
a2304b7
Spotless reformat
cstamas May 30, 2024
661e640
Add more comments
cstamas May 30, 2024
8e0e4e7
Merge remote-tracking branch 'origin/main' into epl2-license
cstamas May 30, 2024
1162018
Update headers
cstamas May 30, 2024
83354e3
Merge remote-tracking branch 'origin/main' into epl2-license
cstamas May 31, 2024
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
  •  
  •  
  •  
279 changes: 243 additions & 36 deletions LICENSE.txt
View file
Open in desktop

Large diffs are not rendered by default.

21 changes: 12 additions & 9 deletions org.eclipse.sisu.inject.extender/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--
~ Copyright (c) 2010-present Sonatype, Inc.
~ 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
~
~ Contributors:
~ Stuart McCulloch (Sonatype, Inc.) - initial API and implementation

Copyright (c) 2010-2024 Sonatype, Inc.
All rights reserved. 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
https://www.eclipse.org/legal/epl-2.0/

SPDX-License-Identifier: EPL-2.0

Contributors:
Stuart McCulloch (Sonatype, Inc.) - initial API and implementation

-->

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
Expand Down
21 changes: 12 additions & 9 deletions org.eclipse.sisu.inject/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--
~ Copyright (c) 2010-present Sonatype, Inc.
~ 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
~
~ Contributors:
~ Stuart McCulloch (Sonatype, Inc.) - initial API and implementation

Copyright (c) 2010-2024 Sonatype, Inc.
All rights reserved. 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
https://www.eclipse.org/legal/epl-2.0/

SPDX-License-Identifier: EPL-2.0

Contributors:
Stuart McCulloch (Sonatype, Inc.) - initial API and implementation

-->

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
Expand Down
12 changes: 7 additions & 5 deletions org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/BeanEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
/*******************************************************************************
* Copyright (c) 2010-present Sonatype, Inc.
/*
* Copyright (c) 2010-2024 Sonatype, Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* 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:
* Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
*******************************************************************************/
*/
package org.eclipse.sisu;

import java.lang.annotation.Annotation;
Expand Down
12 changes: 7 additions & 5 deletions org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/Description.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
/*******************************************************************************
* Copyright (c) 2010-present Sonatype, Inc.
/*
* Copyright (c) 2010-2024 Sonatype, Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* 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:
* Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
*******************************************************************************/
*/
package org.eclipse.sisu;

import java.lang.annotation.Documented;
Expand Down
12 changes: 7 additions & 5 deletions org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/Dynamic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
/*******************************************************************************
* Copyright (c) 2010-present Sonatype, Inc.
/*
* Copyright (c) 2010-2024 Sonatype, Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* 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:
* Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
*******************************************************************************/
*/
package org.eclipse.sisu;

import java.lang.annotation.Documented;
Expand Down
12 changes: 7 additions & 5 deletions org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/EagerSingleton.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
/*******************************************************************************
* Copyright (c) 2010-present Sonatype, Inc.
/*
* Copyright (c) 2010-2024 Sonatype, Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* 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:
* Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
*******************************************************************************/
*/
package org.eclipse.sisu;

import java.lang.annotation.Documented;
Expand Down
12 changes: 7 additions & 5 deletions org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/Hidden.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
/*******************************************************************************
* Copyright (c) 2010-present Sonatype, Inc.
/*
* Copyright (c) 2010-2024 Sonatype, Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* 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:
* Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
*******************************************************************************/
*/
package org.eclipse.sisu;

import java.lang.annotation.Documented;
Expand Down
12 changes: 7 additions & 5 deletions org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/Mediator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
/*******************************************************************************
* Copyright (c) 2010-present Sonatype, Inc.
/*
* Copyright (c) 2010-2024 Sonatype, Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* 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:
* Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
*******************************************************************************/
*/
package org.eclipse.sisu;

import java.lang.annotation.Annotation;
Expand Down
12 changes: 7 additions & 5 deletions org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/Nullable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
/*******************************************************************************
* Copyright (c) 2010-present Sonatype, Inc.
/*
* Copyright (c) 2010-2024 Sonatype, Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* 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:
* Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
*******************************************************************************/
*/
package org.eclipse.sisu;

import java.lang.annotation.Documented;
Expand Down
12 changes: 7 additions & 5 deletions org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/Parameters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
/*******************************************************************************
* Copyright (c) 2010-present Sonatype, Inc.
/*
* Copyright (c) 2010-2024 Sonatype, Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* 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:
* Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
*******************************************************************************/
*/
package org.eclipse.sisu;

import java.lang.annotation.Documented;
Expand Down
19 changes: 9 additions & 10 deletions org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/PostConstruct.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
/********************************************************************************
* Copyright (c) 2023-present Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
*
/*
* Copyright (c) 2010-2024 Sonatype, Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* 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-1.0
********************************************************************************/
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
*/
package org.eclipse.sisu;

import java.lang.annotation.Documented;
Expand Down
19 changes: 9 additions & 10 deletions org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/PreDestroy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
/********************************************************************************
* Copyright (c) 2023-present Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
*
/*
* Copyright (c) 2010-2024 Sonatype, Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* 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-1.0
********************************************************************************/
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
*/
package org.eclipse.sisu;

import java.lang.annotation.Documented;
Expand Down
12 changes: 7 additions & 5 deletions org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/Priority.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
/*******************************************************************************
* Copyright (c) 2010-present Sonatype, Inc.
/*
* Copyright (c) 2010-2024 Sonatype, Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* 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:
* Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
*******************************************************************************/
*/
package org.eclipse.sisu;

import java.lang.annotation.Documented;
Expand Down
12 changes: 7 additions & 5 deletions org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/Typed.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
/*******************************************************************************
* Copyright (c) 2010-present Sonatype, Inc.
/*
* Copyright (c) 2010-2024 Sonatype, Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* 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:
* Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
*******************************************************************************/
*/
package org.eclipse.sisu;

import java.lang.annotation.Documented;
Expand Down
12 changes: 7 additions & 5 deletions org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/bean/BeanBinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
/*******************************************************************************
* Copyright (c) 2010-present Sonatype, Inc.
/*
* Copyright (c) 2010-2024 Sonatype, Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* 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:
* Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
*******************************************************************************/
*/
package org.eclipse.sisu.bean;

import com.google.inject.TypeLiteral;
Expand Down
12 changes: 7 additions & 5 deletions org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/bean/BeanInjector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
/*******************************************************************************
* Copyright (c) 2010-present Sonatype, Inc.
/*
* Copyright (c) 2010-2024 Sonatype, Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* 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:
* Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
*******************************************************************************/
*/
package org.eclipse.sisu.bean;

import java.util.List;
Expand Down
12 changes: 7 additions & 5 deletions org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/bean/BeanLifecycle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
/*******************************************************************************
* Copyright (c) 2010-present Sonatype, Inc.
/*
* Copyright (c) 2010-2024 Sonatype, Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* 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:
* Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
*******************************************************************************/
*/
package org.eclipse.sisu.bean;

import java.lang.reflect.AccessibleObject;
Expand Down
12 changes: 7 additions & 5 deletions org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/bean/BeanListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
/*******************************************************************************
* Copyright (c) 2010-present Sonatype, Inc.
/*
* Copyright (c) 2010-2024 Sonatype, Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* 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:
* Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
*******************************************************************************/
*/
package org.eclipse.sisu.bean;

import java.util.ArrayList;
Expand Down
Loading