From b380ed6bd051dbf155c5bd05380392d90e1c3244 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Thu, 17 Jan 2013 11:44:28 +0100 Subject: [PATCH] DATAJPA-285 - Upgraded pom.xml to use new build infrastructure. --- pom.xml | 502 +++++++++------------------------------------------- template.mf | 20 +-- 2 files changed, 94 insertions(+), 428 deletions(-) diff --git a/pom.xml b/pom.xml index fe7cd1a31..0e8f4a0ca 100644 --- a/pom.xml +++ b/pom.xml @@ -1,291 +1,83 @@ - 4.0.0 - org.springframework.data - spring-data-jpa - 1.3.0.BUILD-SNAPSHOT - - Spring Data JPA - Spring Data module to provide sophisticated support for JPA repositories - http://www.springsource.org/spring-data - 2011-2012 - - SpringSource - http://www.springsource.org - - - - - ogierke - Oliver Gierke - ogierke at vmware.com - SpringSource - http://www.springsource.com - - Project lead - - +1 - - - - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - Copyright 2011 the original author or authors. - - Licensed 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. - - - - - - 3.0.7.RELEASE - 3.1.3.RELEASE - 1.5.0.BUILD-SNAPSHOT - 3.6.10.Final - 2.2.0 - 2.4.0 - 1.6.12 - 2.8.0 - 4.10 - 2.0.0 - 1.6.1 - 1.0.6 - 1.0 - 1.1.7 - true - true + 4.0.0 + + org.springframework.data + spring-data-jpa + 1.3.0.BUILD-SNAPSHOT - UTF-8 - spring-data-jpa - Spring Data JPA - DATAJPA - snapshot - ${project.version} - ${dist.id}-${dist.version} - ${dist.finalName}.zip - target/${dist.fileName} - dist.springframework.org - - - - - - - - distribute - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.8 - - - - javadoc - - package - - - - true -
Spring Data Jpa
- 1.5 - true - ${project.basedir}/src/main/javadoc - ${project.basedir}/src/main/javadoc/overview.html - ${project.basedir}/src/main/javadoc/spring-javadoc.css - - true - - http://static.springframework.org/spring/docs/3.1.x/javadoc-api - http://download.oracle.com/javase/1.5.0/docs/api - http://static.springsource.org/spring-data/data-commons/docs/${spring.data.commons.version}/api - - - - - - com.agilejava.docbkx - docbkx-maven-plugin - 2.0.7 - - - - generate-html - generate-pdf - - package - - - - - org.docbook - docbook-xml - 4.4 - runtime - - - - index.xml - true - ${project.basedir}/src/docbkx/resources/xsl/fopdf.xsl - css/html.css - false - ${project.basedir}/src/docbkx/resources/xsl/html.xsl - 1 - 1 - - - version - ${project.version} - - - - - - - - - - - - - - - - - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.2-beta-5 - false - - - distribution - - single - - package - - - ${project.basedir}/src/assembly/distribution.xml - - false - - - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.4 - - - upload-dist - deploy - - - - - - - - - run - - - - - - org.springframework.build - org.springframework.build.aws.ant - 3.0.5.RELEASE - - - net.java.dev.jets3t - jets3t - 0.7.2 - - - - - - - - - - - - ${project.groupId} - spring-data-commons - ${spring.data.commons.version} - + Spring Data JPA + Spring Data module for JPA repositories. + http://www.springframework.org/spring-data/jpa + + + org.springframework.data.build + spring-data-parent + 1.0.0.BUILD-SNAPSHOT + ../spring-data-build/parent/pom.xml + + + + DATAJPA + + 2.4.0 + 3.6.10.Final + 2.0.0 + 2.2.0 + 1.5.0.BUILD-SNAPSHOT + + + + + + + ${project.groupId} + spring-data-commons + 1.5.0.BUILD-SNAPSHOT + org.springframework spring-orm - ${spring.version} + ${spring} org.springframework spring-context - ${spring.version} + ${spring} org.springframework spring-aop - ${spring.version} + ${spring} org.springframework spring-tx - ${spring.version} + ${spring} org.springframework spring-beans - ${spring.version} + ${spring} org.springframework spring-instrument - ${spring.version} + ${spring} provided org.springframework spring-core - ${spring.version} + ${spring} commons-logging @@ -294,73 +86,24 @@ - - - org.slf4j - slf4j-api - ${slf4j.version} - - - - org.slf4j - jcl-over-slf4j - ${slf4j.version} - runtime - - - - ch.qos.logback - logback-classic - ${logback.version} - test - - org.aspectj aspectjrt - ${aspectj.version} + ${aspectj} org.aspectj aspectjweaver - ${aspectj.version} + ${aspectj} test org.springframework spring-aspects - ${spring.version} + ${spring} true - - org.springframework - spring-test - ${spring.version} - test - - - - org.hamcrest - hamcrest-library - 1.3 - test - - - - junit - junit-dep - ${junit.version} - test - - - - org.mockito - mockito-all - 1.8.4 - test - - org.hsqldb hsqldb @@ -375,26 +118,31 @@ true - - - org.hibernate hibernate-entitymanager - ${hibernate.version} + ${hibernate} true + + org.hibernate + hibernate-jpamodelgen + 1.2.0.Final + provided + + org.eclipse.persistence org.eclipse.persistence.jpa - ${eclipselink.version} + ${eclipselink} true + org.apache.openjpa openjpa-persistence-jdbc - ${openjpa.version} + ${openjpa} true @@ -414,14 +162,14 @@ com.mysema.querydsl querydsl-apt - ${querydsl.version} + ${querydsl} provided com.mysema.querydsl querydsl-jpa - ${querydsl.version} + ${querydsl} true @@ -429,7 +177,7 @@ javax.enterprise cdi-api - ${cdi.version} + ${cdi} provided true @@ -437,14 +185,14 @@ javax.el el-api - ${cdi.version} + ${cdi} test org.apache.openwebbeans.test cditest-owb - ${webbeans.version} + ${webbeans} test @@ -455,45 +203,11 @@ test - - org.hibernate - hibernate-jpamodelgen - 1.2.0.Final - provided - - - - - - - - - - org.springframework.build.aws - org.springframework.build.aws.maven - 3.1.0.RELEASE - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.4 - - 1.5 - 1.5 - - - - org.apache.maven.plugins - maven-jar-plugin - 2.3.1 - - true - - - + + + + + org.apache.maven.plugins maven-surefire-plugin 2.12 @@ -501,23 +215,24 @@ **/*Tests.java - -javaagent:${settings.localRepository}/org/springframework/spring-instrument/${spring.version}/spring-instrument-${spring.version}.jar -javaagent:${settings.localRepository}/org/apache/openjpa/openjpa/${openjpa.version}/openjpa-${openjpa.version}.jar + -javaagent:${settings.localRepository}/org/springframework/spring-instrument/${spring}/spring-instrument-${spring}.jar -javaagent:${settings.localRepository}/org/apache/openjpa/openjpa/${openjpa}/openjpa-${openjpa}.jar org.springframework spring-instrument - ${spring.version} + ${spring} runtime org.apache.openjpa openjpa - ${openjpa.version} + ${openjpa} runtime + org.codehaus.mojo aspectj-maven-plugin @@ -526,12 +241,12 @@ org.aspectj aspectjrt - ${aspectj.version} + ${aspectj} org.aspectj aspectjtools - ${aspectj.version} + ${aspectj} @@ -556,38 +271,6 @@ 1.5 - - - org.apache.maven.plugins - maven-source-plugin - 2.1.2 - - - attach-sources - - jar - - - - - - - com.springsource.bundlor - com.springsource.bundlor.maven - 1.0.0.RELEASE - - ${bundlor.failOnWarnings} - ${bundlor.enabled} - - - - bundlor - - bundlor - - - - com.mysema.maven @@ -624,38 +307,20 @@ - - - - - - http://www.springsource.org/spring-data - - static.springframework.org - scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/data-jpa/docs/${project.version} - - - - - Bamboo - http://build.springsource.org/browse/SPRINGDATA - - - - JIRA - https://jira.springsource.org/browse/DATAJPA - - - - https://github.com/SpringSource/spring-data-jpa - scm:git:git://github.com/SpringSource/spring-data-jpa.git - scm:git:ssh://git@github.com:SpringSource/spring-data-jpa.git - - - + + org.apache.maven.plugins + maven-assembly-plugin + + + + + spring-libs-snapshot http://repo.springsource.org/libs-snapshot + + false + @@ -665,4 +330,5 @@ http://repo.springsource.org/plugins-release - + + \ No newline at end of file diff --git a/template.mf b/template.mf index ae2ca42d6..34244e338 100644 --- a/template.mf +++ b/template.mf @@ -7,19 +7,19 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Template: org.springframework.data.jpa.*;version="${project.version}" Import-Template: - com.mysema.query.*;version="${querydsl.version:[=.=.=,+1.0.0)}";resolution:=optional, - javax.persistence.*;version="${jpa.version:[=.=.=,+1.0.0)}", + com.mysema.query.*;version="${querydsl:[=.=.=,+1.0.0)}";resolution:=optional, + javax.persistence.*;version="${jpa:[=.=.=,+1.0.0)}", javax.annotation.*;version="0.0.0", - javax.enterprise.*;version="${cdi.version:[=.=.=,+1.0.0)}";resolution:=optional, + javax.enterprise.*;version="${cdi:[=.=.=,+1.0.0)}";resolution:=optional, org.aopalliance.*;version="[1.0.0,2.0.0)", - org.apache.openjpa.persistence.*;version="${openjpa.version:[=.=.=,+1.0.0)}";resolution:=optional, - org.aspectj.*;version="${aspectj.version:[=.=.=,+1.0.0)}";resolution:=optional, - org.eclipse.persistence.*;version="${eclipselink.version:[=.=.=,+1.0.0)}";resolution:=optional, + org.apache.openjpa.persistence.*;version="${openjpa:[=.=.=,+1.0.0)}";resolution:=optional, + org.aspectj.*;version="${aspectj:[=.=.=,+1.0.0)}";resolution:=optional, + org.eclipse.persistence.*;version="${eclipselink:[=.=.=,+1.0.0)}";resolution:=optional, org.hibernate.*;version="[3.5.3,4.0.0)";resolution:=optional, org.joda.time.*;version="[1.5.0,2.0.0)";resolution:=optional, - org.slf4j.*;version="${slf4j.version:[=.=.=,+1.0.0)}", - org.springframework.*;version="${spring.version30:[=.=.=.=,+1.0.0)}", - org.springframework.beans.factory.aspectj;version="${spring.version30:[=.=.=.=,+1.0.0)}";resolution:=optional, - org.springframework.data.*;version="${spring.data.commons.version:[=.=.=.=,+1.0.0)}", + org.slf4j.*;version="${slf4j:[=.=.=,+1.0.0)}", + org.springframework.*;version="${spring30:[=.=.=.=,+1.0.0)}", + org.springframework.beans.factory.aspectj;version="${spring30:[=.=.=.=,+1.0.0)}";resolution:=optional, + org.springframework.data.*;version="${springdata.commons:[=.=.=.=,+1.0.0)}", org.w3c.*;version="0.0.0" \ No newline at end of file