gil pushed to cargo-resources (master). "reason"

notifications at fedoraproject.org notifications at fedoraproject.org
Tue Mar 31 16:01:41 UTC 2015


>From 14841882042b40d03b52ef007f503ad8f9d390a3 Mon Sep 17 00:00:00 2001
From: gil <puntogil at libero.it>
Date: Tue, 31 Mar 2015 17:57:22 +0200
Subject: reason


diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 5332188..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/cargo-resources-1.2.4-src-svn.tar.gz
-/cargo-resources-1.3.1-src-svn.tar.gz
-/cargo-resources-1.4.2-src-svn.tar.gz
diff --git a/cargo-resources-1.4.2-servlet.patch b/cargo-resources-1.4.2-servlet.patch
deleted file mode 100644
index eb10929..0000000
--- a/cargo-resources-1.4.2-servlet.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-diff -Nru cargo-resources-1.4.2/jetty-6-and-earlier-deployer/pom.xml cargo-resources-1.4.2.servlet/jetty-6-and-earlier-deployer/pom.xml
---- cargo-resources-1.4.2/jetty-6-and-earlier-deployer/pom.xml	2013-05-27 20:58:20.000000000 +0200
-+++ cargo-resources-1.4.2.servlet/jetty-6-and-earlier-deployer/pom.xml	2015-03-05 11:33:06.525223153 +0100
-@@ -31,8 +31,8 @@
-   <dependencies>
-     <dependency>
-       <groupId>javax.servlet</groupId>
--      <artifactId>servlet-api</artifactId>
--      <version>2.4</version>
-+      <artifactId>javax.servlet-api</artifactId>
-+      <version>3.1.0</version>
-       <scope>provided</scope>
-     </dependency>
-     <dependency>
-diff -Nru cargo-resources-1.4.2/jetty-7-and-onwards-deployer/pom.xml cargo-resources-1.4.2.servlet/jetty-7-and-onwards-deployer/pom.xml
---- cargo-resources-1.4.2/jetty-7-and-onwards-deployer/pom.xml	2013-05-27 20:58:20.000000000 +0200
-+++ cargo-resources-1.4.2.servlet/jetty-7-and-onwards-deployer/pom.xml	2015-03-05 11:33:06.519223480 +0100
-@@ -31,8 +31,8 @@
-   <dependencies>
-     <dependency>
-       <groupId>javax.servlet</groupId>
--      <artifactId>servlet-api</artifactId>
--      <version>2.4</version>
-+      <artifactId>javax.servlet-api</artifactId>
-+      <version>3.1.0</version>
-       <scope>provided</scope>
-     </dependency>
-     <dependency>
-diff -Nru cargo-resources-1.4.2/testdata/authentication-war/pom.xml cargo-resources-1.4.2.servlet/testdata/authentication-war/pom.xml
---- cargo-resources-1.4.2/testdata/authentication-war/pom.xml	2013-05-27 20:58:20.000000000 +0200
-+++ cargo-resources-1.4.2.servlet/testdata/authentication-war/pom.xml	2015-03-05 11:33:06.524223207 +0100
-@@ -29,8 +29,8 @@
-   <dependencies>
-     <dependency>
-       <groupId>javax.servlet</groupId>
--      <artifactId>servlet-api</artifactId>
--      <version>2.4</version>
-+      <artifactId>javax.servlet-api</artifactId>
-+      <version>3.1.0</version>
-       <scope>provided</scope>
-     </dependency>
-   </dependencies>
-diff -Nru cargo-resources-1.4.2/testdata/classpath-war/pom.xml cargo-resources-1.4.2.servlet/testdata/classpath-war/pom.xml
---- cargo-resources-1.4.2/testdata/classpath-war/pom.xml	2013-05-27 20:58:20.000000000 +0200
-+++ cargo-resources-1.4.2.servlet/testdata/classpath-war/pom.xml	2015-03-05 11:33:06.524223207 +0100
-@@ -29,8 +29,8 @@
-   <dependencies>
-     <dependency>
-       <groupId>javax.servlet</groupId>
--      <artifactId>servlet-api</artifactId>
--      <version>2.4</version>
-+      <artifactId>javax.servlet-api</artifactId>
-+      <version>3.1.0</version>
-       <scope>provided</scope>
-     </dependency>
-   </dependencies>
-diff -Nru cargo-resources-1.4.2/testdata/datasource-cmt-local-war/pom.xml cargo-resources-1.4.2.servlet/testdata/datasource-cmt-local-war/pom.xml
---- cargo-resources-1.4.2/testdata/datasource-cmt-local-war/pom.xml	2013-05-27 20:58:20.000000000 +0200
-+++ cargo-resources-1.4.2.servlet/testdata/datasource-cmt-local-war/pom.xml	2015-03-05 11:33:06.523223262 +0100
-@@ -29,8 +29,8 @@
-   <dependencies>
-     <dependency>
-       <groupId>javax.servlet</groupId>
--      <artifactId>servlet-api</artifactId>
--      <version>2.4</version>
-+      <artifactId>javax.servlet-api</artifactId>
-+      <version>3.1.0</version>
-       <scope>provided</scope>
-     </dependency>
-     <dependency>
-diff -Nru cargo-resources-1.4.2/testdata/datasource-war/pom.xml cargo-resources-1.4.2.servlet/testdata/datasource-war/pom.xml
---- cargo-resources-1.4.2/testdata/datasource-war/pom.xml	2013-05-27 20:58:20.000000000 +0200
-+++ cargo-resources-1.4.2.servlet/testdata/datasource-war/pom.xml	2015-03-05 11:33:06.519223480 +0100
-@@ -29,8 +29,8 @@
-   <dependencies>
-     <dependency>
-       <groupId>javax.servlet</groupId>
--      <artifactId>servlet-api</artifactId>
--      <version>2.4</version>
-+      <artifactId>javax.servlet-api</artifactId>
-+      <version>3.1.0</version>
-       <scope>provided</scope>
-     </dependency>
-   </dependencies>
-diff -Nru cargo-resources-1.4.2/testdata/mailsession-war/pom.xml cargo-resources-1.4.2.servlet/testdata/mailsession-war/pom.xml
---- cargo-resources-1.4.2/testdata/mailsession-war/pom.xml	2013-05-27 20:58:20.000000000 +0200
-+++ cargo-resources-1.4.2.servlet/testdata/mailsession-war/pom.xml	2015-03-05 11:33:06.520223425 +0100
-@@ -29,8 +29,8 @@
-   <dependencies>
-     <dependency>
-       <groupId>javax.servlet</groupId>
--      <artifactId>servlet-api</artifactId>
--      <version>2.4</version>
-+      <artifactId>javax.servlet-api</artifactId>
-+      <version>3.1.0</version>
-       <scope>provided</scope>
-     </dependency>
-     <dependency>
-diff -Nru cargo-resources-1.4.2/testdata/systemproperty-war/pom.xml cargo-resources-1.4.2.servlet/testdata/systemproperty-war/pom.xml
---- cargo-resources-1.4.2/testdata/systemproperty-war/pom.xml	2013-05-27 20:58:20.000000000 +0200
-+++ cargo-resources-1.4.2.servlet/testdata/systemproperty-war/pom.xml	2015-03-05 11:33:06.521223371 +0100
-@@ -29,8 +29,8 @@
-   <dependencies>
-     <dependency>
-       <groupId>javax.servlet</groupId>
--      <artifactId>servlet-api</artifactId>
--      <version>2.4</version>
-+      <artifactId>javax.servlet-api</artifactId>
-+      <version>3.1.0</version>
-       <scope>provided</scope>
-     </dependency>
-   </dependencies>
-diff -Nru cargo-resources-1.4.2/testdata/tomcat-context/pom.xml cargo-resources-1.4.2.servlet/testdata/tomcat-context/pom.xml
---- cargo-resources-1.4.2/testdata/tomcat-context/pom.xml	2013-05-27 20:58:20.000000000 +0200
-+++ cargo-resources-1.4.2.servlet/testdata/tomcat-context/pom.xml	2015-03-05 11:33:06.523223262 +0100
-@@ -29,8 +29,8 @@
-   <dependencies>
-     <dependency>
-       <groupId>javax.servlet</groupId>
--      <artifactId>servlet-api</artifactId>
--      <version>2.4</version>
-+      <artifactId>javax.servlet-api</artifactId>
-+      <version>3.1.0</version>
-       <scope>provided</scope>
-     </dependency>
-   </dependencies>
-diff -Nru cargo-resources-1.4.2/testdata/two-datasources-war/pom.xml cargo-resources-1.4.2.servlet/testdata/two-datasources-war/pom.xml
---- cargo-resources-1.4.2/testdata/two-datasources-war/pom.xml	2013-05-27 20:58:20.000000000 +0200
-+++ cargo-resources-1.4.2.servlet/testdata/two-datasources-war/pom.xml	2015-03-05 11:33:06.519223480 +0100
-@@ -13,8 +13,8 @@
-   <dependencies>
-     <dependency>
-       <groupId>javax.servlet</groupId>
--      <artifactId>servlet-api</artifactId>
--      <version>2.4</version>
-+      <artifactId>javax.servlet-api</artifactId>
-+      <version>3.1.0</version>
-       <scope>provided</scope>
-     </dependency>
-   </dependencies>
-diff -Nru cargo-resources-1.4.2/testdata/xadatasource-war/pom.xml cargo-resources-1.4.2.servlet/testdata/xadatasource-war/pom.xml
---- cargo-resources-1.4.2/testdata/xadatasource-war/pom.xml	2013-05-27 20:58:20.000000000 +0200
-+++ cargo-resources-1.4.2.servlet/testdata/xadatasource-war/pom.xml	2015-03-05 11:33:06.522223316 +0100
-@@ -29,8 +29,8 @@
-   <dependencies>
-     <dependency>
-       <groupId>javax.servlet</groupId>
--      <artifactId>servlet-api</artifactId>
--      <version>2.4</version>
-+      <artifactId>javax.servlet-api</artifactId>
-+      <version>3.1.0</version>
-       <scope>provided</scope>
-     </dependency>
-   </dependencies>
diff --git a/cargo-resources.spec b/cargo-resources.spec
deleted file mode 100644
index 6fdf23c..0000000
--- a/cargo-resources.spec
+++ /dev/null
@@ -1,178 +0,0 @@
-%global oname cargo
-Name:          cargo-resources
-Version:       1.4.2
-Release:       6%{?dist}
-Summary:       Cargo Shared Resources
-License:       ASL 2.0
-Url:           http://cargo.codehaus.org/
-# svn export http://svn.codehaus.org/cargo/resources/tags/cargo-resources-1.4.2
-# tar czf cargo-resources-1.4.2-src-svn.tar.gz cargo-resources-1.4.2
-Source0:       %{name}-%{version}-src-svn.tar.gz
-Patch0:        cargo-resources-1.4.2-servlet.patch
-
-BuildRequires: cargo-parent
-BuildRequires: felix-osgi-core
-BuildRequires: geronimo-ejb
-BuildRequires: geronimo-parent-poms
-BuildRequires: javamail
-BuildRequires: glassfish-servlet-api
-
-BuildRequires: maven-local
-BuildRequires: maven-ear-plugin
-BuildRequires: maven-ejb-plugin
-BuildRequires: maven-enforcer-plugin
-BuildRequires: maven-plugin-bundle
-BuildRequires: maven-war-plugin
-
-Requires:      felix-osgi-core
-Requires:      geronimo-ejb
-Requires:      javamail
-Requires:      glassfish-servlet-api
-
-BuildArch:     noarch
-
-%description
-Cargo Shared Resources (License files, Checkstyle configuration files, etc).
-
-%package javadoc
-Summary:       Javadoc for %{name}
-
-%description javadoc
-This package contains javadoc for %{name}.
-
-%prep
-%setup -q
-%patch0 -p1
-
-%pom_disable_module jetty-6-and-earlier-deployer
-%pom_disable_module jetty-7-and-onwards-deployer
-# requires geronimo-spec geronimo-spec-jta 1.0.1B-rc4
-# requires org.springframework spring 2.5.6
-%pom_disable_module datasource-cmt-local-war testdata/pom.xml
-# requires org.codehaus.mojo jboss-packaging-maven-plugin 2.2
-%pom_disable_module simple-aop testdata/pom.xml
-%pom_disable_module simple-har testdata/pom.xml
-
-%pom_xpath_set "pom:dependencies/pom:dependency[pom:artifactId = 'org.osgi.core']/pom:groupId" org.apache.felix testdata/simple-bundle
-%pom_xpath_set "pom:dependencies/pom:dependency[pom:artifactId = 'org.osgi.core']/pom:version" 1.4.0 testdata/simple-bundle
-%pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId = 'org.apache.geronimo.specs']/pom:artifactId" geronimo-ejb_3.1_spec testdata/simple-ejb
-
-%build
-
-%mvn_build
-
-%install
-
-mkdir -p %{buildroot}%{_javadir}/%{oname}
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{oname}-%{name}.pom
-%add_maven_depmap JPP.%{oname}-%{name}.pom
-
-install -m 644 build-tools/target/%{oname}-build-tools-%{version}.jar %{buildroot}%{_javadir}/%{oname}/%{oname}-build-tools.jar
-install -pm 644 build-tools/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{oname}-%{oname}-build-tools.pom
-%add_maven_depmap JPP.%{oname}-%{oname}-build-tools.pom %{oname}/%{oname}-build-tools.jar
-
-install -pm 644 testdata/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{oname}-%{oname}-samples-testdata.pom
-%add_maven_depmap JPP.%{oname}-%{oname}-samples-testdata.pom
-
-# jetty-6-and-earlier-deployer
-# jetty-7-and-onwards-deployer
-
-# testdata
-
-# simple-aop
-# simple-har
-
-for m in empty-ear \
-         simple-ear; do
-    install -m 644 testdata/${m}/target/${m}-%{version}.ear %{buildroot}%{_javadir}/%{oname}/${m}.ear
-    install -pm 644 testdata/${m}/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{oname}-${m}.pom
-%add_maven_depmap JPP.%{oname}-${m}.pom %{oname}/${m}.ear
-done
-
-for m in empty-jar \
-         simple-bundle \
-         simple-ejb \
-         simple-jar; do
-    install -m 644 testdata/${m}/target/${m}-%{version}.jar %{buildroot}%{_javadir}/%{oname}/${m}.jar
-    install -pm 644 testdata/${m}/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{oname}-${m}.pom
-%add_maven_depmap JPP.%{oname}-${m}.pom %{oname}/${m}.jar
-done
-
-# datasource-cmt-local-war
-for m in authentication-war \
-         classpath-war \
-         datasource-war \
-         expanded-war \
-         mailsession-war \
-         simple-war \
-         systemproperty-war \
-         two-datasources-war \
-         xadatasource-war; do
-    install -m 644 testdata/${m}/target/${m}-%{version}.war %{buildroot}%{_javadir}/%{oname}/${m}.war
-    install -pm 644 testdata/${m}/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{oname}-${m}.pom
-%add_maven_depmap JPP.%{oname}-${m}.pom %{oname}/${m}.war
-done
-
-install -m 644 testdata/tomcat-context/target/tomcatcontext-war-%{version}.war %{buildroot}%{_javadir}/%{oname}/tomcatcontext-war.war
-install -pm 644 testdata/tomcat-context/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{oname}-tomcatcontext-war.pom
-%add_maven_depmap JPP.%{oname}-tomcatcontext-war.pom %{oname}/tomcatcontext-war.war
-
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-cp -p build-tools/LICENSE .
-cp -p build-tools/NOTICE .
-
-%files -f .mfiles
-%dir %{_javadir}/%{oname}
-%license LICENSE NOTICE
-
-%files javadoc
-%{_javadocdir}/%{name}
-%license LICENSE NOTICE
-
-%changelog
-* Thu Mar 05 2015 gil cattaneo <puntogil at libero.it> 1.4.2-6
-- use servlet api 3.1
-
-* Fri Jan 30 2015 gil cattaneo <puntogil at libero.it> 1.4.2-5
-- introduce license macro
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Fri Mar 28 2014 Michael Simacek <msimacek at redhat.com> - 1.4.2-3
-- Use Requires: java-headless rebuild (#1067528)
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Wed Jun 05 2013 gil cattaneo <puntogil at libero.it> 1.4.2-1
-- Update to 1.4.2
-
-* Sun Feb 17 2013 gil cattaneo <puntogil at libero.it> 1.3.1-4
-- added missing BR geronimo-parent-poms
-
-* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Wed Feb 06 2013 Java SIG <java-devel at lists.fedoraproject.org> - 1.3.1-2
-- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
-- Replace maven BuildRequires with maven-local
-
-* Mon Nov 19 2012 gil cattaneo <puntogil at libero.it> 1.3.1-1
-- Update to 1.3.1
-
-* Thu Aug 23 2012 gil cattaneo <puntogil at libero.it> 1.2.4-1
-- Update to 1.2.4
-
-* Fri Jul 27 2012 gil cattaneo <puntogil at libero.it> 1.2.3-1
-- Update to 1.2.3
-
-* Wed Jul 04 2012 gil cattaneo <puntogil at libero.it> 1.2.2-1
-- Update to 1.2.2
-
-* Mon May 14 2012 gil cattaneo <puntogil at libero.it> 1.2.1-1
-- initial rpm
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..64164ed
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+reason
diff --git a/sources b/sources
deleted file mode 100644
index 896e785..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-4abf5aede71316d27649f4ca5e2d9da6  cargo-resources-1.4.2-src-svn.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/cargo-resources.git/commit/?h=master&id=14841882042b40d03b52ef007f503ad8f9d390a3


More information about the scm-commits mailing list