Skip to content
This repository was archived by the owner on Jan 11, 2021. It is now read-only.

Commit a257142

Browse files
OndroMihOndroMih
committed
eclipse#45 Updated license headers which had attribution to Eclipse committers
To match the agreed license template: https://wiki.eclipse.org/ContributingGuidelines#License_of_the_contributed_resources Signed-off-by:Ondrej Mihalyi <[email protected]>
1 parent eea43c8 commit a257142

34 files changed

+308
-433
lines changed

‎NOTICE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ Gerhard Petracek [email protected],
2222
Romain Manni-Bucau [email protected],
2323
Ron Smeral [email protected],
2424
Emily Jiang [email protected],
25-
Ondrej Mihalyi ,
25+
Ondrej Mihalyi [email protected],
2626
Gunnar Morling [email protected]
2727
</text>

‎api/pom.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Licensed under the Apache License, Version 2.0 (the
4-
"License"); you may not use this file except in compliance
5-
with the License. You may obtain a copy of the License at
3+
Copyright (c) 2016-2017 Contributors to the Eclipse Foundation
64
7-
http://www.apache.org/licenses/LICENSE-2.0
5+
See the NOTICES file(s) distributed with this work for additional
6+
information regarding copyright ownership.
87
9-
Unless required by applicable law or agreed to in writing,
10-
software distributed under the License is distributed on an
11-
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
12-
KIND, either express or implied. See the License for the
13-
specific language governing permissions and limitations
14-
under the License.
8+
All rights reserved. This program and the accompanying materials
9+
are made available under the terms of the Apache License, Version 2.0
10+
which accompanies this distribution and is available at
11+
http://www.opensource.org/licenses/apache2.0.php
12+
13+
SPDX-License-Identifier: Apache-2.0
1514
-->
15+
1616
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1717
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1818
<modelVersion>4.0.0</modelVersion>

‎api/src/main/java/org/eclipse/microprofile/config/inject/ConfigProperty.java

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
1-
/*
2-
* Copyright (c) 2016-2017 Payara Services Ltd., IBM Corp. and others
1+
/**********************************************************************
2+
* Copyright (c) 2016-2017 Contributors to the Eclipse Foundation
33
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* You may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
4+
* See the NOTICES file(s) distributed with this work for additional
5+
* information regarding copyright ownership.
76
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
7+
* All rights reserved. This program and the accompanying materials
8+
* are made available under the terms of the Apache License, Version 2.0
9+
* which accompanies this distribution and is available at
10+
* http://www.opensource.org/licenses/apache2.0.php
911
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
15-
*
16-
*/
12+
* SPDX-License-Identifier: Apache-2.0
13+
**********************************************************************/
1714

1815
package org.eclipse.microprofile.config.inject;
1916

‎api/src/main/java/org/eclipse/microprofile/config/spi/ConfigBuilder.java

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,15 @@
1-
/*
2-
*******************************************************************************
3-
* Copyright (c) 2016-1027 Contributors to the Eclipse Foundation
1+
/**********************************************************************
2+
* Copyright (c) 2016-2017 Contributors to the Eclipse Foundation
43
*
54
* See the NOTICES file(s) distributed with this work for additional
65
* information regarding copyright ownership.
76
*
8-
* Licensed under the Apache License, Version 2.0 (the "License");
9-
* You may not use this file except in compliance with the License.
10-
* You may obtain a copy of the License at
7+
* All rights reserved. This program and the accompanying materials
8+
* are made available under the terms of the Apache License, Version 2.0
9+
* which accompanies this distribution and is available at
10+
* http://www.opensource.org/licenses/apache2.0.php
1111
*
12-
* http://www.apache.org/licenses/LICENSE-2.0
13-
*
14-
* Unless required by applicable law or agreed to in writing, software
15-
* distributed under the License is distributed on an "AS IS" BASIS,
16-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17-
* See the License for the specific language governing permissions and
18-
* limitations under the License.
12+
* SPDX-License-Identifier: Apache-2.0
1913
*
2014
* Contributors:
2115
* 2016-07-20 - Romain Manni-Bucau
@@ -25,7 +19,7 @@
2519
* 2016-11-14 - Emily Jiang / IBM
2620
* API improvements + JavaDoc f53258b8eca1253fee52
2721
*
28-
*******************************************************************************/
22+
************************************************************************/
2923
package org.eclipse.microprofile.config.spi;
3024

