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
This commit is contained in:
Tomáš Chvátal 2014-12-07 14:39:01 +00:00 committed by Git OBS Bridge
parent ca3440021a
commit 429d4824cc
5 changed files with 233 additions and 115 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4341a22ceabd40aa74482d72f4af8aed4575936122da8525f655d374cc3eb89e
size 4132673

View File

@ -1,87 +1,57 @@
<?xml version="1.0" encoding="UTF-8"?><project> <?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>4</version>
</parent>
<groupId>org.apache.velocity</groupId> <groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId> <artifactId>velocity</artifactId>
<packaging>pom</packaging> <version>1.7</version>
<name>Apache Velocity</name> <name>Apache Velocity</name>
<version>1.5</version> <url>http://velocity.apache.org/engine/devel/</url>
<description>Apache Velocity is a general purpose template engine.</description> <description>Apache Velocity is a general purpose template engine.</description>
<url>http://velocity.apache.org/engine/releases/velocity-1.5/</url>
<issueManagement>
<system>JIRA</system>
<url>https://issues.apache.org/jira/browse/VELOCITY</url>
</issueManagement>
<inceptionYear>2000</inceptionYear> <inceptionYear>2000</inceptionYear>
<developers> <packaging>jar</packaging>
<developer>
<id>wglass</id> <prerequisites>
<name>Will Glass-Husain</name> <maven>2.0.9</maven>
<email>wglass@forio.com</email> </prerequisites>
<organization>Forio Business Simulations</organization>
<roles>
<role>Java Developer</role>
</roles>
</developer>
<developer>
<id>geirm</id>
<name>Geir Magnusson Jr.</name>
<email>geirm@optonline.net</email>
<organization>Independent (DVSL Maven)</organization>
<roles>
<role>Java Developer</role>
</roles>
</developer>
<developer>
<id>dlr</id>
<name>Daniel Rall</name>
<email>dlr@finemaltcoding.com</email>
<organization>CollabNet, Inc.</organization>
<roles>
<role>Java Developer</role>
</roles>
</developer>
<developer>
<id>henning</id>
<name>Henning P. Schmiedehausen</name>
<email>hps@intermeta.de</email>
<organization>INTERMETA - Gesellschaft f??r Mehrwertdienste mbH</organization>
<roles>
<role>Java Developer</role>
</roles>
<timezone>2</timezone>
</developer>
<developer>
<id>nbubna</id>
<name>Nathan Bubna</name>
<email>nathan@esha.com</email>
<organization>ESHA Research</organization>
<roles>
<role>Java Developer</role>
</roles>
</developer>
</developers>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/velocity/engine/tags/Velocity_1.5</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/velocity/engine/tags/Velocity_1.5</developerConnection>
<url>http://svn.apache.org/viewvc/velocity/engine/tags/Velocity_1.5</url>
</scm>
<organization>
<name>The Apache Software Foundation</name>
<url>http://www.apache.org/</url>
</organization>
<build> <build>
<defaultGoal>install</defaultGoal>
<sourceDirectory>src/java</sourceDirectory> <sourceDirectory>src/java</sourceDirectory>
<testSourceDirectory>src/test</testSourceDirectory> <testSourceDirectory>src/test</testSourceDirectory>
<defaultGoal>install</defaultGoal>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId> <artifactId>maven-site-plugin</artifactId>
<configuration> <configuration>
<inputEncoding>UTF-8</inputEncoding> <inputEncoding>UTF-8</inputEncoding>
@ -90,32 +60,103 @@
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
<resources>
<resource>
<directory>src/java</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</resource>
</resources>
</build> </build>
<repositories>
<distributionManagement>
<site>
<id>velocity.apache.org</id>
<url>scpexe://people.apache.org/www/velocity.apache.org/engine/releases/velocity-1.7</url>
</site>
<repository> <repository>
<releases> <id>apache.releases</id>
<enabled>false</enabled> <name>Apache Release Distribution Repository</name>
</releases> <url>scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
<id>apache.snapshots</id>
<name>Apache Snapshot Repository</name>
<url>http://people.apache.org/repo/m2-snapshot-repository</url>
</repository> </repository>
</repositories> <snapshotRepository>
<id>apache.snapshots</id>
<name>Apache Development Snapshot Repository</name>
<url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
</snapshotRepository>
</distributionManagement>
<developers>
<developer>
<name>Will Glass-Husain</name>
<id>wglass</id>
<email>wglass@forio.com</email>
<organization>Forio Business Simulations</organization>
<roles>
<role>Java Developer</role>
</roles>
</developer>
<developer>
<name>Geir Magnusson Jr.</name>
<id>geirm</id>
<email>geirm@optonline.net</email>
<organization>Independent (DVSL Maven)</organization>
<roles>
<role>Java Developer</role>
</roles>
</developer>
<developer>
<name>Daniel Rall</name>
<id>dlr</id>
<email>dlr@finemaltcoding.com</email>
<organization>CollabNet, Inc.</organization>
<roles>
<role>Java Developer</role>
</roles>
</developer>
<developer>
<name>Henning P. Schmiedehausen</name>
<id>henning</id>
<email>hps@intermeta.de</email>
<organization>INTERMETA - Gesellschaft für Mehrwertdienste mbH</organization>
<roles>
<role>Java Developer</role>
</roles>
<timezone>2</timezone>
</developer>
<developer>
<name>Nathan Bubna</name>
<id>nbubna</id>
<email>nathan@esha.com</email>
<organization>ESHA Research</organization>
<roles>
<role>Java Developer</role>
</roles>
</developer>
</developers>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>commons-collections</groupId> <groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId> <artifactId>commons-collections</artifactId>
<version>3.1</version> <version>3.2.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-lang</groupId> <groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId> <artifactId>commons-lang</artifactId>
<version>2.1</version> <version>2.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>oro</groupId> <groupId>oro</groupId>
<artifactId>oro</artifactId> <artifactId>oro</artifactId>
<version>2.0.8</version> <version>2.0.8</version>
<optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>jdom</groupId> <groupId>jdom</groupId>
@ -123,6 +164,26 @@
<version>1.0</version> <version>1.0</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>log4j</groupId>
<artifactId>log4j</artifactId> <artifactId>log4j</artifactId>
@ -153,11 +214,26 @@
<version>0.9.4</version> <version>0.9.4</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>1.7.1</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<reporting> <reporting>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId> <artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.1</version>
<reportSets> <reportSets>
<reportSet> <reportSet>
<reports> <reports>
@ -171,13 +247,9 @@
</reportSets> </reportSets>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId> <artifactId>maven-changes-plugin</artifactId>
<configuration> <version>2.0</version>
<component>12311337</component>
<filter>fixfor=12310253&amp;fixfor=12312142&amp;fixfor=12312057&amp;sorter/field=issuekey&amp;sorter/order=ASC</filter>
<maxEntries>500</maxEntries>
<teamlist>http://velocity.apache.org/who-we-are.html</teamlist>
</configuration>
<reportSets> <reportSets>
<reportSet> <reportSet>
<reports> <reports>
@ -186,26 +258,41 @@
</reports> </reports>
</reportSet> </reportSet>
</reportSets> </reportSets>
<configuration>
<issueLinkTemplate>${jira.browse.url}/%ISSUE%</issueLinkTemplate>
<!-- Apache JIRA, Component Engine -->
<component>12311337</component>
<!-- FixFor 1.6 -->
<filter>fixfor=12310290&amp;sorter/field=issuekey&amp;sorter/order=ASC</filter>
<maxEntries>100</maxEntries>
<teamlist>http://velocity.apache.org/who-we-are.html</teamlist>
</configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId> <artifactId>taglist-maven-plugin</artifactId>
<version>2.2</version>
<configuration> <configuration>
<tag>TODO</tag> <tag>TODO</tag>
<tag>FIXME</tag> <tag>FIXME</tag>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId> <artifactId>maven-jxr-plugin</artifactId>
<version>2.1</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.5</version>
<configuration> <configuration>
<links> <links>
<link>http://java.sun.com/j2se/1.4.2/docs/api</link> <link>http://java.sun.com/j2se/1.4.2/docs/api</link>
<link>http://jakarta.apache.org/oro/api</link> <link>http://jakarta.apache.org/oro/api</link>
<link>http://jakarta.apache.org/commons/lang/api-release</link> <link>http://jakarta.apache.org/commons/lang/api-release</link>
<link>http://jakarta.apache.org/commons/collections/api-release</link> <link>http://jakarta.apache.org/commons/collections/api-release</link>
<link>http://www.jdom.org/docs/apidocs</link> <link>http://www.jdom.org/docs/apidocs</link>
<link>http://logging.apache.org/log4j/docs/api</link> <link>http://logging.apache.org/log4j/docs/api</link>
<link>http://excalibur.apache.org/apidocs</link> <link>http://excalibur.apache.org/apidocs</link>
@ -214,25 +301,46 @@
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changelog-plugin</artifactId> <artifactId>maven-changelog-plugin</artifactId>
<version>2.1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>1.2</version>
<configuration>
<xmlOutput>true</xmlOutput>
<threshold>Low</threshold>
<effort>Max</effort>
<excludeFilterFile>build/findbugs-exclude.xml</excludeFilterFile>
<findbugsXmlOutputDirectory>xdocs</findbugsXmlOutputDirectory>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.4</source>
<target>1.4</target>
</configuration>
</plugin> </plugin>
</plugins> </plugins>
</reporting> </reporting>
<distributionManagement>
<repository> <scm>
<id>apache.releases</id> <connection>scm:svn:http://svn.apache.org/repos/asf/velocity/engine/trunk</connection>
<name>Apache Release Distribution Repository</name> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/velocity/engine/trunk</developerConnection>
<url>scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url> <tag>HEAD</tag>
</repository> <url>http://svn.apache.org/viewvc/velocity/engine/trunk</url>
<snapshotRepository> </scm>
<id>apache.snapshots</id>
<name>Apache Development Snapshot Repository</name> <properties>
<url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url> <jira.browse.url>https://issues.apache.org/jira/browse</jira.browse.url>
</snapshotRepository> </properties>
<site>
<id>velocity.apache.org</id> <issueManagement>
<url>scpexe://people.apache.org/www/velocity.apache.org/engine/releases/velocity-1.5/</url> <system>JIRA</system>
</site> <url>${jira.browse.url}/VELOCITY</url>
<status>deployed</status> </issueManagement>
</distributionManagement> </project>
</project>

