[eclipse-wtp-jpa] Update to R3.4.0 Juno stable release
Gerard Ryan
galileo at fedoraproject.org
Fri Jul 13 23:09:50 UTC 2012
commit aa834bcc22f5f8957187330a32f4493bbe243861
Author: Gerard Ryan <gerard at ryan.lt>
Date: Sat Jul 14 00:09:31 2012 +0100
Update to R3.4.0 Juno stable release
.gitignore | 1 +
eclipse-wtp-jpa.spec | 108 ++++++++++----------
fetch-wtp-jpa-using-map.sh | 49 +++++++++
org.eclipse.jpt.common.utility-explicit-cast.patch | 4 +-
...pse.jpt.jpa.feature-remove-version-checks.patch | 4 +-
sources | 2 +-
6 files changed, 111 insertions(+), 57 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5b04164..97188a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/eclipse-wtp-jpa-3.4.0-HEAD-20120619cvs.tar.xz
+/eclipse-wtp-jpa-3.4.0.tar.xz
diff --git a/eclipse-wtp-jpa.spec b/eclipse-wtp-jpa.spec
index 543c6eb..6330dc9 100644
--- a/eclipse-wtp-jpa.spec
+++ b/eclipse-wtp-jpa.spec
@@ -1,10 +1,9 @@
-%global cvstag 20120619cvs
%global eclipse_base %{_libdir}/eclipse
%global eclipse_dropins %{_datadir}/eclipse/dropins
Name: eclipse-wtp-jpa
Version: 3.4.0
-Release: 0.2.%{cvstag}%{?dist}
+Release: 1%{?dist}
Summary: Eclipse tools for definition of (O/R) mappings for JPA entities
Group: Development/Tools
@@ -12,7 +11,7 @@ License: EPL
URL: http://www.eclipse.org/webtools/dali/
# /usr/bin/bash -x fetch-wtp-jpa.sh
-Source0: %{name}-%{version}-HEAD-%{cvstag}.tar.xz
+Source0: %{name}-%{version}.tar.xz
Patch0: org.eclipse.jpt.common.utility-explicit-cast.patch
Patch1: org.eclipse.jpt.jpa.feature-remove-version-checks.patch
@@ -20,56 +19,58 @@ Patch2: jpa.jpql-remove-version-check-javax.persistence.patch
BuildArch: noarch
-BuildRequires: jdom
-BuildRequires: velocity
-BuildRequires: hibernate-jpa-2.0-api
-BuildRequires: apache-commons-logging
-BuildRequires: apache-commons-discovery
-BuildRequires: apache-commons-collections
-BuildRequires: apache-commons-lang
-
-BuildRequires: eclipse-pde
-BuildRequires: eclipse-jdt
-BuildRequires: eclipse-dtp
-BuildRequires: eclipse-emf
-BuildRequires: eclipse-emf-xsd
-BuildRequires: eclipse-emf-core
-BuildRequires: eclipse-platform
-BuildRequires: eclipse-wtp-common
-BuildRequires: eclipse-wtp-jeetools
-BuildRequires: eclipse-wtp-servertools
-BuildRequires: eclipse-wtp-sourceediting
-
-Requires: eclipse-jdt
-Requires: eclipse-pde
-Requires: eclipse-emf
-Requires: eclipse-rcp
-Requires: eclipse-swt
-Requires: eclipse-dtp
-Requires: eclipse-gef
-Requires: icu4j-eclipse
-Requires: eclipse-emf-xsd
-Requires: eclipse-emf-core
-Requires: eclipse-platform
-Requires: eclipse-wtp-common
-Requires: eclipse-wtp-jeetools
-Requires: eclipse-wtp-servertools
-Requires: eclipse-wtp-sourceediting
-
-Requires: jdom
-Requires: velocity
-Requires: hibernate-jpa-2.0-api
-Requires: apache-commons-logging
-Requires: apache-commons-discovery
-Requires: apache-commons-collections
-Requires: apache-commons-lang
+BuildRequires: apache-commons-logging >= 1.1.1
+BuildRequires: apache-commons-discovery >= 0.5
+BuildRequires: apache-commons-collections >= 3.2.1
+BuildRequires: apache-commons-lang >= 2.6
+BuildRequires: eclipse-dtp >= 1.10
+BuildRequires: eclipse-emf >= 2.8.0
+BuildRequires: eclipse-emf-core >= 2.8.0
+BuildRequires: eclipse-emf-xsd >= 2.8.0
+BuildRequires: eclipse-gef >= 3.8.0
+BuildRequires: eclipse-jdt >= 4.2.0
+BuildRequires: eclipse-pde >= 4.2.0
+BuildRequires: eclipse-platform >= 4.2.0
+BuildRequires: eclipse-rcp >= 4.2.0
+BuildRequires: eclipse-swt >= 4.2.0
+BuildRequires: eclipse-wtp-common >= 3.4.0
+BuildRequires: eclipse-wtp-jeetools >= 3.4.0
+BuildRequires: eclipse-wtp-servertools >= 3.4.0
+BuildRequires: eclipse-wtp-sourceediting >= 3.4.0
+BuildRequires: hibernate-jpa-2.0-api >= 1.0.1
+BuildRequires: icu4j-eclipse >= 4.4.2.2
+BuildRequires: jdom >= 1.1.3
+BuildRequires: velocity >= 1.7
+
+Requires: apache-commons-logging >= 1.1.1
+Requires: apache-commons-discovery >= 0.5
+Requires: apache-commons-collections >= 3.2.1
+Requires: apache-commons-lang >= 2.6
+Requires: eclipse-dtp >= 1.10
+Requires: eclipse-emf >= 2.8.0
+Requires: eclipse-emf-core >= 2.8.0
+Requires: eclipse-emf-xsd >= 2.8.0
+Requires: eclipse-gef >= 3.8.0
+Requires: eclipse-jdt >= 4.2.0
+Requires: eclipse-pde >= 4.2.0
+Requires: eclipse-platform >= 4.2.0
+Requires: eclipse-rcp >= 4.2.0
+Requires: eclipse-swt >= 4.2.0
+Requires: eclipse-wtp-common >= 3.4.0
+Requires: eclipse-wtp-jeetools >= 3.4.0
+Requires: eclipse-wtp-servertools >= 3.4.0
+Requires: eclipse-wtp-sourceediting >= 3.4.0
+Requires: hibernate-jpa-2.0-api >= 1.0.1
+Requires: icu4j-eclipse >= 4.4.2.2
+Requires: jdom >= 1.1.3
+Requires: velocity >= 1.7
%description
-The Dali Java Persistence Tools Project provides extensible frameworks and tools
-for the definition and editing of Object-Relational (O/R) mappings for Java
-Persistence API (JPA) entities. JPA mapping support focuses on minimizing the
-complexity of mapping by providing entity generation wizards, design-time
+The Dali Java Persistence Tools Project provides extensible frameworks and
+tools for the definition and editing of Object-Relational (O/R) mappings for
+Java Persistence API (JPA) entities. JPA mapping support focuses on minimizing
+the complexity of mapping by providing entity generation wizards, design-time
validation, and a rich UI for entity and persistence unit configuration.
%package sdk
@@ -174,13 +175,16 @@ popd
%files
%{eclipse_dropins}/wtp-jpa
-%doc jpa/features/org.eclipse.jpt.jpa.eclipselink.feature/sourceTemplatePlugin/license.html
-%doc common/plugins/org.eclipse.jpt.common.core/about.html
+%doc org.eclipse.jpt.jpa.eclipselink.feature/sourceTemplatePlugin/license.html
+%doc org.eclipse.jpt.common.core/about.html
%files sdk
%{eclipse_dropins}/wtp-jpa-sdk
%changelog
+* Fri Jul 13 2012 Gerard Ryan <galileo at fedoraproject.org> 3.4.0-1
+- Update to R3.4.0 Juno stable release
+
* Thu Jul 5 2012 Gerard Ryan <galileo at fedoraproject.org> 3.4.0-0.2.20120619cvs
- Add comment on how to create tarball
- Add add apache-commons-collections and apache-commons-lang to BR/R
diff --git a/fetch-wtp-jpa-using-map.sh b/fetch-wtp-jpa-using-map.sh
new file mode 100755
index 0000000..635571d
--- /dev/null
+++ b/fetch-wtp-jpa-using-map.sh
@@ -0,0 +1,49 @@
+#!/bin/bash
+set -e
+
+NAME="eclipse-wtp-jpa"
+VERSION=3.4.0
+TAG=R-3.4.0-20120612174739
+
+echo "Exporting from CVS..."
+mkdir $NAME-$VERSION
+pushd $NAME-$VERSION >/dev/null
+
+MAPFILE=$NAME.map
+TEMPMAPFILE=temp.map
+wget "http://download.eclipse.org/webtools/downloads/drops/R${VERSION}/${TAG}/directory.txt" -O $MAPFILE
+
+
+dos2unix $MAPFILE
+grep ^[a-z] $MAPFILE | grep -i "org.eclipse.jpa/components" > $TEMPMAPFILE
+
+gawk 'BEGIN {
+ FS=","
+}
+{
+if (NF < 4) {
+
+ split($1, version, "=");
+ split(version[1], directory, "@");
+ cvsdir=split($2, dirName, ":");
+ printf("cvs -d %s%s %s %s %s %s %s\n", ":pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q export -r", version[2], "-d", directory[2], directory[2]) | "/bin/bash";
+}
+else {
+
+ split($1, version, "=");
+ total=split($4, directory, "/");
+ cvsdir=split($2, dirName, ":");
+ printf("cvs -d %s%s %s %s %s %s %s\n", ":pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q export -r", version[2], "-d", directory[total], $4) | "/bin/bash";
+}
+
+}' $TEMPMAPFILE
+
+rm $TEMPMAPFILE $MAPFILE
+
+# This needs to be got from svn - revision obtained manually from map
+svn export -r 11652 http://dev.eclipse.org/svnroot/rt/org.eclipse.persistence/trunk/jpa/org.eclipse.persistence.jpa.jpql/
+
+popd >/dev/null
+
+echo "Creating tarball '$NAME-$VERSION.tar.xz'..."
+tar -cJf $NAME-$VERSION.tar.xz $NAME-$VERSION
diff --git a/org.eclipse.jpt.common.utility-explicit-cast.patch b/org.eclipse.jpt.common.utility-explicit-cast.patch
index 4a6c47b..07e2c6b 100644
--- a/org.eclipse.jpt.common.utility-explicit-cast.patch
+++ b/org.eclipse.jpt.common.utility-explicit-cast.patch
@@ -1,5 +1,5 @@
---- common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/ReflectionTools.java~ 2012-06-13 01:04:48.811971051 +0100
-+++ common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/ReflectionTools.java 2012-06-13 23:59:37.705290640 +0100
+--- 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 @@
*/
public static <T> Iterable<Constructor<T>> getDeclaredConstructors(Class<T> javaClass) {
diff --git a/org.eclipse.jpt.jpa.feature-remove-version-checks.patch b/org.eclipse.jpt.jpa.feature-remove-version-checks.patch
index 8be803c..c08434c 100644
--- a/org.eclipse.jpt.jpa.feature-remove-version-checks.patch
+++ b/org.eclipse.jpt.jpa.feature-remove-version-checks.patch
@@ -1,5 +1,5 @@
---- ./jpa/features/org.eclipse.jpt.jpa.feature/feature.xml.orig 2012-06-19 01:14:18.199071632 +0100
-+++ ./jpa/features/org.eclipse.jpt.jpa.feature/feature.xml 2012-06-19 01:43:57.845062772 +0100
+--- org.eclipse.jpt.jpa.feature/feature.xml.orig 2012-06-19 01:14:18.199071632 +0100
++++ org.eclipse.jpt.jpa.feature/feature.xml 2012-06-19 01:43:57.845062772 +0100
@@ -73,42 +73,42 @@
id="org.eclipse.persistence.jpa.jpql"
download-size="0"
diff --git a/sources b/sources
index 12cf46d..93ac622 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b6fa3ef91f20915415cf5c59e552457a eclipse-wtp-jpa-3.4.0-HEAD-20120619cvs.tar.xz
+7d9e608fd6b00868a86d93e8cd7dc787 eclipse-wtp-jpa-3.4.0.tar.xz
More information about the scm-commits
mailing list