gil pushed to restlet-jse (master). "update to 2.3.1 (rhbz#1199843)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sat Apr 4 18:28:44 UTC 2015
>From bce1fdf8d7de4d3283d92baa08c73b908383e93d Mon Sep 17 00:00:00 2001
From: gil <puntogil at libero.it>
Date: Sat, 4 Apr 2015 20:28:27 +0200
Subject: update to 2.3.1 (rhbz#1199843)
diff --git a/.gitignore b/.gitignore
index a64dc29..2126da2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/restlet-jse-2.1.4-clean.tar.xz
+/restlet-jse-2.3.1-clean.tar.xz
diff --git a/org.restlet.parent-2.1.4.pom b/org.restlet.parent-2.1.4.pom
deleted file mode 100644
index 8e4ebc8..0000000
--- a/org.restlet.parent-2.1.4.pom
+++ /dev/null
@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
-
- <groupId>org.restlet.jee</groupId>
- <artifactId>org.restlet.parent</artifactId>
- <version>2.1.4</version>
- <packaging>pom</packaging>
-
- <name>Restlet project</name>
- <description>Lightweight REST framework</description>
- <url>http://www.restlet.org</url>
- <inceptionYear>2005</inceptionYear>
-
- <scm>
- <url>http://restlet.tigris.org/svn/restlet/modules/</url>
- </scm>
-
- <repositories>
- <repository>
- <id>maven-central</id>
- <name>Central Maven repository</name>
- <url>http://repo1.maven.org/maven2/</url>
- </repository>
- <repository>
- <id>maven2-java</id>
- <name>Java.net repository</name>
- <url>http://download.java.net/maven/2</url>
- </repository>
- <repository>
- <id>maven1-java</id>
- <url>http://download.java.net/maven/1</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <id>maven-restlet</id>
- <name>Restlet repository</name>
- <url>http://maven.restlet.org</url>
- </repository>
- <repository>
- <id>maven-db4o</id>
- <name>Db4o repository</name>
- <url>https://source.db4o.com/maven/</url>
- </repository>
- </repositories>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <lib-rome-version>1.0</lib-rome-version>
- <lib-jdom-version>1.1</lib-jdom-version>
- <lib-servlet-version>2.5</lib-servlet-version>
- <lib-collections-version>3.2.1</lib-collections-version>
- <lib-lang-version>2.6</lib-lang-version>
- <lib-velocity-version>1.6.3</lib-velocity-version>
- <lib-jettison-version>1.3</lib-jettison-version>
- <lib-stax-version>1.0-2</lib-stax-version>
- <lib-xstream-version>1.4.1</lib-xstream-version>
- <lib-freemarker-version>2.3.19</lib-freemarker-version>
- <lib-dbcp-version>1.3</lib-dbcp-version>
- <lib-pool-version>1.5.6</lib-pool-version>
- <lib-openid4java-version>0.9.6</lib-openid4java-version>
- <lib-httpclient-version>4.1.1</lib-httpclient-version>
- <lib-nekohtml-version>1.9.14</lib-nekohtml-version>
- <lib-codec-version>1.5</lib-codec-version>
- <lib-httpcore-version>4.1</lib-httpcore-version>
- <lib-httpmime-version>4.1.1</lib-httpmime-version>
- <lib-jcip-annotations-version>1.0</lib-jcip-annotations-version>
- <lib-logging-version>1.1.1</lib-logging-version>
- <lib-mime4j-version>0.6</lib-mime4j-version>
- <lib-json-version>2.0</lib-json-version>
- <lib-activation-version>1.1.1</lib-activation-version>
- <lib-fileupload-version>1.2.2</lib-fileupload-version>
- <lib-javamail-version>1.4.2</lib-javamail-version>
- <lib-jaxb-api-version>2.1</lib-jaxb-api-version>
- <lib-jaxb-ri-version>2.1.12</lib-jaxb-ri-version>
- <lib-jaxrs-version>1.0</lib-jaxrs-version>
- <lib-cglib-version>2.2</lib-cglib-version>
- <lib-spring-asm-version>3.0.1.RELEASE</lib-spring-asm-version>
- <lib-spring-beans-version>3.0.1.RELEASE</lib-spring-beans-version>
- <lib-spring-context-version>3.0.1.RELEASE</lib-spring-context-version>
- <lib-spring-core-version>3.0.1.RELEASE</lib-spring-core-version>
- <lib-spring-expression-version>3.0.1.RELEASE</lib-spring-expression-version>
- <lib-spring-web-version>3.0.1.RELEASE</lib-spring-web-version>
- <lib-spring-webmvc-version>3.0.1.RELEASE</lib-spring-webmvc-version>
- <lib-jsslutils-version>1.0.5</lib-jsslutils-version>
- <lib-jibx-version>1.2.2</lib-jibx-version>
- <lib-emf-common-version>2.6.0.v20100614-1136</lib-emf-common-version>
- <lib-emf-ecore-version>2.6.0.v20100614-1136</lib-emf-ecore-version>
- <lib-emf-ecore-xmi-version>2.5.0.v20100521-1846</lib-emf-ecore-xmi-version>
- <lib-sdc-version>1.3.rc2</lib-sdc-version>
- <lib-guice-version>2.0</lib-guice-version>
- <lib-gdata-version>1.0</lib-gdata-version>
- <lib-gdata-client-version>1.0</lib-gdata-client-version>
- <lib-protobuf-version>2.2.0</lib-protobuf-version>
- <lib-gcollections-version>1.0</lib-gcollections-version>
- <lib-log4j-version>1.2.16</lib-log4j-version>
- <lib-io-version>2.0.1</lib-io-version>
- <lib-lucene-version>2.9.2</lib-lucene-version>
- <lib-solr-version>1.4.0</lib-solr-version>
- <lib-solr-common-version>1.4.0</lib-solr-common-version>
- <lib-tika-version>0.6</lib-tika-version>
- <lib-tika-parsers-version>0.6</lib-tika-parsers-version>
- <lib-slf4j-version>1.6.2</lib-slf4j-version>
- <lib-jackson-core-version>1.9.8</lib-jackson-core-version>
- <lib-jackson-mapper-version>1.9.8</lib-jackson-mapper-version>
- <lib-db4o-version>7.12.132</lib-db4o-version>
- <lib-db4o-instrumentation-version>7.12.132</lib-db4o-instrumentation-version>
- <lib-db4o-nativequery-version>7.12.132</lib-db4o-nativequery-version>
- <lib-db4o-optional-version>7.12.132</lib-db4o-optional-version>
- <lib-db4o-ta-version>7.12.132</lib-db4o-ta-version>
- <lib-db4o-tools-version>7.12.132</lib-db4o-tools-version>
- <lib-bloat-version>1.0</lib-bloat-version>
- <lib-junit-version>4.8.1</lib-junit-version>
- <lib-testng-version>6.7</lib-testng-version>
- <lib-gwt-server-version>2.3.0</lib-gwt-server-version>
- <lib-oauth-version>20090617</lib-oauth-version>
- </properties>
-
- <modules>
- <module>org.restlet.ext.rome</module>
- <module>org.restlet.ext.xdb</module>
- <module>org.restlet.ext.velocity</module>
- <module>org.restlet.ext.xstream</module>
- <module>org.restlet.ext.odata</module>
- <module>org.restlet.ext.jdbc</module>
- <module>org.restlet.ext.openid</module>
- <module>org.restlet.ext.httpclient</module>
- <module>org.restlet.ext.net</module>
- <module>org.restlet.ext.jaas</module>
- <module>org.restlet.ext.rdf</module>
- <module>org.restlet.ext.crypto</module>
- <module>org.restlet.ext.json</module>
- <module>org.restlet.ext.jaxrs</module>
- <module>org.restlet.ext.html</module>
- <module>org.restlet.ext.spring</module>
- <module>org.restlet.ext.servlet</module>
- <module>org.restlet.ext.wadl</module>
- <module>org.restlet.ext.ssl</module>
- <module>org.restlet.ext.jibx</module>
- <module>org.restlet.ext.fileupload</module>
- <module>org.restlet.ext.xml</module>
- <module>org.restlet.ext.emf</module>
- <module>org.restlet.ext.freemarker</module>
- <module>org.restlet.ext.sdc</module>
- <module>org.restlet.ext.lucene</module>
- <module>org.restlet.ext.javamail</module>
- <module>org.restlet.ext.slf4j</module>
- <module>org.restlet.ext.jackson</module>
- <module>org.restlet.example</module>
- <module>org.restlet.ext.atom</module>
- <module>org.restlet.ext.gwt</module>
- <module>org.restlet.ext.oauth</module>
- <module>org.restlet.test</module>
- <module>org.restlet.ext.jaxb</module>
- <module>org.restlet.ext.sip</module>
- <module>org.restlet</module>
- </modules>
-
- <licenses>
- <license>
- <name>Apache 2.0 license</name>
- <url>http://www.opensource.org/licenses/apache-2.0</url>
- </license>
- <license>
- <name>LGPL 3.0 license</name>
- <url>http://www.opensource.org/licenses/lgpl-3.0</url>
- </license>
- <license>
- <name>LGPL 2.1 license</name>
- <url>http://www.opensource.org/licenses/lgpl-2.1</url>
- </license>
- <license>
- <name>CDDL 1.0 license</name>
- <url>http://www.opensource.org/licenses/cddl1</url>
- </license>
- <license>
- <name>EPL 1.0 license</name>
- <url>http://www.opensource.org/licenses/eclipse-1.0</url>
- </license>
- </licenses>
-
- <build>
- <sourceDirectory>${basedir}/src</sourceDirectory>
- <resources>
- <resource>
- <filtering>false</filtering>
- <directory>${basedir}/src</directory>
- <includes>
- <include>**/*</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- <exclude>**/package.html</exclude>
- </excludes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
diff --git a/org.restlet.parent-2.3.1.pom b/org.restlet.parent-2.3.1.pom
new file mode 100644
index 0000000..8fb9170
--- /dev/null
+++ b/org.restlet.parent-2.3.1.pom
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+
+ <groupId>org.restlet.jee</groupId>
+ <artifactId>org.restlet.parent</artifactId>
+ <version>2.3.1</version>
+ <packaging>pom</packaging>
+
+ <name>Restlet Framework</name>
+ <description>Lightweight RESTful web API framework</description>
+ <url>http://restlet.org</url>
+ <inceptionYear>2005</inceptionYear>
+
+ <scm>
+ <url>https://github.com/restlet/restlet-framework-java</url>
+ </scm>
+
+ <repositories>
+ <repository>
+ <id>maven-central</id>
+ <name>Central Maven repository</name>
+ <url>http://repo1.maven.org/maven2/</url>
+ </repository>
+ <repository>
+ <id>maven2-java</id>
+ <name>Java.net repository</name>
+ <url>http://download.java.net/maven/2</url>
+ </repository>
+ <repository>
+ <id>maven1-java</id>
+ <url>http://download.java.net/maven/1</url>
+ <layout>legacy</layout>
+ </repository>
+ <repository>
+ <id>maven-restlet</id>
+ <name>Restlet repository</name>
+ <url>http://maven.restlet.org</url>
+ </repository>
+ </repositories>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <lib-guice-version>3.0</lib-guice-version>
+ <lib-javax.inject-version>1</lib-javax.inject-version>
+ <lib-aopalliance-version>1.0</lib-aopalliance-version>
+ <lib-codec-version>1.5</lib-codec-version>
+ <lib-httpclient-version>4.3.2</lib-httpclient-version>
+ <lib-httpcore-version>4.3.1</lib-httpcore-version>
+ <lib-httpmime-version>4.3</lib-httpmime-version>
+ <lib-jcip-annotations-version>1.0</lib-jcip-annotations-version>
+ <lib-logging-version>1.1.3</lib-logging-version>
+ <lib-mime4j-version>0.7.2</lib-mime4j-version>
+ <lib-servlet-version>3.1.0</lib-servlet-version>
+ <lib-fileupload-version>1.3</lib-fileupload-version>
+ <lib-openid4java-version>0.9.6</lib-openid4java-version>
+ <lib-nekohtml-version>1.9.19</lib-nekohtml-version>
+ <lib-json-version>2.0</lib-json-version>
+ <lib-freemarker-version>2.3.20</lib-freemarker-version>
+ <lib-emf-common-version>2.6.0.v20100614-1136</lib-emf-common-version>
+ <lib-emf-ecore-version>2.6.0.v20100614-1136</lib-emf-ecore-version>
+ <lib-emf-ecore-xmi-version>2.5.0.v20100521-1846</lib-emf-ecore-xmi-version>
+ <lib-scala-library-version>2.9.1</lib-scala-library-version>
+ <lib-scalap-version>2.9.1</lib-scalap-version>
+ <lib-slf4j-version>1.7.2</lib-slf4j-version>
+ <lib-swagger-models-version>1.5.0-SNAPSHOT</lib-swagger-models-version>
+ <lib-jaxrs-version>2.0</lib-jaxrs-version>
+ <lib-jackson-annotations-version>2.4.4</lib-jackson-annotations-version>
+ <lib-jackson-core-version>2.4.4</lib-jackson-core-version>
+ <lib-jackson-csv-version>2.4.4</lib-jackson-csv-version>
+ <lib-jackson-databind-version>2.4.4</lib-jackson-databind-version>
+ <lib-jackson-jaxb-version>2.4.4</lib-jackson-jaxb-version>
+ <lib-jackson-jsonschema-version>2.4.4</lib-jackson-jsonschema-version>
+ <lib-jackson-smile-version>2.4.4</lib-jackson-smile-version>
+ <lib-jackson-xml-version>2.4.4</lib-jackson-xml-version>
+ <lib-jackson-yaml-version>2.4.4</lib-jackson-yaml-version>
+ <lib-snakeyaml-version>1.13</lib-snakeyaml-version>
+ <lib-stax2-version>3.1.4</lib-stax2-version>
+ <lib-woodstock-core-version>4.3.0</lib-woodstock-core-version>
+ <lib-cglib-version>2.2</lib-cglib-version>
+ <lib-spring-beans-version>3.2.6.RELEASE</lib-spring-beans-version>
+ <lib-spring-context-version>3.2.6.RELEASE</lib-spring-context-version>
+ <lib-spring-core-version>3.2.6.RELEASE</lib-spring-core-version>
+ <lib-spring-expression-version>3.2.6.RELEASE</lib-spring-expression-version>
+ <lib-spring-web-version>3.2.6.RELEASE</lib-spring-web-version>
+ <lib-spring-webmvc-version>3.2.6.RELEASE</lib-spring-webmvc-version>
+ <lib-dbcp-version>1.3</lib-dbcp-version>
+ <lib-pool-version>1.5.6</lib-pool-version>
+ <lib-thymeleaf-version>2.1.2.RELEASE</lib-thymeleaf-version>
+ <lib-ognl-version>3.0.8</lib-ognl-version>
+ <lib-javassist-version>3.18.1-GA</lib-javassist-version>
+ <lib-junit-version>4.11</lib-junit-version>
+ <lib-mongodb-version>2.11.3</lib-mongodb-version>
+ <lib-rome-version>1.0</lib-rome-version>
+ <lib-testng-version>6.8.7</lib-testng-version>
+ <lib-gwt-server-version>2.3.0</lib-gwt-server-version>
+ <lib-javamail-version>1.4.2</lib-javamail-version>
+ <lib-sdc-version>1.3.rc2</lib-sdc-version>
+ <lib-gdata-version>1.0</lib-gdata-version>
+ <lib-gdata-client-version>1.0</lib-gdata-client-version>
+ <lib-protobuf-version>2.2.0</lib-protobuf-version>
+ <lib-guava-version>16.0.1</lib-guava-version>
+ <lib-log4j-version>1.2.17</lib-log4j-version>
+ <lib-xstream-version>1.4.7</lib-xstream-version>
+ <lib-jaxb-ri-version>2.1.12</lib-jaxb-ri-version>
+ <lib-lang-version>2.6</lib-lang-version>
+ <lib-jettison-version>1.3.5</lib-jettison-version>
+ <lib-jibx-version>1.2.5</lib-jibx-version>
+ <lib-jdom-version>1.1</lib-jdom-version>
+ <lib-collections-version>3.2.1</lib-collections-version>
+ <lib-velocity-version>1.7</lib-velocity-version>
+ <lib-jsslutils-version>1.0.5</lib-jsslutils-version>
+ <lib-io-version>2.0.1</lib-io-version>
+ <lib-lucene-version>4.6.0</lib-lucene-version>
+ <lib-solr-version>4.6.0</lib-solr-version>
+ <lib-solr-common-version>4.6.0</lib-solr-common-version>
+ <lib-tika-version>1.4</lib-tika-version>
+ <lib-tika-parsers-version>1.4</lib-tika-parsers-version>
+ <lib-raml-version>0.8.7</lib-raml-version>
+ <lib-swagger-annotations-version>1.3.10</lib-swagger-annotations-version>
+ <lib-gson-version>2.3.1</lib-gson-version>
+ <lib-joda-time-version>2.3</lib-joda-time-version>
+ <lib-hamcrest-version>1.3</lib-hamcrest-version>
+ <lib-swagger-core-version>1.5.0-SNAPSHOT</lib-swagger-core-version>
+ <lib-osgi-version>4.0.0</lib-osgi-version>
+ <lib-osgi-version>4.0.0</lib-osgi-version>
+ <lib-e4-contexts-version>0.12.RC1</lib-e4-contexts-version>
+ <lib-e4-di-version>0.12.RC1</lib-e4-di-version>
+ <lib-oauth-version>20100527</lib-oauth-version>
+ </properties>
+
+ <modules>
+ <module>org.restlet.ext.rdf</module>
+ <module>org.restlet.ext.guice</module>
+ <module>org.restlet.ext.jaas</module>
+ <module>org.restlet.ext.httpclient</module>
+ <module>org.restlet.ext.fileupload</module>
+ <module>org.restlet.ext.openid</module>
+ <module>org.restlet.ext.freemarker</module>
+ <module>org.restlet.ext.json</module>
+ <module>org.restlet</module>
+ <module>org.restlet.ext.emf</module>
+ <module>org.restlet.ext.odata</module>
+ <module>org.restlet.ext.swagger</module>
+ <module>org.restlet.ext.spring</module>
+ <module>org.restlet.ext.jdbc</module>
+ <module>org.restlet.ext.html</module>
+ <module>org.restlet.ext.thymeleaf</module>
+ <module>org.restlet.ext.wadl</module>
+ <module>org.restlet.example</module>
+ <module>org.restlet.ext.gwt</module>
+ <module>org.restlet.ext.xml</module>
+ <module>org.restlet.ext.javamail</module>
+ <module>org.restlet.ext.nio</module>
+ <module>org.restlet.ext.sdc</module>
+ <module>org.restlet.ext.xdb</module>
+ <module>org.restlet.ext.jaxrs</module>
+ <module>org.restlet.ext.jackson</module>
+ <module>org.restlet.ext.xstream</module>
+ <module>org.restlet.ext.jibx</module>
+ <module>org.restlet.ext.rome</module>
+ <module>org.restlet.ext.atom</module>
+ <module>org.restlet.ext.velocity</module>
+ <module>org.restlet.ext.jsslutils</module>
+ <module>org.restlet.ext.lucene</module>
+ <module>org.restlet.ext.apispark</module>
+ <module>org.restlet.ext.slf4j</module>
+ <module>org.restlet.ext.jaxb</module>
+ <module>org.restlet.ext.servlet</module>
+ <module>org.restlet.ext.gson</module>
+ <module>org.restlet.ext.sip</module>
+ <module>org.restlet.ext.raml</module>
+ <module>org.restlet.test</module>
+ <module>org.restlet.ext.e4</module>
+ <module>org.restlet.ext.crypto</module>
+ <module>org.restlet.ext.oauth</module>
+ </modules>
+
+ <licenses>
+ <license>
+ <name>Apache 2.0 license</name>
+ <url>http://www.opensource.org/licenses/apache-2.0</url>
+ </license>
+ <license>
+ <name>LGPL 3.0 license</name>
+ <url>http://www.opensource.org/licenses/lgpl-3.0</url>
+ </license>
+ <license>
+ <name>LGPL 2.1 license</name>
+ <url>http://www.opensource.org/licenses/lgpl-2.1</url>
+ </license>
+ <license>
+ <name>CDDL 1.0 license</name>
+ <url>http://www.opensource.org/licenses/cddl1</url>
+ </license>
+ <license>
+ <name>EPL 1.0 license</name>
+ <url>http://www.opensource.org/licenses/eclipse-1.0</url>
+ </license>
+ </licenses>
+
+ <build>
+ <sourceDirectory>${basedir}/src</sourceDirectory>
+ <resources>
+ <resource>
+ <filtering>false</filtering>
+ <directory>${basedir}/src</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ <exclude>**/package.html</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/restlet-jse-create-tarball.sh b/restlet-jse-create-tarball.sh
index 00f7eb6..444f54e 100644
--- a/restlet-jse-create-tarball.sh
+++ b/restlet-jse-create-tarball.sh
@@ -11,7 +11,7 @@ MAJOR_VERSION=$(echo ${VERSION} | cut -d. -f 1-2)
wget http://restlet.org/download/${MAJOR_VERSION}/${NAME}-${VERSION}.zip
unzip -qq ${NAME}-${VERSION}.zip
-rm ${NAME}-${VERSION}.zip
+#rm ${NAME}-${VERSION}.zip
# Remove unused files
rm -Rf ./${NAME}-${VERSION}/bin/conf
rm -Rf ./${NAME}-${VERSION}/bin/linux/wrapper
@@ -128,4 +128,4 @@ cd ..
find ./${NAME}-${VERSION} -name "*.jar" -delete
find ./${NAME}-${VERSION} -name "MANIFEST.MF" -delete
-tar cJf ${NAME}-${VERSION}-clean.tar.xz ./${NAME}-${VERSION}
\ No newline at end of file
+#tar cJf ${NAME}-${VERSION}-clean.tar.xz ./${NAME}-${VERSION}
\ No newline at end of file
diff --git a/restlet-jse.spec b/restlet-jse.spec
index e7a6474..6b5d126 100644
--- a/restlet-jse.spec
+++ b/restlet-jse.spec
@@ -1,11 +1,11 @@
Name: restlet-jse
-Version: 2.1.4
-Release: 5%{?dist}
+Version: 2.3.1
+Release: 1%{?dist}
Summary: Open Source Lightweight REST framework
# All source files are under multiple license
License: (ASL 2.0 or CDDL or EPL or LGPLv2+ or LGPLv3+)
URL: http://restlet.org/
-# https://github.com/restlet/restlet-framework-java 2.1.4 unreleased
+# https://github.com/restlet/restlet-framework-java
# Source archive from http://restlet.org/download/ don't contains pom files and some module requested by other projects
# Download not available pom files and source (org.restlet.ext.servlet,org.restlet.ext.xdb) from http://maven.restlet.org/org/restlet/jee
# org.restlet.ext.servlet is required by Apache Solr 4.x
@@ -18,29 +18,44 @@ Source1: http://maven.restlet.org/org/restlet/jee/org.restlet.parent/%{ver
Source2: %{name}-create-tarball.sh
+BuildRequires: maven-local
+BuildRequires: mvn(aopalliance:aopalliance)
BuildRequires: mvn(cglib:cglib)
+BuildRequires: mvn(com.google.code.gson:gson)
+BuildRequires: mvn(com.google.inject:guice)
BuildRequires: mvn(com.sun.xml.bind:jaxb-impl)
-BuildRequires: mvn(com.thoughtworks.xstream:xstream)
+BuildRequires: mvn(com.thoughtworks.xstream:xstream) >= 1.4.7
+BuildRequires: mvn(org.apache.james:james-project:pom:)
+BuildRequires: mvn(commons-codec:commons-codec)
+BuildRequires: mvn(commons-collections:commons-collections)
BuildRequires: mvn(commons-dbcp:commons-dbcp)
BuildRequires: mvn(commons-fileupload:commons-fileupload)
BuildRequires: mvn(commons-pool:commons-pool)
BuildRequires: mvn(commons-lang:commons-lang)
BuildRequires: mvn(commons-logging:commons-logging)
+BuildRequires: mvn(javax.inject:javax.inject)
BuildRequires: mvn(javax.mail:mail)
-BuildRequires: mvn(javax.servlet:servlet-api)
-BuildRequires: mvn(javax.xml.bind:jaxb-api)
-BuildRequires: mvn(javax.xml.stream:stax-api)
+BuildRequires: mvn(javax.servlet:javax.servlet-api)
+BuildRequires: mvn(joda-time:joda-time)
BuildRequires: mvn(junit:junit)
BuildRequires: mvn(net.jcip:jcip-annotations)
BuildRequires: mvn(org.apache.httpcomponents:httpclient)
BuildRequires: mvn(org.apache.httpcomponents:httpcore)
BuildRequires: mvn(org.apache.httpcomponents:httpmime)
BuildRequires: mvn(org.apache.james:apache-mime4j-core)
-BuildRequires: mvn(org.apache.james:james-project:pom:)
BuildRequires: mvn(org.apache.velocity:velocity)
-BuildRequires: mvn(org.codehaus.jackson:jackson-core-asl)
-BuildRequires: mvn(org.codehaus.jackson:jackson-mapper-asl)
+BuildRequires: mvn(org.codehaus.woodstox:stax2-api)
+BuildRequires: mvn(org.codehaus.woodstox:woodstox-core-asl)
BuildRequires: mvn(org.codehaus.jettison:jettison)
+BuildRequires: mvn(com.fasterxml.jackson.core:jackson-annotations)
+BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core)
+BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind)
+BuildRequires: mvn(com.fasterxml.jackson.dataformat:jackson-dataformat-csv)
+BuildRequires: mvn(com.fasterxml.jackson.dataformat:jackson-dataformat-smile)
+BuildRequires: mvn(com.fasterxml.jackson.dataformat:jackson-dataformat-xml)
+BuildRequires: mvn(com.fasterxml.jackson.dataformat:jackson-dataformat-yaml)
+BuildRequires: mvn(com.fasterxml.jackson.module:jackson-module-jaxb-annotations)
+BuildRequires: mvn(com.fasterxml.jackson.module:jackson-module-jsonSchema)
BuildRequires: mvn(org.freemarker:freemarker)
BuildRequires: mvn(org.jdom:jdom)
BuildRequires: mvn(org.jibx:jibx-run)
@@ -52,13 +67,15 @@ BuildRequires: mvn(org.springframework:spring-core)
BuildRequires: mvn(org.springframework:spring-expression)
BuildRequires: mvn(org.springframework:spring-web)
BuildRequires: mvn(org.springframework:spring-webmvc)
+BuildRequires: mvn(org.thymeleaf:thymeleaf)
+BuildRequires: mvn(org.yaml:snakeyaml)
BuildRequires: mvn(rome:rome)
-BuildRequires: maven-local
-
BuildArch: noarch
+
# JSON, A GWT port of the client-side
-#library is also available.
+# library is also available.
+
%description
Restlet is a lightweight, comprehensive, REST framework for the
Java platform. Restlet is suitable for both server and client
@@ -86,22 +103,31 @@ cp -p %{SOURCE1} pom.xml
%pom_disable_module org.restlet.ext.oauth
# Require com.google.gwt:gwt-servlet:2.3.0
%pom_disable_module org.restlet.ext.gwt
-# Require lucene-core 2.9.2 org.apache.solr:solr-core,solr-solrj 1.4.0 org.apache.tika:tika-core,tika-parsers 0.6
+# Require lucene-core 4.6.0 org.apache.solr:solr-core,solr-solrj 4.6.0 org.apache.tika:tika-core,tika-parsers 1.4
%pom_disable_module org.restlet.ext.lucene
# Require org.eclipse.emf
%pom_disable_module org.restlet.ext.emf
%pom_disable_module org.restlet.ext.sdc
%pom_disable_module org.restlet.test
+# javax.ws.rs:javax.ws.rs-api:2.0, org.raml:raml-parser:0.8.7, com.wordnik:swagger-annotations:1.3.10, org.restlet.jee:org.restlet.lib.swagger-models:jar:1.5.0-SNAPSHOT
+%pom_disable_module org.restlet.ext.apispark
+%pom_disable_module org.restlet.ext.swagger
+# org.raml:raml-parser:0.8.7, org.restlet.jee:org.restlet.ext.apispark:2.3.1
+%pom_disable_module org.restlet.ext.raml
+# org.restlet.jee:org.restlet.lib.org.eclipse.e4.core.contexts:0.12.RC1, org.restlet.jee:org.restlet.lib.org.eclipse.e4.core.di:0.12.RC1:
+%pom_disable_module org.restlet.ext.e4
-# Adapt for newer mime4j
-%pom_remove_dep org.apache.james:apache-mime4j org.restlet.ext.httpclient
-%pom_add_dep org.apache.james:apache-mime4j-core:0.7.2 org.restlet.ext.httpclient
-# Use system jvm apis
-%pom_remove_dep javax.activation:activation org.restlet.ext.javamail
-# Remove unavailable dep
-%pom_remove_dep :spring-asm org.restlet.ext.spring
# Fix cglib aId
-%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'cglib' ]/pom:artifactId" cglib org.restlet.ext.spring
+%pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId = 'cglib' ]/pom:artifactId" cglib org.restlet.ext.spring
+
+for p in org.restlet; do
+%pom_add_plugin org.apache.maven.plugins:maven-compiler-plugin:3.0 ${p} '
+<configuration>
+ <source>1.7</source>
+ <target>1.7</target>
+ <encoding>UTF-8</encoding>
+</configuration>'
+done
sed -i 's/\r//' changes.txt readme.txt
@@ -123,6 +149,9 @@ sed -i 's/\r//' changes.txt readme.txt
%license copyright.txt license.txt trademarks.txt
%changelog
+* Sun Mar 08 2015 gil cattaneo <puntogil at libero.it> 2.3.1-1
+- update to 2.3.1
+
* Wed Feb 11 2015 gil cattaneo <puntogil at libero.it> 2.1.4-5
- introduce license macro
diff --git a/sources b/sources
index c5e05cb..4f6a26d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f415f2db5bed3db465bd17e4c72630d2 restlet-jse-2.1.4-clean.tar.xz
+b6baf8302803bbcc670375af210b59f1 restlet-jse-2.3.1-clean.tar.xz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/restlet-jse.git/commit/?h=master&id=bce1fdf8d7de4d3283d92baa08c73b908383e93d
More information about the scm-commits
mailing list