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.

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

Bug 536067 - Update license to EPL 2.0 #1

Merged
merged 3 commits into from
Jun 29, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion oracleddl.feature/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1,13 @@
bin.includes = feature.xml
#
# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License v. 2.0 which is available at
# http://www.eclipse.org/legal/epl-2.0,
# or the Eclipse Distribution License v. 1.0 which is available at
# http://www.eclipse.org/org/documents/edl-v10.php.
#
# SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
#

bin.includes = feature.xml
66 changes: 40 additions & 26 deletions oracleddl.feature/feature.xml
Original file line number Diff line number Diff line change
@@ -1,26 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="oracleddl.feature"
label="Oracle DDL Feature"
version="1.0.0.qualifier">

<description url="http://www.example.com/description">
[Enter Feature Description here.]
</description>

<copyright url="http://www.example.com/copyright">
[Enter Copyright Description here.]
</copyright>

<license url="http://www.example.com/license">
[Enter License Description here.]
</license>

<plugin
id="org.eclipse.persistence.oracleddlparser"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

</feature>
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0 which is available at
http://www.eclipse.org/legal/epl-2.0,
or the Eclipse Distribution License v. 1.0 which is available at
http://www.eclipse.org/org/documents/edl-v10.php.

SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause

-->

<feature
id="oracleddl.feature"
label="Oracle DDL Feature"
version="1.0.0.qualifier">

<description url="http://www.example.com/description">
[Enter Feature Description here.]
</description>

<copyright url="http://www.example.com/copyright">
[Enter Copyright Description here.]
</copyright>

<license url="http://www.example.com/license">
[Enter License Description here.]
</license>

<plugin
id="org.eclipse.persistence.oracleddlparser"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

</feature>
48 changes: 31 additions & 17 deletions oracleddl.feature/pom.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>

<name>EclipseLink Oracle DDL Feature</name>
<artifactId>oracleddl.feature</artifactId>
<packaging>eclipse-feature</packaging>

<parent>
<groupId>org.eclipse.persistence</groupId>
<artifactId>oracleddl.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../oracleddl.parent/pom.xml</relativePath>
</parent>

</project>
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0 which is available at
http://www.eclipse.org/legal/epl-2.0,
or the Eclipse Distribution License v. 1.0 which is available at
http://www.eclipse.org/org/documents/edl-v10.php.

SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause

-->

<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>

<name>EclipseLink Oracle DDL Feature</name>
<artifactId>oracleddl.feature</artifactId>
<packaging>eclipse-feature</packaging>

<parent>
<groupId>org.eclipse.persistence</groupId>
<artifactId>oracleddl.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../oracleddl.parent/pom.xml</relativePath>
</parent>

</project>
18 changes: 16 additions & 2 deletions oracleddl.parent/pom.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0 which is available at
http://www.eclipse.org/legal/epl-2.0,
or the Eclipse Distribution License v. 1.0 which is available at
http://www.eclipse.org/org/documents/edl-v10.php.

SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause

-->

<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
Expand All @@ -18,11 +32,11 @@
<properties>
<!-- TOOL Properties -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<tycho.version>0.21.0</tycho.version>
<tycho.version>1.2.0</tycho.version>
<junit4-version>4.8.2</junit4-version>
<!-- PROJECT Properties -->
<release.version>1.0.0</release.version>
<!-- maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format> Seems it must be in settings.xml -->
<maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
<build.qualifier>v${maven.build.timestamp}</build.qualifier>
<forceContextQualifier>${build.qualifier}</forceContextQualifier>
</properties>
Expand Down
42 changes: 28 additions & 14 deletions oracleddl.repository/category.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
<feature url="features/oracleddl.feature_1.0.0.qualifier.jar" id="oracleddl.feature" version="1.0.0.qualifier">
<category name="oracleddlparser.category"/>
</feature>
<feature url="features/oracleddl.source.feature_1.0.0.qualifier.jar" id="oracleddl.source.feature" version="1.0.0.qualifier">
<category name="oracleddlparser.category"/>
</feature>
<category-def name="oracleddlparser.category" label="Oracle DDL Parser Category">
<description>
Oracle DDL Parser
</description>
</category-def>
</site>
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0 which is available at
http://www.eclipse.org/legal/epl-2.0,
or the Eclipse Distribution License v. 1.0 which is available at
http://www.eclipse.org/org/documents/edl-v10.php.

SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause

-->

<site>
<feature url="features/oracleddl.feature_1.0.0.qualifier.jar" id="oracleddl.feature" version="1.0.0.qualifier">
<category name="oracleddlparser.category"/>
</feature>
<feature url="features/oracleddl.source.feature_1.0.0.qualifier.jar" id="oracleddl.source.feature" version="1.0.0.qualifier">
<category name="oracleddlparser.category"/>
</feature>
<category-def name="oracleddlparser.category" label="Oracle DDL Parser Category">
<description>
Oracle DDL Parser
</description>
</category-def>
</site>
48 changes: 31 additions & 17 deletions oracleddl.repository/pom.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>

<name>EclipseLink Oracle DDL UpdateSite</name>
<artifactId>oracleddl.repository</artifactId>
<packaging>eclipse-repository</packaging>

<parent>
<groupId>org.eclipse.persistence</groupId>
<artifactId>oracleddl.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../oracleddl.parent/pom.xml</relativePath>
</parent>

</project>
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0 which is available at
http://www.eclipse.org/legal/epl-2.0,
or the Eclipse Distribution License v. 1.0 which is available at
http://www.eclipse.org/org/documents/edl-v10.php.

SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause

-->

<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>

<name>EclipseLink Oracle DDL UpdateSite</name>
<artifactId>oracleddl.repository</artifactId>
<packaging>eclipse-repository</packaging>

<parent>
<groupId>org.eclipse.persistence</groupId>
<artifactId>oracleddl.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../oracleddl.parent/pom.xml</relativePath>
</parent>

</project>
14 changes: 13 additions & 1 deletion oracleddl.source.feature/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1,13 @@
bin.includes = feature.xml
#
# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License v. 2.0 which is available at
# http://www.eclipse.org/legal/epl-2.0,
# or the Eclipse Distribution License v. 1.0 which is available at
# http://www.eclipse.org/org/documents/edl-v10.php.
#
# SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
#

bin.includes = feature.xml
66 changes: 40 additions & 26 deletions oracleddl.source.feature/feature.xml
Original file line number Diff line number Diff line change
@@ -1,26 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="oracleddl.source.feature"
label="Feature"
version="1.0.0.qualifier">

<description url="http://www.example.com/description">
[Enter Feature Description here.]
</description>

<copyright url="http://www.example.com/copyright">
[Enter Copyright Description here.]
</copyright>

<license url="http://www.example.com/license">
[Enter License Description here.]
</license>

<plugin
id="org.eclipse.persistence.oracleddlparser.source"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

</feature>
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0 which is available at
http://www.eclipse.org/legal/epl-2.0,
or the Eclipse Distribution License v. 1.0 which is available at
http://www.eclipse.org/org/documents/edl-v10.php.

SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause

-->

<feature
id="oracleddl.source.feature"
label="Feature"
version="1.0.0.qualifier">

<description url="http://www.example.com/description">
[Enter Feature Description here.]
</description>

<copyright url="http://www.example.com/copyright">
[Enter Copyright Description here.]
</copyright>

<license url="http://www.example.com/license">
[Enter License Description here.]
</license>

<plugin
id="org.eclipse.persistence.oracleddlparser.source"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

</feature>
48 changes: 31 additions & 17 deletions oracleddl.source.feature/pom.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>

<name>EclipseLink Oracle DDL Source Feature</name>
<artifactId>oracleddl.source.feature</artifactId>
<packaging>eclipse-feature</packaging>

<parent>
<groupId>org.eclipse.persistence</groupId>
<artifactId>oracleddl.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../oracleddl.parent/pom.xml</relativePath>
</parent>

</project>
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0 which is available at
http://www.eclipse.org/legal/epl-2.0,
or the Eclipse Distribution License v. 1.0 which is available at
http://www.eclipse.org/org/documents/edl-v10.php.

SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause

-->

<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>

<name>EclipseLink Oracle DDL Source Feature</name>
<artifactId>oracleddl.source.feature</artifactId>
<packaging>eclipse-feature</packaging>

<parent>
<groupId>org.eclipse.persistence</groupId>
<artifactId>oracleddl.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../oracleddl.parent/pom.xml</relativePath>
</parent>

</project>
Loading