3125
import org.eclipse.microprofile.config.Config;

‎pom.xml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Licensed under the Apache License, Version 2.0 (the
4-
"License"); you may not use this file except in compliance
5-
with the License. You may obtain a copy of the License at
3+
Copyright (c) 2016-2017 Contributors to the Eclipse Foundation
64
7-
http://www.apache.org/licenses/LICENSE-2.0
5+
See the NOTICES file(s) distributed with this work for additional
6+
information regarding copyright ownership.
87
9-
Unless required by applicable law or agreed to in writing,
10-
software distributed under the License is distributed on an
11-
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
12-
KIND, either express or implied. See the License for the
13-
specific language governing permissions and limitations
14-
under the License.
8+
All rights reserved. This program and the accompanying materials
9+
are made available under the terms of the Apache License, Version 2.0
10+
which accompanies this distribution and is available at
11+
http://www.opensource.org/licenses/apache2.0.php
12+
13+
SPDX-License-Identifier: Apache-2.0
1514
-->
1615
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1716
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

‎spec/pom.xml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Licensed under the Apache License, Version 2.0 (the
4-
"License"); you may not use this file except in compliance
5-
with the License. You may obtain a copy of the License at
3+
Copyright (c) 2016-2017 Contributors to the Eclipse Foundation
64
7-
http://www.apache.org/licenses/LICENSE-2.0
5+
See the NOTICES file(s) distributed with this work for additional
6+
information regarding copyright ownership.
87
9-
Unless required by applicable law or agreed to in writing,
10-
software distributed under the License is distributed on an
11-
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
12-
KIND, either express or implied. See the License for the
13-
specific language governing permissions and limitations
14-
under the License.
8+
All rights reserved. This program and the accompanying materials
9+
are made available under the terms of the Apache License, Version 2.0
10+
which accompanies this distribution and is available at
11+
http://www.opensource.org/licenses/apache2.0.php
12+
13+
SPDX-License-Identifier: Apache-2.0
1514
-->
1615
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1716
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

‎spec/src/main/asciidoc/architecture.asciidoc

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
1+
//////////////////////////////////////////////////////////////////
2+
// Copyright (c) 2016-2017 Contributors to the Eclipse Foundation
13
//
2-
// Copyright (c) 2016-2017 Eclipse Microprofile Contributors:
3-
// Mark Struberg
4+
// See the NOTICES file(s) distributed with this work for additional
5+
// information regarding copyright ownership.
46
//
5-
// Licensed under the Apache License, Version 2.0 (the "License");
6-
// you may not use this file except in compliance with the License.
7-
// You may obtain a copy of the License at
8-
//
9-
// http://www.apache.org/licenses/LICENSE-2.0
10-
//
11-
// Unless required by applicable law or agreed to in writing, software
12-
// distributed under the License is distributed on an "AS IS" BASIS,
13-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
// See the License for the specific language governing permissions and
15-
// limitations under the License.
7+
// All rights reserved. This program and the accompanying materials
8+
// are made available under the terms of the Apache License, Version 2.0
9+
// which accompanies this distribution and is available at
10+
// http://www.opensource.org/licenses/apache2.0.php
1611
//
12+
// SPDX-License-Identifier: Apache-2.0
13+
//
14+
// Authors: Mark Struberg
15+
//////////////////////////////////////////////////////////////////
1716

1817
[[architecture]]
1918
== Architecture

