[eclipse-wtp-jpa] Start building from upstream master for 3.5.0
Gerard Ryan
galileo at fedoraproject.org
Mon May 27 22:26:28 UTC 2013
commit 18aa8daaec721d356e333d2189c990903622a93c
Author: Gerard Ryan <gerard at ryan.lt>
Date: Mon May 27 23:17:20 2013 +0100
Start building from upstream master for 3.5.0
.gitignore | 2 +
eclipse-wtp-jpa-jpa_sdk_feature.patch | 27 +++++++++++++
eclipse-wtp-jpa.spec | 13 ++++--
...ql-remove-version-check-javax.persistence.patch | 2 +-
org.eclipse.jpt.common.utility-explicit-cast.patch | 27 +++++++++----
...pse.jpt.jpa.feature-remove-version-checks.patch | 41 ++++----------------
sources | 3 +-
7 files changed, 68 insertions(+), 47 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 97188a4..7212520 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
/eclipse-wtp-jpa-3.4.0-HEAD-20120619cvs.tar.xz
/eclipse-wtp-jpa-3.4.0.tar.xz
+/webtools.dali-201305171828.tar.bz2
+/eclipselink.runtime-3faac2be67974733e07c7186489aaaf84ce9406d.tar.bz2
diff --git a/eclipse-wtp-jpa-jpa_sdk_feature.patch b/eclipse-wtp-jpa-jpa_sdk_feature.patch
new file mode 100644
index 0000000..21385c7
--- /dev/null
+++ b/eclipse-wtp-jpa-jpa_sdk_feature.patch
@@ -0,0 +1,27 @@
+--- org.eclipse.jpt.jpa_sdk.feature/feature.xml.orig 2013-05-22 23:25:37.226873804 +0100
++++ org.eclipse.jpt.jpa_sdk.feature/feature.xml 2013-05-22 23:26:06.924315540 +0100
+@@ -19,20 +19,20 @@
+ %license
+ </license>
+
+- <includes
++<!-- <includes
+ id="org.eclipse.jpt.jpa.feature"
+- version="0.0.0"/>
++ version="0.0.0"/>-->
+
+ <includes
+ id="org.eclipse.jpt.jpa.feature.source"
+ version="0.0.0"/>
+
+- <plugin
++<!-- <plugin
+ id="org.eclipse.persistence.jpa.jpql.source"
+ download-size="0"
+ install-size="0"
+ version="2.5.0.qualifier"
+- unpack="false"/>
++ unpack="false"/>-->
+
+ <plugin
+ id="org.eclipse.jpt.doc.isv"
diff --git a/eclipse-wtp-jpa.spec b/eclipse-wtp-jpa.spec
index 5b70d1c..adaf98c 100644
--- a/eclipse-wtp-jpa.spec
+++ b/eclipse-wtp-jpa.spec
@@ -1,15 +1,15 @@
%global eclipse_dropins %{_datadir}/eclipse/dropins
-%global dali_tag 201301300050
+%global dali_tag 201305171828
%global dali_dir webtools.dali-%{dali_tag}
# Get shortcommit for this from map file, then figure out the full commit sha
-%global eclipselink_commit a9d0e8d2c4af5972265443668c31b45a5d01d473
+%global eclipselink_commit 3faac2be67974733e07c7186489aaaf84ce9406d
%global eclipselink_dir eclipselink.runtime-%{eclipselink_commit}
Name: eclipse-wtp-jpa
-Version: 3.4.2
-Release: 1%{?dist}
+Version: 3.5.0
+Release: 0.1%{?dist}
Summary: Eclipse tools for definition of (O/R) mappings for JPA entities
Group: Development/Tools
@@ -22,6 +22,7 @@ Source1: http://git.eclipse.org/c/eclipselink/eclipselink.runtime.git/snapshot/%
Patch0: org.eclipse.jpt.common.utility-explicit-cast.patch
Patch1: org.eclipse.jpt.jpa.feature-remove-version-checks.patch
Patch2: jpa.jpql-remove-version-check-javax.persistence.patch
+Patch3: %{name}-jpa_sdk_feature.patch
BuildArch: noarch
@@ -108,6 +109,7 @@ popd
pushd jpa/features
%patch1 -b .orig
+%patch3
popd
%patch2
@@ -203,6 +205,9 @@ popd
%{eclipse_dropins}/wtp-jpa-sdk
%changelog
+* Tue May 21 2013 Gerard Ryan <galileo at fedoraproject.org> 3.5.0-0.1
+- Start building from upstream master branches in anticipation for 3.5.0
+
* Fri May 09 2013 Gerard Ryan <galileo at fedoraproject.org> 3.4.2-1
- Update to latest upstream version
- Get proper sources from Git
diff --git a/jpa.jpql-remove-version-check-javax.persistence.patch b/jpa.jpql-remove-version-check-javax.persistence.patch
index 43c0c5a..0a2b8b3 100644
--- a/jpa.jpql-remove-version-check-javax.persistence.patch
+++ b/jpa.jpql-remove-version-check-javax.persistence.patch
@@ -1,7 +1,7 @@
--- org.eclipse.persistence.jpa.jpql/META-INF/MANIFEST.MF.orig 2013-05-11 15:52:28.775778585 +0100
+++ org.eclipse.persistence.jpa.jpql/META-INF/MANIFEST.MF 2013-05-11 15:54:43.649310017 +0100
@@ -17,5 +17,5 @@
- Bundle-Version: 2.0.1.qualifier
+ Bundle-Version: 2.5.0.qualifier
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.persistence.jpa.jpql
-Import-Package: javax.persistence;version="[1.1.0,3.0.0)"
diff --git a/org.eclipse.jpt.common.utility-explicit-cast.patch b/org.eclipse.jpt.common.utility-explicit-cast.patch
index 07e2c6b..d1b2b44 100644
--- a/org.eclipse.jpt.common.utility-explicit-cast.patch
+++ b/org.eclipse.jpt.common.utility-explicit-cast.patch
@@ -1,11 +1,22 @@
---- org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/ReflectionTools.java~ 2012-06-13 01:04:48.811971051 +0100
-+++ org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/ReflectionTools.java 2012-06-13 23:59:37.705290640 +0100
-@@ -855,7 +855,7 @@
+--- org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/ClassTools.java.orig 2013-05-22 22:35:47.359290043 +0100
++++ org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/ClassTools.java 2013-05-22 22:39:24.747255403 +0100
+@@ -639,7 +639,7 @@
*/
- public static <T> Iterable<Constructor<T>> getDeclaredConstructors(Class<T> javaClass) {
+ public static <T> Iterable<Constructor<T>> declaredConstructors(Class<T> javaClass) {
@SuppressWarnings("unchecked")
- Constructor<T>[] constructors = javaClass.getDeclaredConstructors();
-+ Constructor<T>[] constructors = (Constructor<T>[])javaClass.getDeclaredConstructors();
- for (Constructor<T> constructor : constructors) {
- constructor.setAccessible(true);
- }
++ Constructor<T>[] constructors = (Constructor<T>[])javaClass.getDeclaredConstructors();
+ return makeAccessible(IterableTools.iterable(constructors));
+ }
+
+--- org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/jdbc/DriverWrapper.java.orig 2013-05-22 22:40:20.338223740 +0100
++++ org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/jdbc/DriverWrapper.java 2013-05-22 22:43:18.324926987 +0100
+@@ -95,4 +95,8 @@
+ public String toString() {
+ return ObjectTools.toString(this, this.driver);
+ }
++
++ public java.util.logging.Logger getParentLogger() throws java.sql.SQLFeatureNotSupportedException {
++ throw new java.sql.SQLFeatureNotSupportedException("Not implemented");
++ }
+ }
diff --git a/org.eclipse.jpt.jpa.feature-remove-version-checks.patch b/org.eclipse.jpt.jpa.feature-remove-version-checks.patch
index 3b2b032..21bf02a 100644
--- a/org.eclipse.jpt.jpa.feature-remove-version-checks.patch
+++ b/org.eclipse.jpt.jpa.feature-remove-version-checks.patch
@@ -1,15 +1,6 @@
---- org.eclipse.jpt.jpa.feature/feature.xml.orig 2013-01-29 14:21:17.000000000 +0000
-+++ org.eclipse.jpt.jpa.feature/feature.xml 2013-05-11 16:02:42.854646074 +0100
-@@ -5,7 +5,7 @@
- version="3.2.2.qualifier"
- provider-name="%providerName"
- plugin="org.eclipse.jpt.jpa.branding"
-- license-feature="org.eclipse.license"
-+
- license-feature-version="1.0.0.qualifier">
-
- <description>
-@@ -28,12 +28,19 @@
+--- org.eclipse.jpt.jpa.feature/feature.xml.orig 2013-05-22 22:10:59.362859044 +0100
++++ org.eclipse.jpt.jpa.feature/feature.xml 2013-05-22 22:17:34.500550102 +0100
+@@ -28,10 +28,10 @@
</requires>
<plugin
@@ -17,35 +8,19 @@
+ id="org.eclipse.persistence.jpa.jpql"
download-size="0"
install-size="0"
-- version="2.0.5.qualifier"
+- version="2.1.0.qualifier"
+ version="0.0.0"
unpack="false"/>
-+<!-- <plugin
-+ id="org.eclipse.persistence.jpa.jpql.source"
-+ download-size="0"
-+ install-size="0"
-+ version="0.0.0"
-+ unpack="false"/>-->
-+
<plugin
- id="org.eclipse.jpt.jpa.core"
- download-size="0"
-@@ -77,45 +84,31 @@
+@@ -84,38 +84,31 @@
unpack="false"/>
<plugin
- id="org.eclipse.persistence.jpa.jpql"
- download-size="0"
- install-size="0"
-- version="2.0.1.qualifier"
-- unpack="false"/>
--
-- <plugin
-- id="org.eclipse.persistence.jpa.jpql.source"
-- download-size="0"
-- install-size="0"
-- version="2.0.1.qualifier"
+- version="2.5.0.qualifier"
- unpack="false"/>
-
- <plugin
@@ -60,7 +35,7 @@
id="org.apache.commons.lang"
download-size="0"
install-size="0"
-- version="2.1.0.qualifier"
+- version="2.6.0.qualifier"
+ version="0.0.0"
unpack="false"/>
@@ -76,7 +51,7 @@
id="org.jdom"
download-size="0"
install-size="0"
-- version="1.0.0.qualifier"
+- version="1.1.1.qualifier"
+ version="0.0.0"
unpack="false"/>
diff --git a/sources b/sources
index 93ac622..ecd37c3 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-7d9e608fd6b00868a86d93e8cd7dc787 eclipse-wtp-jpa-3.4.0.tar.xz
+c94f181d102c090bb365699c1b557c6a webtools.dali-201305171828.tar.bz2
+9961e29b70c51458da4ce90d9f209cda eclipselink.runtime-3faac2be67974733e07c7186489aaaf84ce9406d.tar.bz2
More information about the scm-commits
mailing list