gil pushed to springframework-data-commons (f22). "Initial import (#1178162)."
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue Jun 2 15:31:07 UTC 2015
From c29f418cfbd2117ac33558352eeebe0bd6891399 Mon Sep 17 00:00:00 2001
From: gil <puntogil at libero.it>
Date: Tue, 2 Jun 2015 17:12:40 +0200
Subject: Initial import (#1178162).
diff --git a/.gitignore b/.gitignore
index e69de29..927ede0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/1.8.4.RELEASE.tar.gz
diff --git a/sources b/sources
index e69de29..f7ca601 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+4cd0f26f2fb5ad27c5a08e44c5d6e06f 1.8.4.RELEASE.tar.gz
diff --git a/springframework-data-commons-1.8.4-querydsl4.patch b/springframework-data-commons-1.8.4-querydsl4.patch
new file mode 100644
index 0000000..7741aca
--- /dev/null
+++ b/springframework-data-commons-1.8.4-querydsl4.patch
@@ -0,0 +1,156 @@
+diff -Nru spring-data-commons-1.8.4.RELEASE/pom.xml spring-data-commons-1.8.4.RELEASE.querydsl/pom.xml
+--- spring-data-commons-1.8.4.RELEASE/pom.xml 2014-08-27 11:51:44.000000000 +0200
++++ spring-data-commons-1.8.4.RELEASE.querydsl/pom.xml 2015-06-02 07:21:30.796451523 +0200
+@@ -91,16 +91,16 @@
+ </dependency>
+
+ <dependency>
+- <groupId>com.mysema.querydsl</groupId>
++ <groupId>com.querydsl</groupId>
+ <artifactId>querydsl-core</artifactId>
+- <version>${querydsl}</version>
++ <version>4.0.0</version>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+- <groupId>com.mysema.querydsl</groupId>
++ <groupId>com.querydsl</groupId>
+ <artifactId>querydsl-apt</artifactId>
+- <version>${querydsl}</version>
++ <version>4.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+@@ -199,7 +199,7 @@
+ </goals>
+ <configuration>
+ <outputDirectory>target/generated-sources/test-annotations</outputDirectory>
+- <processor>com.mysema.query.apt.QuerydslAnnotationProcessor</processor>
++ <processor>com.querydsl.apt.QuerydslAnnotationProcessor</processor>
+ </configuration>
+ </execution>
+ </executions>
+diff -Nru spring-data-commons-1.8.4.RELEASE/src/main/java/org/springframework/data/querydsl/EntityPathResolver.java spring-data-commons-1.8.4.RELEASE.querydsl/src/main/java/org/springframework/data/querydsl/EntityPathResolver.java
+--- spring-data-commons-1.8.4.RELEASE/src/main/java/org/springframework/data/querydsl/EntityPathResolver.java 2014-08-27 11:51:44.000000000 +0200
++++ spring-data-commons-1.8.4.RELEASE.querydsl/src/main/java/org/springframework/data/querydsl/EntityPathResolver.java 2015-05-31 21:27:25.002784388 +0200
+@@ -15,7 +15,7 @@
+ */
+ package org.springframework.data.querydsl;
+
+-import com.mysema.query.types.EntityPath;
++import com.querydsl.core.types.EntityPath;
+
+ /**
+ * Strategy interface to abstract the ways to translate an plain domain class into a {@link EntityPath}.
+diff -Nru spring-data-commons-1.8.4.RELEASE/src/main/java/org/springframework/data/querydsl/QPageRequest.java spring-data-commons-1.8.4.RELEASE.querydsl/src/main/java/org/springframework/data/querydsl/QPageRequest.java
+--- spring-data-commons-1.8.4.RELEASE/src/main/java/org/springframework/data/querydsl/QPageRequest.java 2014-08-27 11:51:44.000000000 +0200
++++ spring-data-commons-1.8.4.RELEASE.querydsl/src/main/java/org/springframework/data/querydsl/QPageRequest.java 2015-05-31 21:27:25.002784388 +0200
+@@ -18,7 +18,7 @@
+ import org.springframework.data.domain.AbstractPageRequest;
+ import org.springframework.data.domain.Pageable;
+
+-import com.mysema.query.types.OrderSpecifier;
++import com.querydsl.core.types.OrderSpecifier;
+
+ /**
+ * Basic Java Bean implementation of {@link Pageable} with support for QueryDSL.
+diff -Nru spring-data-commons-1.8.4.RELEASE/src/main/java/org/springframework/data/querydsl/QSort.java spring-data-commons-1.8.4.RELEASE.querydsl/src/main/java/org/springframework/data/querydsl/QSort.java
+--- spring-data-commons-1.8.4.RELEASE/src/main/java/org/springframework/data/querydsl/QSort.java 2014-08-27 11:51:44.000000000 +0200
++++ spring-data-commons-1.8.4.RELEASE.querydsl/src/main/java/org/springframework/data/querydsl/QSort.java 2015-05-31 21:27:25.003784337 +0200
+@@ -23,9 +23,9 @@
+ import org.springframework.data.domain.Sort;
+ import org.springframework.util.Assert;
+
+-import com.mysema.query.types.Expression;
+-import com.mysema.query.types.OrderSpecifier;
+-import com.mysema.query.types.Path;
++import com.querydsl.core.types.Expression;
++import com.querydsl.core.types.OrderSpecifier;
++import com.querydsl.core.types.Path;
+
+ /**
+ * Sort option for queries that wraps a querydsl {@link OrderSpecifier}.
+@@ -87,7 +87,7 @@
+ Assert.notNull(orderSpecifier, "Order specifier must not be null!");
+
+ Expression<?> target = orderSpecifier.getTarget();
+- Object targetElement = target instanceof Path ? ((com.mysema.query.types.Path<?>) target).getMetadata()
++ Object targetElement = target instanceof Path ? ((com.querydsl.core.types.Path<?>) target).getMetadata()
+ .getElement() : target;
+
+ Assert.notNull(targetElement, "Target element must not be null!");
+diff -Nru spring-data-commons-1.8.4.RELEASE/src/main/java/org/springframework/data/querydsl/QueryDslPredicateExecutor.java spring-data-commons-1.8.4.RELEASE.querydsl/src/main/java/org/springframework/data/querydsl/QueryDslPredicateExecutor.java
+--- spring-data-commons-1.8.4.RELEASE/src/main/java/org/springframework/data/querydsl/QueryDslPredicateExecutor.java 2014-08-27 11:51:44.000000000 +0200
++++ spring-data-commons-1.8.4.RELEASE.querydsl/src/main/java/org/springframework/data/querydsl/QueryDslPredicateExecutor.java 2015-05-31 21:27:25.002784388 +0200
+@@ -18,8 +18,8 @@
+ import org.springframework.data.domain.Page;
+ import org.springframework.data.domain.Pageable;
+
+-import com.mysema.query.types.OrderSpecifier;
+-import com.mysema.query.types.Predicate;
++import com.querydsl.core.types.OrderSpecifier;
++import com.querydsl.core.types.Predicate;
+
+ /**
+ * Interface to allow execution of QueryDsl {@link Predicate} instances.
+diff -Nru spring-data-commons-1.8.4.RELEASE/src/main/java/org/springframework/data/querydsl/QueryDslUtils.java spring-data-commons-1.8.4.RELEASE.querydsl/src/main/java/org/springframework/data/querydsl/QueryDslUtils.java
+--- spring-data-commons-1.8.4.RELEASE/src/main/java/org/springframework/data/querydsl/QueryDslUtils.java 2014-08-27 11:51:44.000000000 +0200
++++ spring-data-commons-1.8.4.RELEASE.querydsl/src/main/java/org/springframework/data/querydsl/QueryDslUtils.java 2015-05-31 21:27:25.003784337 +0200
+@@ -23,7 +23,7 @@
+ public abstract class QueryDslUtils {
+
+ public static final boolean QUERY_DSL_PRESENT = org.springframework.util.ClassUtils.isPresent(
+- "com.mysema.query.types.Predicate", QueryDslUtils.class.getClassLoader());
++ "com.querydsl.core.types.Predicate", QueryDslUtils.class.getClassLoader());
+
+ private QueryDslUtils() {
+
+diff -Nru spring-data-commons-1.8.4.RELEASE/src/main/java/org/springframework/data/querydsl/SimpleEntityPathResolver.java spring-data-commons-1.8.4.RELEASE.querydsl/src/main/java/org/springframework/data/querydsl/SimpleEntityPathResolver.java
+--- spring-data-commons-1.8.4.RELEASE/src/main/java/org/springframework/data/querydsl/SimpleEntityPathResolver.java 2014-08-27 11:51:44.000000000 +0200
++++ spring-data-commons-1.8.4.RELEASE.querydsl/src/main/java/org/springframework/data/querydsl/SimpleEntityPathResolver.java 2015-05-31 21:27:25.003784337 +0200
+@@ -21,7 +21,7 @@
+ import org.springframework.util.ClassUtils;
+ import org.springframework.util.ReflectionUtils;
+
+-import com.mysema.query.types.EntityPath;
++import com.querydsl.core.types.EntityPath;
+
+ /**
+ * Simple implementation of {@link EntityPathResolver} to lookup a query class by reflection and using the static field
+diff -Nru spring-data-commons-1.8.4.RELEASE/src/test/java/org/springframework/data/querydsl/QSortUnitTests.java spring-data-commons-1.8.4.RELEASE.querydsl/src/test/java/org/springframework/data/querydsl/QSortUnitTests.java
+--- spring-data-commons-1.8.4.RELEASE/src/test/java/org/springframework/data/querydsl/QSortUnitTests.java 2014-08-27 11:51:44.000000000 +0200
++++ spring-data-commons-1.8.4.RELEASE.querydsl/src/test/java/org/springframework/data/querydsl/QSortUnitTests.java 2015-05-31 21:27:25.078780573 +0200
+@@ -27,7 +27,7 @@
+ import org.springframework.data.domain.Sort.Direction;
+ import org.springframework.data.domain.Sort.Order;
+
+-import com.mysema.query.types.OrderSpecifier;
++import com.querydsl.core.types.OrderSpecifier;
+
+ /**
+ * Unit tests for {@link QSort}.
+diff -Nru spring-data-commons-1.8.4.RELEASE/src/test/java/org/springframework/data/querydsl/SimpleEntityPathResolverUnitTests.java spring-data-commons-1.8.4.RELEASE.querydsl/src/test/java/org/springframework/data/querydsl/SimpleEntityPathResolverUnitTests.java
+--- spring-data-commons-1.8.4.RELEASE/src/test/java/org/springframework/data/querydsl/SimpleEntityPathResolverUnitTests.java 2014-08-27 11:51:44.000000000 +0200
++++ spring-data-commons-1.8.4.RELEASE.querydsl/src/test/java/org/springframework/data/querydsl/SimpleEntityPathResolverUnitTests.java 2015-05-31 21:27:25.077780623 +0200
+@@ -20,7 +20,7 @@
+
+ import org.junit.Test;
+
+-import com.mysema.query.annotations.QueryEntity;
++import com.querydsl.core.annotations.QueryEntity;
+
+ /**
+ * Unit test for {@link SimpleEntityPathResolver}.
+diff -Nru spring-data-commons-1.8.4.RELEASE/src/test/java/org/springframework/data/querydsl/User.java spring-data-commons-1.8.4.RELEASE.querydsl/src/test/java/org/springframework/data/querydsl/User.java
+--- spring-data-commons-1.8.4.RELEASE/src/test/java/org/springframework/data/querydsl/User.java 2014-08-27 11:51:44.000000000 +0200
++++ spring-data-commons-1.8.4.RELEASE.querydsl/src/test/java/org/springframework/data/querydsl/User.java 2015-05-31 21:27:25.077780623 +0200
+@@ -17,7 +17,7 @@
+
+ import java.util.Date;
+
+-import com.mysema.query.annotations.QueryEntity;
++import com.querydsl.core.annotations.QueryEntity;
+
+ /**
+ * @author Oliver Gierke
diff --git a/springframework-data-commons.spec b/springframework-data-commons.spec
new file mode 100644
index 0000000..9d4b592
--- /dev/null
+++ b/springframework-data-commons.spec
@@ -0,0 +1,144 @@
+%global namedreltag .RELEASE
+%global namedversion %{version}%{?namedreltag}
+%global oname spring-data-commons
+
+Name: springframework-data-commons
+Version: 1.8.4
+Release: 2%{?dist}
+Summary: Interfaces between relational and non-relational data stores
+License: ASL 2.0
+URL: http://projects.spring.io/spring-data/
+# Newer release require springframework >= 4.0.7.RELEASE
+Source0: https://github.com/spring-projects/spring-data-commons/archive/%{namedversion}.tar.gz
+# Port to querydsl 4.0.0 https://jira.spring.io/browse/DATACMNS-670
+Patch0: %{name}-1.8.4-querydsl4.patch
+
+BuildRequires: maven-local
+BuildRequires: mvn(com.google.guava:guava)
+BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind)
+BuildRequires: mvn(com.querydsl:querydsl-apt)
+BuildRequires: mvn(com.querydsl:querydsl-core)
+BuildRequires: mvn(javax.annotation:jsr250-api)
+BuildRequires: mvn(javax.ejb:ejb-api)
+BuildRequires: mvn(javax.enterprise:cdi-api)
+BuildRequires: mvn(javax.servlet:javax.servlet-api)
+BuildRequires: mvn(joda-time:joda-time)
+BuildRequires: mvn(org.springframework:spring-beans)
+BuildRequires: mvn(org.springframework:spring-context)
+BuildRequires: mvn(org.springframework:spring-core)
+BuildRequires: mvn(org.springframework:spring-expression)
+BuildRequires: mvn(org.springframework:spring-oxm)
+BuildRequires: mvn(org.springframework:spring-tx)
+BuildRequires: mvn(org.springframework:spring-web)
+BuildRequires: mvn(org.springframework:spring-webmvc)
+BuildRequires: mvn(org.springframework.hateoas:spring-hateoas)
+
+%if 0
+# Test deps
+# https://bugzilla.redhat.com/show_bug.cgi?id=1217162
+BuildRequires: mvn(com.mysema.maven:apt-maven-plugin)
+BuildRequires: mvn(com.sun.xml.bind:jaxb-impl)
+BuildRequires: mvn(javax.el:javax.el-api)
+BuildRequires: mvn(org.apache.openwebbeans.test:cditest-owb)
+BuildRequires: mvn(org.codehaus.groovy:groovy-all:1.8.6)
+BuildRequires: mvn(xmlunit:xmlunit)
+%endif
+
+BuildArch: noarch
+
+%description
+Spring Data Commons is part of the umbrella Spring Data project that
+provides shared infrastructure across the Spring Data projects. Most
+importantly at the moment it contains technology neutral repository
+interfaces as well as a meta-data model for persisting Java classes.
+
+Features:
+° Powerful Repository and custom object-mapping abstractions
+° Support for cross-store persistence
+° Dynamic query generation from query method names
+° Implementation domain base classes providing basic properties
+° Support for transparent auditing (created, last changed)
+° Possibility to integrate custom repository code
+° Easy Spring integration with custom name-space
+
+%package javadoc
+Summary: Javadoc for %{name}
+
+%description javadoc
+This package contains javadoc for %{name}.
+
+%prep
+%setup -q -n %{oname}-%{namedversion}
+%patch0 -p1
+
+cp -p src/main/resources/*.txt .
+sed -i 's/\r//' *.txt
+
+# https://github.com/spring-projects/spring-data-build
+%pom_remove_parent
+# Remove unavailable plugins
+%pom_remove_plugin :apt-maven-plugin
+%pom_remove_plugin :wagon-maven-plugin
+# Remove unwanted plugin
+%pom_remove_plugin :maven-assembly-plugin
+
+# Set dependecies version (available in parent pom)
+%pom_xpath_set "pom:dependency[pom:groupId='com.fasterxml.jackson.core']/pom:version" 2.5.0
+%pom_xpath_set "pom:dependency[pom:groupId='javax.enterprise']/pom:version" 1.1
+%pom_xpath_set "pom:dependency[pom:groupId='joda-time']/pom:version" 2.3
+%pom_xpath_set "pom:dependency[pom:groupId='org.apache.openwebbeans.test']/pom:version" 1.2.0
+
+# Force EL 3.0 apis
+%pom_xpath_set "pom:dependency[pom:groupId='javax.el']/pom:artifactId" javax.el-api
+%pom_xpath_set "pom:dependency[pom:groupId='javax.el']/pom:version" 3.0.0
+# Force servlet 3.1 apis
+%pom_xpath_set "pom:dependency[pom:groupId='javax.servlet']/pom:artifactId" javax.servlet-api
+%pom_xpath_set "pom:dependency[pom:groupId='javax.servlet']/pom:version" 3.1.0
+
+# Add OSGi support
+%pom_xpath_inject "pom:project" "<packaging>bundle</packaging>"
+%pom_add_plugin org.apache.felix:maven-bundle-plugin . '
+<extensions>true</extensions>
+<configuration>
+ <instructions>
+ <Bundle-SymbolicName>org.springframework.data.core</Bundle-SymbolicName>
+ <Bundle-Name>${project.name}</Bundle-Name>
+ <Bundle-Vendor>Pivotal Software, Inc.</Bundle-Vendor>
+ <Bundle-Version>${project.version}</Bundle-Version>
+ </instructions>
+</configuration>
+<executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+</executions>'
+
+%mvn_file : %{oname}
+
+%build
+
+# Unavailable test deps
+%mvn_build -f -- -Dproject.build.sourceEncoding=UTF-8
+
+%install
+%mvn_install
+
+%files -f .mfiles
+%doc changelog.txt readme.*
+%license license.txt notice.txt
+
+%files javadoc -f .mfiles-javadoc
+%license license.txt notice.txt
+
+%changelog
+* Tue Jun 02 2015 gil cattaneo <puntogil at libero.it> 1.8.4-2
+- fix summary field
+- cleanup spec file
+- fix some rpmlint problems
+
+* Fri Jan 02 2015 gil cattaneo <puntogil at libero.it> 1.8.4-1
+- initial rpm
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/springframework-data-commons.git/commit/?h=f22&id=c29f418cfbd2117ac33558352eeebe0bd6891399
More information about the scm-commits
mailing list