‎spec/src/main/asciidoc/configexamples.asciidoc

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
1+
//////////////////////////////////////////////////////////////////
2+
// Copyright (c) 2016-2017 Contributors to the Eclipse Foundation
13
//
2-
// Copyright (c) 2016-2017 Eclipse Microprofile Contributors:
3-
// Mark Struberg
4+
// See the NOTICES file(s) distributed with this work for additional
5+
// information regarding copyright ownership.
46
//
5-
// Licensed under the Apache License, Version 2.0 (the "License");
6-
// you may not use this file except in compliance with the License.
7-
// You may obtain a copy of the License at
8-
//
9-
// http://www.apache.org/licenses/LICENSE-2.0
10-
//
11-
// Unless required by applicable law or agreed to in writing, software
12-
// distributed under the License is distributed on an "AS IS" BASIS,
13-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
// See the License for the specific language governing permissions and
15-
// limitations under the License.
7+
// All rights reserved. This program and the accompanying materials
8+
// are made available under the terms of the Apache License, Version 2.0
9+
// which accompanies this distribution and is available at
10+
// http://www.opensource.org/licenses/apache2.0.php
1611
//
12+
// SPDX-License-Identifier: Apache-2.0
13+
//
14+
// Authors: Mark Struberg
15+
//////////////////////////////////////////////////////////////////
1716

1817
[[configexamples]]
1918
== Configuration Usage Examples

‎spec/src/main/asciidoc/configprovider.asciidoc

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
1+
//////////////////////////////////////////////////////////////////
2+
// Copyright (c) 2016-2017 Contributors to the Eclipse Foundation
13
//
2-
// Copyright (c) 2016-2017 Eclipse Microprofile Contributors:
3-
// Mark Struberg
4+
// See the NOTICES file(s) distributed with this work for additional
5+
// information regarding copyright ownership.
46
//
5-
// Licensed under the Apache License, Version 2.0 (the "License");
6-
// you may not use this file except in compliance with the License.
7-
// You may obtain a copy of the License at
8-
//
9-
// http://www.apache.org/licenses/LICENSE-2.0
10-
//
11-
// Unless required by applicable law or agreed to in writing, software
12-
// distributed under the License is distributed on an "AS IS" BASIS,
13-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
// See the License for the specific language governing permissions and
15-
// limitations under the License.
7+
// All rights reserved. This program and the accompanying materials
8+
// are made available under the terms of the Apache License, Version 2.0
9+
// which accompanies this distribution and is available at
10+
// http://www.opensource.org/licenses/apache2.0.php
1611
//
12+
// SPDX-License-Identifier: Apache-2.0
13+
//
14+
// Authors: Mark Struberg
15+
//////////////////////////////////////////////////////////////////
1716

1817
[[configprovider]]
1918
== Accessing or Creating a certain Configuration

‎spec/src/main/asciidoc/configsources.asciidoc

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
1+
//////////////////////////////////////////////////////////////////
2+
// Copyright (c) 2016-2017 Contributors to the Eclipse Foundation
13
//
2-
// Copyright (c) 2016-2017 Eclipse Microprofile Contributors:
3-
// Mark Struberg
4+
// See the NOTICES file(s) distributed with this work for additional
5+
// information regarding copyright ownership.
46
//
5-
// Licensed under the Apache License, Version 2.0 (the "License");
6-
// you may not use this file except in compliance with the License.
7-
// You may obtain a copy of the License at
8-
//
9-
// http://www.apache.org/licenses/LICENSE-2.0
10-
//
11-
// Unless required by applicable law or agreed to in writing, software
12-
// distributed under the License is distributed on an "AS IS" BASIS,
13-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
// See the License for the specific language governing permissions and
15-
// limitations under the License.
7+
// All rights reserved. This program and the accompanying materials
8+
// are made available under the terms of the Apache License, Version 2.0
9+
// which accompanies this distribution and is available at
10+
// http://www.opensource.org/licenses/apache2.0.php
1611
//
12+
// SPDX-License-Identifier: Apache-2.0
13+
//
14+
// Authors: Mark Struberg
15+
//////////////////////////////////////////////////////////////////
1716

1817
[[configsource]]
1918
== ConfigSources