BIN
velocity-1.7.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -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 Fri Jun 27 14:17:29 UTC 2014 - tchvatal@suse.com

View File

@ -17,13 +17,13 @@
Name: velocity Name: velocity
Version: 1.5 Version: 1.7
Release: 0 Release: 0
Summary: Java-based template engine Summary: Java-based template engine
License: Apache-2.0 License: Apache-2.0
Group: Development/Libraries/Java Group: Development/Libraries/Java
Source0: http://www.apache.org/dist/velocity/engine/1.5/velocity-1.5.tar.bz2 Source0: http://www.apache.org/dist/velocity/engine/1.7/%{name}-%{version}.tar.gz
Source1: http://repo1.maven.org/maven2/velocity/velocity/1.5/velocity-1.5.pom Source1: http://repo1.maven.org/maven2/velocity/velocity/1.7/%{name}-%{version}.pom
Patch0: velocity-build_xml.patch Patch0: velocity-build_xml.patch
Url: http://velocity.apache.org/ Url: http://velocity.apache.org/
Requires: avalon-logkit Requires: avalon-logkit
@ -44,8 +44,8 @@ BuildRequires: avalon-logkit
BuildRequires: classworlds BuildRequires: classworlds
BuildRequires: commons-collections BuildRequires: commons-collections
BuildRequires: commons-lang BuildRequires: commons-lang
BuildRequires: commons-logging
BuildRequires: hsqldb BuildRequires: hsqldb
BuildRequires: java-devel >= 1.6.0
BuildRequires: javapackages-tools BuildRequires: javapackages-tools
BuildRequires: jdom >= 1.0-1 BuildRequires: jdom >= 1.0-1
BuildRequires: junit BuildRequires: junit
@ -187,6 +187,7 @@ ln -sf $(build-classpath antlr)
ln -sf $(build-classpath avalon-logkit) ln -sf $(build-classpath avalon-logkit)
ln -sf $(build-classpath commons-collections) ln -sf $(build-classpath commons-collections)
ln -sf $(build-classpath commons-lang) ln -sf $(build-classpath commons-lang)
ln -sf $(build-classpath commons-logging)
ln -sf $(build-classpath jdom) ln -sf $(build-classpath jdom)
ln -sf $(build-classpath log4j) ln -sf $(build-classpath log4j)
ln -sf $(build-classpath oro) ln -sf $(build-classpath oro)
@ -220,7 +221,7 @@ cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
rm -rf docs/api rm -rf docs/api
# data # data
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name} 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} %fdupes -s %{buildroot}
%files %files