Skip to content

Commit 3668d1a

Browse files
authored
Bug 536067: Update license to EPL 2.0 (#140)
Signed-off-by: Lukas Jungmann <[email protected]>
1 parent f608bf5 commit 3668d1a

File tree

21,621 files changed

+261273
-191898
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

21,621 files changed

+261273
-191898
lines changed

.travis.yml

+12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
#
2+
# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
3+
#
4+
# This program and the accompanying materials are made available under the
5+
# terms of the Eclipse Public License v. 2.0 which is available at
6+
# http://www.eclipse.org/legal/epl-2.0,
7+
# or the Eclipse Distribution License v. 1.0 which is available at
8+
# http://www.eclipse.org/org/documents/edl-v10.php.
9+
#
10+
# SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
11+
#
12+
113
language: java
214
sudo: required
315

about.html

+211-189
Large diffs are not rendered by default.

antbuild.properties

+12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
#
2+
# Copyright (c) 2008, 2018 Oracle and/or its affiliates. All rights reserved.
3+
#
4+
# This program and the accompanying materials are made available under the
5+
# terms of the Eclipse Public License v. 2.0 which is available at
6+
# http://www.eclipse.org/legal/epl-2.0,
7+
# or the Eclipse Distribution License v. 1.0 which is available at
8+
# http://www.eclipse.org/org/documents/edl-v10.php.
9+
#
10+
# SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
11+
#
12+
113
# Properties used in building the eclipselink.jar.
214

315
# The directory that holds the oracle-specific jar files.

antbuild.xml

+49-42
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,31 @@
1-
<!--/*******************************************************************************
2-
* Copyright (c) 1998, 2018 Oracle and/or its affiliates. All rights reserved.
3-
* This program and the accompanying materials are made available under the
4-
* terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
5-
* which accompanies this distribution.
6-
* The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
7-
* and the Eclipse Distribution License is available at
8-
* http://www.eclipse.org/org/documents/edl-v10.php.
9-
*
10-
* Ant naming conventions:
11-
* - regardless of the actual OS platform,'/' is the directory separator
12-
* (Ant will convert as appropriate).
13-
* - multi-word properties use periods '.'
14-
* - properties ending in .jar define jarfile names only (no path)
15-
* - properties ending in .lib are fully qualified jars (path and filename)
16-
* - properties ending in .dir are directory paths
17-
* - properties ending in .path are path refid names (classpath fragments)
18-
* - multi-word targets use hyphens '-'
19-
* - targets beginning with test- are reserved for high level test targets,
20-
* and are used in test results parsing
21-
* - targets typically use the form <action>-<object>-<type> (ie. package-bundle-zip)
22-
* - multi-word macros use underscores '_'
23-
* - multi-word macro attributes are concatenated
24-
* e.g. 'runpathref'
25-
* - multi-word tasks (taskdef) names are concatenated
26-
* e.g. 'validateconnection'
27-
* - OS environment variables are in ALLCAPS and have 'env' as a prefix
28-
* e.g. ${env.XXX}.
29-
* - Ant properties are lower case.
30-
*
31-
* Contributors:
32-
* tware - initial API and implementation
33-
* pkrogh - javadocs
34-
* egwin - rework to follow ant conventions.
35-
* dtwelves - Add SDO, MOXy SRG targets
36-
* egwin - rework to incorporate new versioning standards and revision info.
37-
* egwin - add jpa 2.0 jar creation, and JPA 1.1/2.0 concurrent development
1+
<!--
2+
3+
Copyright (c) 1998, 2018 Oracle and/or its affiliates. All rights reserved.
4+
5+
This program and the accompanying materials are made available under the
6+
terms of the Eclipse Public License v. 2.0 which is available at
7+
http://www.eclipse.org/legal/epl-2.0,
8+
or the Eclipse Distribution License v. 1.0 which is available at
9+
http://www.eclipse.org/org/documents/edl-v10.php.
10+
11+
SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
12+
13+
-->
14+
15+
<!--
16+
Contributors:
17+
tware - initial API and implementation
18+
pkrogh - javadocs
19+
egwin - rework to follow ant conventions.
20+
dtwelves - Add SDO, MOXy SRG targets
21+
egwin - rework to incorporate new versioning standards and revision info.
22+
egwin - add jpa 2.0 jar creation, and JPA 1.1/2.0 concurrent development
3823
strategy. Also includes fixes to eclipselink.jar creation.
39-
* egwin - rework to standardize antcall conventions and fix multiple target builds.
40-
* tkraus - additional JDK, Ant and JDBC driver check, conditional Oracle extensions tests build
41-
* mvalovy - OSGi tests
42-
* Rick Curtis - Add jse bucket to lrg-test
43-
#******************************************************************************/-->
24+
egwin - rework to standardize antcall conventions and fix multiple target builds.
25+
tkraus - additional JDK, Ant and JDBC driver check, conditional Oracle extensions tests build
26+
mvalovy - OSGi tests
27+
Rick Curtis - Add jse bucket to lrg-test
28+
-->
4429
<!-- =============================================================================
4530
* General Comments
4631
* This buildfile contains:
@@ -89,6 +74,28 @@
8974
9075
It may require some configuration of the build.properties to run.
9176
-->
77+
<!--
78+
* Ant naming conventions:
79+
* - regardless of the actual OS platform,'/' is the directory separator
80+
* (Ant will convert as appropriate).
81+
* - multi-word properties use periods '.'
82+
* - properties ending in .jar define jarfile names only (no path)
83+
* - properties ending in .lib are fully qualified jars (path and filename)
84+
* - properties ending in .dir are directory paths
85+
* - properties ending in .path are path refid names (classpath fragments)
86+
* - multi-word targets use hyphens '-'
87+
* - targets beginning with test- are reserved for high level test targets,
88+
* and are used in test results parsing
89+
* - targets typically use the form <action>-<object>-<type> (ie. package-bundle-zip)
90+
* - multi-word macros use underscores '_'
91+
* - multi-word macro attributes are concatenated
92+
* e.g. 'runpathref'
93+
* - multi-word tasks (taskdef) names are concatenated
94+
* e.g. 'validateconnection'
95+
* - OS environment variables are in ALLCAPS and have 'env' as a prefix
96+
* e.g. ${env.XXX}.
97+
* - Ant properties are lower case.
98+
-->
9299
<project name="trunk" default="build" basedir="." xmlns:jacoco="antlib:org.jacoco.ant" xmlns:sonar="antlib:org.sonar.ant">
93100
<dirname property="trunk.build.location_temp" file="${ant.file.trunk}"/>
94101
<pathconvert targetos="unix" property="trunk.build.location">

autobuild.properties

+12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
#
2+
# Copyright (c) 2008, 2018 Oracle and/or its affiliates. All rights reserved.
3+
#
4+
# This program and the accompanying materials are made available under the
5+
# terms of the Eclipse Public License v. 2.0 which is available at
6+
# http://www.eclipse.org/legal/epl-2.0,
7+
# or the Eclipse Distribution License v. 1.0 which is available at
8+
# http://www.eclipse.org/org/documents/edl-v10.php.
9+
#
10+
# SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
11+
#
12+
113
# build.type should be set to an appropriate value for Milestone Builds {ie. "M4") and be blank for Release Builds
214
release.version=3.0.0
315

autobuild.xml

+27-20
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,30 @@
1-
<!--/*******************************************************************************
2-
* This program and the accompanying materials are made available under the
3-
* terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
4-
* which accompanies this distribution.
5-
* The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
6-
* and the Eclipse Distribution License is available at
7-
* http://www.eclipse.org/org/documents/edl-v10.php.
1+
<!--
2+
3+
Copyright (c) 1998, 2018 Oracle and/or its affiliates. All rights reserved.
4+
5+
This program and the accompanying materials are made available under the
6+
terms of the Eclipse Public License v. 2.0 which is available at
7+
http://www.eclipse.org/legal/epl-2.0,
8+
or the Eclipse Distribution License v. 1.0 which is available at
9+
http://www.eclipse.org/org/documents/edl-v10.php.
10+
11+
SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
12+
13+
-->
14+
15+
<!--
16+
Contributors:
17+
eric.gwin - initial API and implementation (checked in by Tware)
18+
-->
19+
<!-- =============================================================================
20+
* General Comments
21+
* This buildfile contains branch and automation specific instructions for the
22+
* automated build process using Hudson for EclipseLink at Eclipse and is intended
23+
* to be called by Hudson (generic user).
824
*
25+
* All publishing commands are now external to this file (see eclipselink.releng: publish.sh)
26+
*================================================================================= -->
27+
<!--
928
* Ant naming conventions:
1029
* - regardless of the actual OS platform,'/' is the directory separator
1130
* (Ant will convert as appropriate).
@@ -26,19 +45,7 @@
2645
* - OS environment variables are in ALLCAPS and have 'env' as a prefix
2746
* e.g. ${env.XXX}.
2847
* - Ant properties are lower case.
29-
*
30-
* Contributors:
31-
* eric.gwin - initial API and implementation (checked in by Tware)
32-
#******************************************************************************/-->
33-
34-
<!-- =============================================================================
35-
* General Comments
36-
* This buildfile contains branch and automation specific instructions for the
37-
* automated build process using Hudson for EclipseLink at Eclipse and is intended
38-
* to be called by Hudson (generic user).
39-
*
40-
* All publishing commands are now external to this file (see eclipselink.releng: publish.sh)
41-
*================================================================================= -->
48+
-->
4249
<project name="AutoBuild" basedir="." default="build-nightly">
4350
<echo message="---- AutoBuild.xml ----"/>
4451
<dirname property="build.location_temp" file="${ant.file.AutoBuild}"/>

buildsystem/compdeps/antbuild.xml

+21-12
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,23 @@
1-
<!--/*******************************************************************************
2-
* This program and the accompanying materials are made available under the
3-
* terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
4-
* which accompanies this distribution.
5-
* The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
6-
* and the Eclipse Distribution License is available at
7-
* http://www.eclipse.org/org/documents/edl-v10.php.
8-
*
1+
<?xml version="1.0"?>
2+
<!--
3+
4+
Copyright (c) 2007, 2018 Oracle and/or its affiliates. All rights reserved.
5+
6+
This program and the accompanying materials are made available under the
7+
terms of the Eclipse Public License v. 2.0 which is available at
8+
http://www.eclipse.org/legal/epl-2.0,
9+
or the Eclipse Distribution License v. 1.0 which is available at
10+
http://www.eclipse.org/org/documents/edl-v10.php.
11+
12+
SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
13+
14+
-->
15+
16+
<!--
17+
Contributors:
18+
egwin - initial API and implementation
19+
-->
20+
<!--
921
* Ant naming conventions:
1022
* - regardless of the actual OS platform,'/' is the directory separator
1123
* (Ant will convert as appropriate).
@@ -19,10 +31,7 @@
1931
* - OS environment variables are in ALLCAPS and have 'env' as a prefix
2032
* e.g. ${env.XXX}.
2133
* - Ant properties are lower case.
22-
*
23-
* Contributors:
24-
* egwin - initial API and implementation
25-
#******************************************************************************/-->
34+
-->
2635

2736
<project name="compdeps" default="build" basedir=".">
2837

Original file line numberDiff line numberDiff line change
@@ -1 +1,13 @@
1+
#
2+
# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
3+
#
4+
# This program and the accompanying materials are made available under the
5+
# terms of the Eclipse Public License v. 2.0 which is available at
6+
# http://www.eclipse.org/legal/epl-2.0,
7+
# or the Eclipse Distribution License v. 1.0 which is available at
8+
# http://www.eclipse.org/org/documents/edl-v10.php.
9+
#
10+
# SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
11+
#
12+
113
bin.includes = feature.xml

0 commit comments

Comments
 (0)