‎spec/src/main/asciidoc/converters.asciidoc

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
1+
//////////////////////////////////////////////////////////////////
2+
// Copyright (c) 2016-2017 Contributors to the Eclipse Foundation
13
//
2-
// Copyright (c) 2016-2017 Eclipse Microprofile Contributors:
3-
// Mark Struberg
4+
// See the NOTICES file(s) distributed with this work for additional
5+
// information regarding copyright ownership.
46
//
5-
// Licensed under the Apache License, Version 2.0 (the "License");
6-
// you may not use this file except in compliance with the License.
7-
// You may obtain a copy of the License at
8-
//
9-
// http://www.apache.org/licenses/LICENSE-2.0
10-
//
11-
// Unless required by applicable law or agreed to in writing, software
12-
// distributed under the License is distributed on an "AS IS" BASIS,
13-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
// See the License for the specific language governing permissions and
15-
// limitations under the License.
7+
// All rights reserved. This program and the accompanying materials
8+
// are made available under the terms of the Apache License, Version 2.0
9+
// which accompanies this distribution and is available at
10+
// http://www.opensource.org/licenses/apache2.0.php
1611
//
12+
// SPDX-License-Identifier: Apache-2.0
13+
//
14+
// Authors: Mark Struberg
15+
//////////////////////////////////////////////////////////////////
1716

1817
[[converter]]
1918
== Converter

‎spec/src/main/asciidoc/license-alv2.asciidoc

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
1+
//////////////////////////////////////////////////////////////////
2+
// Copyright (c) 2016-2017 Contributors to the Eclipse Foundation
13
//
2-
// Copyright (c) 2016-2017 Eclipse Microprofile Contributors:
3-
// Mark Struberg
4+
// See the NOTICES file(s) distributed with this work for additional
5+
// information regarding copyright ownership.
46
//
5-
// Licensed under the Apache License, Version 2.0 (the "License");
6-
// you may not use this file except in compliance with the License.
7-
// You may obtain a copy of the License at
8-
//
9-
// http://www.apache.org/licenses/LICENSE-2.0
10-
//
11-
// Unless required by applicable law or agreed to in writing, software
12-
// distributed under the License is distributed on an "AS IS" BASIS,
13-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
// See the License for the specific language governing permissions and
15-
// limitations under the License.
7+
// All rights reserved. This program and the accompanying materials
8+
// are made available under the terms of the Apache License, Version 2.0
9+
// which accompanies this distribution and is available at
10+
// http://www.opensource.org/licenses/apache2.0.php
1611
//
12+
// SPDX-License-Identifier: Apache-2.0
13+
//
14+
// Authors: Mark Struberg
15+
//////////////////////////////////////////////////////////////////
1716

1817
[subs="normal"]
1918
....

‎spec/src/main/asciidoc/microprofile-config-spec.asciidoc

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
1+
//////////////////////////////////////////////////////////////////
2+
// Copyright (c) 2016-2017 Contributors to the Eclipse Foundation
13
//
2-
// Copyright (c) 2016-2017 Eclipse Microprofile Contributors:
3-
// Mark Struberg
4+
// See the NOTICES file(s) distributed with this work for additional
5+
// information regarding copyright ownership.
46
//
5-
// Licensed under the Apache License, Version 2.0 (the "License");
6-
// you may not use this file except in compliance with the License.
7-
// You may obtain a copy of the License at
8-
//
9-
// http://www.apache.org/licenses/LICENSE-2.0
10-
//
11-
// Unless required by applicable law or agreed to in writing, software
12-
// distributed under the License is distributed on an "AS IS" BASIS,
13-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
// See the License for the specific language governing permissions and
15-
// limitations under the License.
7+
// All rights reserved. This program and the accompanying materials
8+
// are made available under the terms of the Apache License, Version 2.0
9+
// which accompanies this distribution and is available at
10+
// http://www.opensource.org/licenses/apache2.0.php
1611
//
12+
// SPDX-License-Identifier: Apache-2.0
13+
//
14+
// Authors: Mark Struberg
15+
//////////////////////////////////////////////////////////////////
1716

1817
= Configuration for Microprofile
1918
:author: Mark Struberg

0 commit comments

Comments
 (0)