[ehcache-core] Initial import (#803558)
gil
gil at fedoraproject.org
Tue Jul 17 08:29:32 UTC 2012
commit 47a08a40a411b75501fcdc6cbb5d0fffed6371b3
Author: gil <puntogil at libero.it>
Date: Tue Jul 17 10:29:21 2012 +0200
Initial import (#803558)
.gitignore | 1 +
ehcache-core-2.6.0-depmap | 14 ++
...che-core-2.6.0-disable-buildnumber-plugin.patch | 25 ++++
ehcache-core-2.6.0-pom.patch | 91 ++++++++++++++
...e-core-2.6.0-remove-unavailable-test-deps.patch | 34 +++++
ehcache-core.spec | 127 ++++++++++++++++++++
sources | 1 +
7 files changed, 293 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..d0a6792 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/ehcache-core-2.6.0-clean-src-svn.tar.gz
diff --git a/ehcache-core-2.6.0-depmap b/ehcache-core-2.6.0-depmap
new file mode 100644
index 0000000..e9b13f6
--- /dev/null
+++ b/ehcache-core-2.6.0-depmap
@@ -0,0 +1,14 @@
+<dependencies>
+<dependency>
+ <maven>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>7.0.27</version>
+ </maven>
+ <jpp>
+ <groupId>JPP</groupId>
+ <artifactId>tomcat-servlet-3.0-api</artifactId>
+ <version>7.0.27</version>
+ </jpp>
+</dependency>
+</dependencies>
\ No newline at end of file
diff --git a/ehcache-core-2.6.0-disable-buildnumber-plugin.patch b/ehcache-core-2.6.0-disable-buildnumber-plugin.patch
new file mode 100644
index 0000000..8d87515
--- /dev/null
+++ b/ehcache-core-2.6.0-disable-buildnumber-plugin.patch
@@ -0,0 +1,25 @@
+--- pom.xml 2012-07-15 11:14:32.430564892 +0200
++++ pom.xml-gil 2012-07-15 11:14:40.018210002 +0200
+@@ -656,10 +656,10 @@
+ </plugins>
+ </build>
+ </profile>
+- <profile>
+- <!-- This profile is here for triggering when another scm than svn
++ <!--profile>
++ <This profile is here for triggering when another scm than svn
+ is used (for example git). Instead of getting the version build number from
+- svn we will use the build date and the user name. -->
++ svn we will use the build date and the user name. >
+ <id>buildnumber-git</id>
+ <activation>
+ <file>
+@@ -692,7 +692,7 @@
+ </plugin>
+ </plugins>
+ </build>
+- </profile>
++ </profile-->
+
+ <!-- Prevent interruptible IO from being used on Solaris - MNK-1947 -->
+ <profile>
diff --git a/ehcache-core-2.6.0-pom.patch b/ehcache-core-2.6.0-pom.patch
new file mode 100644
index 0000000..9682d59
--- /dev/null
+++ b/ehcache-core-2.6.0-pom.patch
@@ -0,0 +1,91 @@
+--- pom.xml 2012-07-12 14:37:13.000000000 +0200
++++ pom.xml-gil 2012-07-14 00:00:27.740802844 +0200
+@@ -80,6 +80,7 @@
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
++ <version>7.0.27</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+@@ -295,7 +296,7 @@
+ </executions>
+ </plugin>
+
+- <plugin>
++ <!--plugin>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <version>1.3</version>
+@@ -346,7 +347,7 @@
+ </configuration>
+ </execution>
+ </executions>
+- </plugin>
++ </plugin-->
+
+
+
+@@ -413,7 +414,7 @@
+ </executions>
+ </plugin>
+
+- <plugin>
++ <!--plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.7</version>
+@@ -438,7 +439,7 @@
+ <includeTestSourceDirectory>false</includeTestSourceDirectory>
+ <enableRulesSummary>true</enableRulesSummary>
+ </configuration>
+- </plugin>
++ </plugin-->
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+@@ -568,7 +569,7 @@
+ <ignore/>
+ </action>
+ </pluginExecution>
+- <pluginExecution>
++ <!--pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+@@ -580,7 +581,7 @@
+ <action>
+ <ignore/>
+ </action>
+- </pluginExecution>
++ </pluginExecution-->
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.codehaus.mojo</groupId>
+@@ -594,7 +595,7 @@
+ <ignore/>
+ </action>
+ </pluginExecution>
+- <pluginExecution>
++ <!--pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+@@ -606,7 +607,7 @@
+ <action>
+ <ignore/>
+ </action>
+- </pluginExecution>
++ </pluginExecution-->
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+@@ -699,7 +700,7 @@
+ <activation>
+ <property>
+ <name>java.vendor</name>
+- <value>Sun Microsystems Inc.</value>
++ <value>Oracle Corporation</value>
+ </property>
+ </activation>
+ <properties>
diff --git a/ehcache-core-2.6.0-remove-unavailable-test-deps.patch b/ehcache-core-2.6.0-remove-unavailable-test-deps.patch
new file mode 100644
index 0000000..27d8264
--- /dev/null
+++ b/ehcache-core-2.6.0-remove-unavailable-test-deps.patch
@@ -0,0 +1,34 @@
+--- pom.xml 2012-07-15 11:34:34.359333590 +0200
++++ pom.xml-gil 2012-07-15 11:34:41.283002487 +0200
+@@ -115,11 +115,11 @@
+ <version>2.0.1</version>
+ <scope>test</scope>
+ </dependency>
+- <dependency>
++ <!--dependency>
+ <groupId>net.sf.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <scope>test</scope>
+- </dependency>
++ </dependency-->
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+@@ -149,7 +149,7 @@
+ <version>3.4.GA</version>
+ <scope>test</scope>
+ </dependency>
+- <dependency>
++ <!--dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-ehcache</artifactId>
+ <version>3.3.2.GA</version>
+@@ -160,7 +160,7 @@
+ <groupId>net.sf.ehcache</groupId>
+ </exclusion>
+ </exclusions>
+- </dependency>
++ </dependency-->
+ <dependency>
+ <!-- Needed by net.sf.ehcache.hibernate.HibernateAPIUsageTest.testAPIAsUsedByHibernate2() -->
+ <groupId>commons-logging</groupId>
diff --git a/ehcache-core.spec b/ehcache-core.spec
new file mode 100644
index 0000000..8583eb3
--- /dev/null
+++ b/ehcache-core.spec
@@ -0,0 +1,127 @@
+Name: ehcache-core
+Version: 2.6.0
+Release: 1%{?dist}
+Summary: Easy Hibernate Cache
+Group: Development/Libraries
+License: ASL 2.0
+URL: http://ehcache.org/
+# svn export http://svn.terracotta.org/svn/ehcache/tags/ehcache-core-2.6.0
+# find ehcache-core-2.6.0 -name '*.jar' -delete
+# ehcache-core-2.6.0/tools/maven-ant-tasks-2.0.7.jar
+# find ehcache-core-2.6.0 -name '*.class' -delete
+# tar czf ehcache-core-2.6.0-clean-src-svn.tar.gz ehcache-core-2.6.0
+Source0: %{name}-%{version}-clean-src-svn.tar.gz
+# force use tomcat 7.x apis
+Source1: %{name}-%{version}-depmap
+# remove gmaven-plugin maven-checkstyle-plugin
+# fix java.vendor
+# add servlet-api version
+Patch0: %{name}-%{version}-pom.patch
+# Don't use buildnumber-plugin, because jna is required (and currently broken)
+Patch1: %{name}-%{version}-disable-buildnumber-plugin.patch
+# circular deps
+# org.hibernate hibernate-ehcache 3.3.2.GA
+# unavailable deps
+# net.sf.hibernate hibernate
+Patch2: %{name}-%{version}-remove-unavailable-test-deps.patch
+
+BuildRequires: ehcache-parent
+BuildRequires: java-devel
+BuildRequires: jpackage-utils
+
+BuildRequires: geronimo-jta
+BuildRequires: hibernate3
+BuildRequires: ehcache-sizeof-agent
+BuildRequires: slf4j
+BuildRequires: tomcat-servlet-3.0-api
+
+# TODO test
+#BuildRequires: apache-commons-logging
+#BuildRequires: mvn(org.hibernate:hibernate-ehcache)
+#BuildRequires: bsh
+#BuildRequires: btm
+#BuildRequires: derby
+#BuildRequires: dom4j
+#BuildRequires: hamcrest12
+#BuildRequires: javassist
+#BuildRequires: junit4
+#BuildRequires: mockito
+#BuildRequires: xsom
+
+BuildRequires: maven
+BuildRequires: maven-assembly-plugin
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-dependency-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-source-plugin
+BuildRequires: maven-surefire-plugin
+BuildRequires: rmic-maven-plugin
+BuildRequires: xml-maven-plugin
+BuildRequires: plexus-resources
+
+Requires: ehcache-sizeof-agent
+Requires: geronimo-jta
+Requires: hibernate3
+Requires: slf4j
+Requires: tomcat-servlet-3.0-api
+
+Requires: java
+Requires: jpackage-utils
+BuildArch: noarch
+
+%description
+Ehcache is a pure Java, in-process cache.
+
+%package javadoc
+Group: Documentation
+Summary: Javadoc for %{name}
+Requires: jpackage-utils
+
+%description javadoc
+This package contains javadoc for %{name}.
+
+%prep
+%setup -q
+%patch0 -p0
+%patch1 -p0
+%patch2 -p0
+
+%build
+
+# tests skipped. cause: missing dependencies
+mvn-rpmbuild -X -Dmaven.local.depmap.file="%{SOURCE1}" -Dmaven.test.skip=true install javadoc:aggregate
+
+%install
+
+mkdir -p %{buildroot}%{_javadir}
+install -pm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+
+mkdir -p %{buildroot}%{_mavenpomdir}
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
+
+mkdir -p %{buildroot}%{_javadocdir}/%{name}
+cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+
+%files
+%{_javadir}/%{name}.jar
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
+%doc src/assemble/EHCACHE-CORE-LICENSE.txt
+
+%files javadoc
+%{_javadocdir}/%{name}
+%doc src/assemble/EHCACHE-CORE-LICENSE.txt
+
+%changelog
+* Fri Jul 13 2012 gil cattaneo <puntogil at libero.it> - 2.6.0-1
+- update to 2.6.0
+
+* Sat Apr 21 2012 gil cattaneo <puntogil at libero.it> - 2.5.2-1
+- update to 2.5.2
+
+* Mon Mar 12 2012 Andy Grimm <agrimm at gmail.com> - 2.5.1-1
+- Initial packaging
\ No newline at end of file
diff --git a/sources b/sources
index e69de29..6a2d39c 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+30cc9f1ff62e1c694d47690ebb6138e4 ehcache-core-2.6.0-clean-src-svn.tar.gz
More information about the scm-commits
mailing list