From 429d4824cc9f525ea1461c5b2af8b09aff90b432ec439cdd2cf269b4ac1c8b74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sun, 7 Dec 2014 14:39:01 +0000 Subject: [PATCH] Accepting request 264167 from home:posophe:branches:Java:packages - Update to version 1.7 + No changelog available - Add requirement to commons-logging; new dependency - Remove java-devel >= 1.6.0 requirement; not needed anymore - Do not copy convert folder; doesn't exist anymore OBS-URL: https://build.opensuse.org/request/show/264167 OBS-URL: https://build.opensuse.org/package/show/Java:packages/velocity?expand=0&rev=18 --- velocity-1.5.tar.bz2 | 3 - velocity-1.5.pom => velocity-1.7.pom | 322 ++++++++++++++++++--------- velocity-1.7.tar.gz | 3 + velocity.changes | 9 + velocity.spec | 11 +- 5 files changed, 233 insertions(+), 115 deletions(-) delete mode 100644 velocity-1.5.tar.bz2 rename velocity-1.5.pom => velocity-1.7.pom (58%) create mode 100644 velocity-1.7.tar.gz diff --git a/velocity-1.5.tar.bz2 b/velocity-1.5.tar.bz2 deleted file mode 100644 index 3a941ee..0000000 --- a/velocity-1.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4341a22ceabd40aa74482d72f4af8aed4575936122da8525f655d374cc3eb89e -size 4132673 diff --git a/velocity-1.5.pom b/velocity-1.7.pom similarity index 58% rename from velocity-1.5.pom rename to velocity-1.7.pom index b0626d0..103c529 100644 --- a/velocity-1.5.pom +++ b/velocity-1.7.pom @@ -1,87 +1,57 @@ - + + + + + + 4.0.0 + + + org.apache + apache + 4 + + org.apache.velocity velocity - pom + 1.7 + Apache Velocity - 1.5 + http://velocity.apache.org/engine/devel/ Apache Velocity is a general purpose template engine. - http://velocity.apache.org/engine/releases/velocity-1.5/ - - JIRA - https://issues.apache.org/jira/browse/VELOCITY - 2000 - - - wglass - Will Glass-Husain - wglass@forio.com - Forio Business Simulations - - Java Developer - - - - geirm - Geir Magnusson Jr. - geirm@optonline.net - Independent (DVSL Maven) - - Java Developer - - - - dlr - Daniel Rall - dlr@finemaltcoding.com - CollabNet, Inc. - - Java Developer - - - - henning - Henning P. Schmiedehausen - hps@intermeta.de - INTERMETA - Gesellschaft f??r Mehrwertdienste mbH - - Java Developer - - 2 - - - nbubna - Nathan Bubna - nathan@esha.com - ESHA Research - - Java Developer - - - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - scm:svn:http://svn.apache.org/repos/asf/velocity/engine/tags/Velocity_1.5 - scm:svn:https://svn.apache.org/repos/asf/velocity/engine/tags/Velocity_1.5 - http://svn.apache.org/viewvc/velocity/engine/tags/Velocity_1.5 - - - The Apache Software Foundation - http://www.apache.org/ - + jar + + + 2.0.9 + + + install src/java src/test - install + org.apache.maven.plugins maven-site-plugin UTF-8 @@ -90,32 +60,103 @@ + + + src/java + + **/*.java + + + - + + + + velocity.apache.org + scpexe://people.apache.org/www/velocity.apache.org/engine/releases/velocity-1.7 + - - false - - apache.snapshots - Apache Snapshot Repository - http://people.apache.org/repo/m2-snapshot-repository + apache.releases + Apache Release Distribution Repository + scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository - + + apache.snapshots + Apache Development Snapshot Repository + scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository + + + + + + Will Glass-Husain + wglass + wglass@forio.com + Forio Business Simulations + + Java Developer + + + + + Geir Magnusson Jr. + geirm + geirm@optonline.net + Independent (DVSL Maven) + + Java Developer + + + + + Daniel Rall + dlr + dlr@finemaltcoding.com + CollabNet, Inc. + + Java Developer + + + + + Henning P. Schmiedehausen + henning + hps@intermeta.de + INTERMETA - Gesellschaft für Mehrwertdienste mbH + + Java Developer + + 2 + + + + Nathan Bubna + nbubna + nathan@esha.com + ESHA Research + + Java Developer + + + + + commons-collections commons-collections - 3.1 + 3.2.1 commons-lang commons-lang - 2.1 + 2.4 oro oro 2.0.8 + true jdom @@ -123,6 +164,26 @@ 1.0 provided + + commons-logging + commons-logging + 1.1 + provided + + + avalon-framework + avalon-framework + + + log4j + log4j + + + javax.servlet + servlet-api + + + log4j log4j @@ -153,11 +214,26 @@ 0.9.4 provided + + junit + junit + 3.8.1 + test + + + hsqldb + hsqldb + 1.7.1 + test + + + org.apache.maven.plugins maven-project-info-reports-plugin + 2.1 @@ -171,13 +247,9 @@ + org.apache.maven.plugins maven-changes-plugin - - 12311337 - fixfor=12310253&fixfor=12312142&fixfor=12312057&sorter/field=issuekey&sorter/order=ASC - 500 - http://velocity.apache.org/who-we-are.html - + 2.0 @@ -186,26 +258,41 @@ + + ${jira.browse.url}/%ISSUE% + + 12311337 + + fixfor=12310290&sorter/field=issuekey&sorter/order=ASC + 100 + http://velocity.apache.org/who-we-are.html + org.codehaus.mojo taglist-maven-plugin + 2.2 TODO FIXME + org.apache.maven.plugins maven-jxr-plugin + 2.1 + org.apache.maven.plugins maven-javadoc-plugin + 2.5 http://java.sun.com/j2se/1.4.2/docs/api http://jakarta.apache.org/oro/api http://jakarta.apache.org/commons/lang/api-release http://jakarta.apache.org/commons/collections/api-release + http://www.jdom.org/docs/apidocs http://logging.apache.org/log4j/docs/api http://excalibur.apache.org/apidocs @@ -214,25 +301,46 @@ + org.apache.maven.plugins maven-changelog-plugin + 2.1 + + + org.codehaus.mojo + findbugs-maven-plugin + 1.2 + + true + Low + Max + build/findbugs-exclude.xml + xdocs + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.4 + 1.4 + - - - apache.releases - Apache Release Distribution Repository - scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository - - - apache.snapshots - Apache Development Snapshot Repository - scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository - - - velocity.apache.org - scpexe://people.apache.org/www/velocity.apache.org/engine/releases/velocity-1.5/ - - deployed - - \ No newline at end of file + + + scm:svn:http://svn.apache.org/repos/asf/velocity/engine/trunk + scm:svn:https://svn.apache.org/repos/asf/velocity/engine/trunk + HEAD + http://svn.apache.org/viewvc/velocity/engine/trunk + + + + https://issues.apache.org/jira/browse + + + + JIRA + ${jira.browse.url}/VELOCITY + + diff --git a/velocity-1.7.tar.gz b/velocity-1.7.tar.gz new file mode 100644 index 0000000..de9cf32 --- /dev/null +++ b/velocity-1.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6cabbc45ead01b32e9833db31b1726f2e34f5ff6a03346df9822e70909d06766 +size 5882643 diff --git a/velocity.changes b/velocity.changes index 60be67f..8a1eb93 100644 --- a/velocity.changes +++ b/velocity.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Dec 5 14:34:48 UTC 2014 - p.drouand@gmail.com + +- Update to version 1.7 + + No changelog available +- Add requirement to commons-logging; new dependency +- Remove java-devel >= 1.6.0 requirement; not needed anymore +- Do not copy convert folder; doesn't exist anymore + ------------------------------------------------------------------- Fri Jun 27 14:17:29 UTC 2014 - tchvatal@suse.com diff --git a/velocity.spec b/velocity.spec index b7e7f2f..6f09b56 100644 --- a/velocity.spec +++ b/velocity.spec @@ -17,13 +17,13 @@ Name: velocity -Version: 1.5 +Version: 1.7 Release: 0 Summary: Java-based template engine License: Apache-2.0 Group: Development/Libraries/Java -Source0: http://www.apache.org/dist/velocity/engine/1.5/velocity-1.5.tar.bz2 -Source1: http://repo1.maven.org/maven2/velocity/velocity/1.5/velocity-1.5.pom +Source0: http://www.apache.org/dist/velocity/engine/1.7/%{name}-%{version}.tar.gz +Source1: http://repo1.maven.org/maven2/velocity/velocity/1.7/%{name}-%{version}.pom Patch0: velocity-build_xml.patch Url: http://velocity.apache.org/ Requires: avalon-logkit @@ -44,8 +44,8 @@ BuildRequires: avalon-logkit BuildRequires: classworlds BuildRequires: commons-collections BuildRequires: commons-lang +BuildRequires: commons-logging BuildRequires: hsqldb -BuildRequires: java-devel >= 1.6.0 BuildRequires: javapackages-tools BuildRequires: jdom >= 1.0-1 BuildRequires: junit @@ -187,6 +187,7 @@ ln -sf $(build-classpath antlr) ln -sf $(build-classpath avalon-logkit) ln -sf $(build-classpath commons-collections) ln -sf $(build-classpath commons-lang) +ln -sf $(build-classpath commons-logging) ln -sf $(build-classpath jdom) ln -sf $(build-classpath log4j) ln -sf $(build-classpath oro) @@ -220,7 +221,7 @@ cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} rm -rf docs/api # data install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name} -cp -pr convert examples test $RPM_BUILD_ROOT%{_datadir}/%{name} +cp -pr examples test $RPM_BUILD_ROOT%{_datadir}/%{name} %fdupes -s %{buildroot} %files