diff --git a/0001-Drag-in-packages-we-ship-split.patch b/0001-Drag-in-packages-we-ship-split.patch deleted file mode 100644 index ba6d5d3..0000000 --- a/0001-Drag-in-packages-we-ship-split.patch +++ /dev/null @@ -1,58 +0,0 @@ -From bea0df9ad753101d0936a8a0fe17a02cf785e19e Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Fri, 3 Aug 2012 14:40:13 +0200 -Subject: [PATCH 1/6] Drag in packages we ship split - ---- - connector/pom.xml | 11 +++++++++++ - pom.xml | 12 +++++++++++- - 2 files changed, 22 insertions(+), 1 deletions(-) - -diff --git a/connector/pom.xml b/connector/pom.xml -index 4dac54f..7554130 100644 ---- a/connector/pom.xml -+++ b/connector/pom.xml -@@ -58,6 +58,17 @@ - - com.google.gdata - gdata-java-client -+ 1.40.0 -+ -+ -+ com.google.gdata -+ gdata-java-core -+ 1.40.0 -+ -+ -+ com.google.gdata -+ gdata-java-analytics -+ 1.40.0 - - - net.sf.opencsv -diff --git a/pom.xml b/pom.xml -index 5331384..e27ff09 100755 ---- a/pom.xml -+++ b/pom.xml -@@ -223,7 +223,17 @@ - - com.google.gdata - gdata-java-client -- 1.40.0.atlassian-2 -+ 1.40.0 -+ -+ -+ com.google.gdata -+ gdata-java-core -+ 1.40.0 -+ -+ -+ com.google.gdata -+ gdata-java-analytics -+ 1.40.0 - - - net.sf.opencsv --- -1.7.1 - diff --git a/0002-No-separate-commons-httpclient-for-signpost.patch b/0002-No-separate-commons-httpclient-for-signpost.patch deleted file mode 100644 index 2ce3c7b..0000000 --- a/0002-No-separate-commons-httpclient-for-signpost.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 947eec383ceb2a668f56adb8d3503388ecdaf07d Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Fri, 3 Aug 2012 14:41:24 +0200 -Subject: [PATCH 2/6] No separate commons-httpclient for signpost - ---- - connector/pom.xml | 5 ----- - 1 files changed, 0 insertions(+), 5 deletions(-) - -diff --git a/connector/pom.xml b/connector/pom.xml -index 7554130..8431e4a 100644 ---- a/connector/pom.xml -+++ b/connector/pom.xml -@@ -88,11 +88,6 @@ - compile - - -- oauth.signpost -- signpost-commonshttp4 -- compile -- -- - com.googlecode.json-simple - json-simple - --- -1.7.1 - diff --git a/0004-Disable-modules-we-can-t-build-due-missing-closed-de.patch b/0004-Disable-modules-we-can-t-build-due-missing-closed-de.patch deleted file mode 100644 index ceeb41a..0000000 --- a/0004-Disable-modules-we-can-t-build-due-missing-closed-de.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 9eb94970a89def2d47e7b79a56e90ecf4dacc39d Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Fri, 3 Aug 2012 14:41:57 +0200 -Subject: [PATCH 4/6] Disable modules we can't build due missing/closed dependencies - ---- - pom.xml | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) - -diff --git a/pom.xml b/pom.xml -index e27ff09..9341bf4 100755 ---- a/pom.xml -+++ b/pom.xml -@@ -46,10 +46,7 @@ - - cli - web -- notification - sfdc -- gooddata-snaplogic -- snaplogic - backend - connector - common --- -1.7.1 - diff --git a/0005-Sanitize-logging-defaults.patch b/0005-Sanitize-logging-defaults.patch deleted file mode 100644 index 91e949c..0000000 --- a/0005-Sanitize-logging-defaults.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1710324954515ea0e70ef97c1981e93142c4ec31 Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Fri, 3 Aug 2012 14:42:52 +0200 -Subject: [PATCH 5/6] Sanitize logging defaults - ---- - common/src/main/resources/log4j.configuration | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/common/src/main/resources/log4j.configuration b/common/src/main/resources/log4j.configuration -index 0658a64..c042013 100644 ---- a/common/src/main/resources/log4j.configuration -+++ b/common/src/main/resources/log4j.configuration -@@ -1,6 +1,6 @@ - log4j.rootLogger=info, stdout --log4j.logger.com.gooddata.util.JdbcUtil=debug, S --log4j.logger.org.apache.commons.httpclient=debug,H -+#log4j.logger.com.gooddata.util.JdbcUtil=debug, S -+#log4j.logger.org.apache.commons.httpclient=debug,H - - # Prevent Axis to issue harmless complains about missing javax.activation.DataHandler - # and javax.mail.internet.MimeMultipart. Attachment support is not required. --- -1.7.1 - diff --git a/0006-Do-not-hardwire-classpath-in-CLI.patch b/0006-Do-not-hardwire-classpath-in-CLI.patch deleted file mode 100644 index cf746d3..0000000 --- a/0006-Do-not-hardwire-classpath-in-CLI.patch +++ /dev/null @@ -1,38 +0,0 @@ -From d954eef29bf4f745def220d6efada98e77923dc5 Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Fri, 3 Aug 2012 14:43:49 +0200 -Subject: [PATCH 6/6] Do not hardwire classpath in CLI - ---- - cli/pom.xml | 10 +--------- - 1 files changed, 1 insertions(+), 9 deletions(-) - -diff --git a/cli/pom.xml b/cli/pom.xml -index ef14a05..e7d3d81 100644 ---- a/cli/pom.xml -+++ b/cli/pom.xml -@@ -84,14 +84,6 @@ - - org.apache.maven.plugins - maven-jar-plugin -- -- -- -- true -- com.gooddata.processor.GdcDI -- -- -- - - - maven-assembly-plugin -@@ -109,4 +101,4 @@ - - - -- -\ No newline at end of file -+ --- -1.7.1 - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..4ddbba7 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +This package was retired on 2012-08-06 due to failure to build for multiple releases. diff --git a/gooddata-cl.conf b/gooddata-cl.conf deleted file mode 100644 index 09375b9..0000000 --- a/gooddata-cl.conf +++ /dev/null @@ -1,5 +0,0 @@ -[ "$PROJECT_DIR" ] || PROJECT_DIR="$HOME/.gooddata-cl" -GOODDATA_DI_OPTS="-Xmx512M $GOODDATA_DI_OPTS" -GOODDATA_DI_OPTS="-Dlog4j.configuration=/etc/gooddata-cl/log4j.configuration $GOODDATA_DI_OPTS" -GOODDATA_DI_OPTS="-Dderby.system.home=$PROJECT_DIR/db $GOODDATA_DI_OPTS" -GOODDATA_DI_OPTS="-Djava.io.tmpdir=$PROJECT_DIR/tmp $GOODDATA_DI_OPTS" diff --git a/gooddata-cl.spec b/gooddata-cl.spec deleted file mode 100644 index 3bccf8c..0000000 --- a/gooddata-cl.spec +++ /dev/null @@ -1,225 +0,0 @@ -Name: gooddata-cl -Version: 1.2.56 -Release: 1%{dist} -Summary: GoodData integration toolkit - -Group: Applications/Internet -License: BSD -URL: http://developer.gooddata.com/gooddata-cl/ -# The repository contains possibly non-free jars -# git clone http://github.com/gooddata/GoodData-CL.git -# cd GoodData-CL -# mkdir gooddata-cl-1.2.56 -# git --work-tree=gooddata-cl-1.2.56 checkout -f 1.2.56 -# find gooddata-cl-1.2.56 -name '*.jar' -delete -# tar czf gooddata-cl-1.2.56.tar.gz gooddata-cl-1.2.56 -Source0: gooddata-cl-%{version}.tar.gz -Source1: gooddata-cl.conf -Patch1: 0001-Drag-in-packages-we-ship-split.patch -Patch2: 0002-No-separate-commons-httpclient-for-signpost.patch -Patch4: 0004-Disable-modules-we-can-t-build-due-missing-closed-de.patch -Patch5: 0005-Sanitize-logging-defaults.patch -Patch6: 0006-Do-not-hardwire-classpath-in-CLI.patch - -Requires: apache-commons-beanutils -Requires: apache-commons-cli -Requires: apache-commons-codec -Requires: apache-commons-collections -Requires: apache-commons-discovery -Requires: apache-commons-io -Requires: apache-commons-jexl -Requires: apache-commons-lang -Requires: apache-commons-logging -Requires: jakarta-commons-net -Requires: axis -Requires: derby -Requires: dom4j -Requires: ezmorph -Requires: gdata-java -Requires: httpcomponents-client -Requires: httpcomponents-core -Requires: icu4j -Requires: jackrabbit-webdav -Requires: jakarta-commons-httpclient -Requires: javassist -Requires: jaxen -Requires: jdom -Requires: joda-time -Requires: json-lib -Requires: json_simple -Requires: junit -Requires: logback -Requires: mysql-connector-java -Requires: opencsv -Requires: signpost-core -Requires: slf4j -Requires: xpp3 -Requires: xstream - -BuildRequires: maven -BuildRequires: maven-doxia-sitetools -BuildRequires: maven-shared-reporting-impl -BuildRequires: maven-surefire-provider-junit4 -BuildRequires: maven-surefire -BuildRequires: maven-compiler-plugin -BuildRequires: maven-install-plugin -BuildRequires: maven-jar-plugin -BuildRequires: maven-resources-plugin -BuildRequires: maven-site-plugin -BuildRequires: maven-surefire-maven-plugin -BuildRequires: maven-war-plugin -BuildRequires: javacc-maven-plugin - -BuildRequires: apache-commons-beanutils -BuildRequires: apache-commons-cli -BuildRequires: apache-commons-codec -BuildRequires: apache-commons-collections -BuildRequires: apache-commons-discovery -BuildRequires: apache-commons-io -BuildRequires: apache-commons-jexl -BuildRequires: apache-commons-lang -BuildRequires: apache-commons-logging -BuildRequires: apache-commons-net -BuildRequires: jakarta-commons-httpclient -BuildRequires: axis -BuildRequires: derby -BuildRequires: dom4j -BuildRequires: ezmorph -BuildRequires: gdata-java -BuildRequires: httpcomponents-client -BuildRequires: httpcomponents-core -BuildRequires: icu4j -BuildRequires: jackrabbit-webdav -BuildRequires: javassist -BuildRequires: jaxen -BuildRequires: jdom -BuildRequires: joda-time -BuildRequires: json-lib -BuildRequires: json_simple -BuildRequires: junit -BuildRequires: logback -BuildRequires: mysql-connector-java -BuildRequires: opencsv -BuildRequires: signpost-core -BuildRequires: slf4j -BuildRequires: xpp3 -BuildRequires: xstream - -BuildArch: noarch - -Provides: gooddata-cli = %{version}-%{release} - -%description -This is GoodData data integration toolkit. The toolkit contains data -modeling, transformation and loading utilities that work on top of the -GoodData REST APIs. - - -%prep -%setup -q -%patch1 -p1 -%patch2 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 - - -%build -# These don't ship with POMs yet. -mvn-rpmbuild install:install-file -Dpackaging=jar -DgroupId=net.sf.opencsv \ - -DartifactId=opencsv -Dversion=2.1 -Dfile=$(build-classpath opencsv) - -mvn-rpmbuild install:install-file -Dpackaging=jar -DgroupId=com.google.gdata \ - -DartifactId=gdata-java-core -Dversion=1.40.0 -Dfile=$(build-classpath gdata/gdata-core) -mvn-rpmbuild install:install-file -Dpackaging=jar -DgroupId=com.google.gdata \ - -DartifactId=gdata-java-client -Dversion=1.40.0 -Dfile=$(build-classpath gdata/gdata-client) -mvn-rpmbuild install:install-file -Dpackaging=jar -DgroupId=com.google.gdata \ - -DartifactId=gdata-java-analytics -Dversion=1.40.0 -Dfile=$(build-classpath gdata/gdata-analytics) - -mvn-rpmbuild install:install-file -Dpackaging=jar -DgroupId=org.apache.axis \ - -DartifactId=axis -Dversion=1.4 -Dfile=$(build-classpath axis/axis) -mvn-rpmbuild install:install-file -Dpackaging=jar -DgroupId=org.apache.axis \ - -DartifactId=axis-jaxrpc -Dversion=1.4 -Dfile=$(build-classpath axis/jaxrpc) -mvn-rpmbuild install:install-file -Dpackaging=jar -DgroupId=org.apache.axis \ - -DartifactId=axis-saaj -Dversion=1.4 -Dfile=$(build-classpath axis/saaj) - -mvn-rpmbuild install:install-file -Dpackaging=jar -DgroupId=oauth.signpost \ - -DartifactId=signpost-core -Dversion=1.2 -Dfile=$(build-classpath signpost-core) - -mvn-rpmbuild install:install-file -Dpackaging=jar -DgroupId=com.googlecode.json-simple \ - -DartifactId=json-simple -Dversion=1.1 -Dfile=$(build-classpath json_simple) - -mvn-rpmbuild -Dmaven.test.skip=true install - - -%install -rm -rf $RPM_BUILD_ROOT - -# Directory tree -install -d $RPM_BUILD_ROOT%{_javadir}/%{name} -install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name} -install -d $RPM_BUILD_ROOT%{_bindir} -install -d $RPM_BUILD_ROOT%{_sysconfdir} - -# Code -for i in backend cli common connector -do - - install -pm644 $i/target/gooddata-cl-$i-*.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}/$i.jar -done - -install -pm644 common/src/main/resources/log4j.configuration \ - $RPM_BUILD_ROOT%{_sysconfdir}/%{name} - -# Configuration -install -pm644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/gooddata-cl.conf - -# Launcher -%jpackage_script com.gooddata.processor.GdcDI '' '' xpp3:slf4j/api:axis/saaj:axis/jaxrpc:json_simple:gdata:joda-time:slf4j/log4j-over-slf4j:commons-beanutils:commons-lang:commons-jexl:commons-io:jaxen:axis:httpcomponents/httpcore:dom4j:jackrabbit-webdav:junit:httpcomponents/httpclient:mysql-connector-java:opencsv:commons-collections:signpost-core:javassist:json-lib:commons-cli:commons-logging:commons-discovery:commons-codec:commons-net:logback/logback-classic:icu4j:xstream:logback/logback-core:derby:ezmorph:jdom:commons-httpclient:gooddata-cl gooddata-cli false - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -%defattr(-,root,root,-) -%{_bindir}/* -%config(noreplace) %{_sysconfdir}/* -%{_javadir}/%{name} -%doc README* LICENSE.TXT - - -%changelog -* Fri Aug 03 2012 Lubomir Rintel (GoodData) - 1.2.56-1 -- Update to DLI version - -* Thu Jul 19 2012 Fedora Release Engineering - 1.1.9-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Jan 13 2012 Fedora Release Engineering - 1.1.9-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Feb 08 2011 Fedora Release Engineering - 1.1.9-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Fri Nov 05 2010 Lubomir Rintel (GoodData) - 1.1.9-1 -- Bump to a later release - -* Fri Nov 05 2010 Lubomir Rintel (GoodData) - 1.1.4-3 -- Mark log4j configuration %%config -- Remove classpath from manifest - -* Thu Nov 04 2010 Lubomir Rintel (GoodData) - 1.1.4-2 -- Fix BuildRequires -- Correct the URL - -* Mon Sep 20 2010 Lubomir Rintel (GoodData) - 1.1.4-1 -- Rebase to a later version - -* Mon Jun 28 2010 Lubomir Rintel (GoodData) - 1.0-0.1.20100628git -- Update, rename to gooddata-cl - -* Wed Jun 16 2010 Lubomir Rintel (GoodData) - 0.6-1.20100615git -- First cut at packaging, far from sane diff --git a/sources b/sources deleted file mode 100644 index e681c88..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -ddf62f744545779e43e21bd76eb45eb3 gooddata-cl-1.2.56.tar.gz