diff --git a/pom.xml b/pom.xml index fb29a24..de3c950 100755 --- a/pom.xml +++ b/pom.xml @@ -6,6 +6,13 @@ spring-data-envers 1.0.0.BUILD-SNAPSHOT + + org.springframework.data.build + spring-data-parent + 1.8.0.BUILD-SNAPSHOT + + + Spring Data Envers Spring Data extension to work with Hibernate Envers http://github.com/SpringSource/spring-data-envers @@ -30,38 +37,14 @@ - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - Copyright 2011-2012 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. - - - - https://github.com/SpringSource/spring-data-envers - 4.1.8.RELEASE - 1.9.1.RELEASE - 1.7.13 - UTF-8 + 1.11.0.BUILD-SNAPSHOT + 1.10.0.BUILD-SNAPSHOT + 4.3.11 @@ -69,77 +52,16 @@ org.springframework.data spring-data-jpa - ${spring.data.jpa.version} - - - - org.springframework - spring-aop - ${spring.version} - - - - org.springframework - spring-orm - ${spring.version} - - - - org.springframework - spring-jdbc - ${spring.version} - - - - org.springframework - spring-tx - ${spring.version} - - - - org.springframework - spring-context - ${spring.version} - - - - org.springframework - spring-beans - ${spring.version} - - - - org.springframework - spring-core - ${spring.version} - - - - - org.slf4j - slf4j-api - ${slf4j.version} - runtime - - - org.slf4j - jcl-over-slf4j - ${slf4j.version} - runtime + ${springdata.jpa} org.hibernate hibernate-envers - 4.3.11.Final - - - cglib - cglib - 2.2 - runtime + ${hibernate.envers}.Final + joda-time joda-time @@ -147,27 +69,6 @@ - - org.hamcrest - hamcrest-library - 1.3 - test - - - - junit - junit - 4.12 - test - - - - org.springframework - spring-test - ${spring.version} - test - - com.h2database h2 @@ -175,20 +76,6 @@ test - - log4j - log4j - 1.2.17 - test - - - - org.slf4j - slf4j-log4j12 - ${slf4j.version} - test - - @@ -196,21 +83,32 @@ org.apache.maven.plugins - maven-surefire-plugin - 2.18.1 + maven-assembly-plugin - - org.apache.maven.plugins - maven-compiler-plugin - 3.3 - - 1.6 - 1.6 - + org.codehaus.mojo + wagon-maven-plugin + + + org.asciidoctor + asciidoctor-maven-plugin - + + + spring-libs-snapshot + https://repo.spring.io/libs-snapshot + + + + + + spring-plugins-release + http://repo.spring.io/plugins-release + + + + \ No newline at end of file diff --git a/src/main/asciidoc/index.adoc b/src/main/asciidoc/index.adoc new file mode 100644 index 0000000..fbf6144 --- /dev/null +++ b/src/main/asciidoc/index.adoc @@ -0,0 +1,31 @@ += Spring Data Envers - Reference Documentation +Oliver Gierke; +:revnumber: {version} +:revdate: {localdate} +:toc: +:toc-placement!: +:spring-data-commons-docs: ../../../../spring-data-commons/src/main/asciidoc + +(C) 2008-2015 The original authors. + +NOTE: Copies of this document may be made for your own use and for distribution to others, provided that you do not charge any fee for such copies and further provided that each copy contains this Copyright Notice, whether distributed in print or electronically. + +toc::[] + +include::{spring-data-commons-docs}/dependencies.adoc[leveloffset=+1] +include::{spring-data-commons-docs}/repositories.adoc[leveloffset=+1] + + +[[reference]] += Reference Documentation + +== TODO + + +[[appendix]] += Appendix + +:numbered!: +include::{spring-data-commons-docs}/repository-namespace-reference.adoc[leveloffset=+1] +include::{spring-data-commons-docs}/repository-populator-namespace-reference.adoc[leveloffset=+1] +include::{spring-data-commons-docs}/repository-query-keywords-reference.adoc[leveloffset=+1] diff --git a/src/test/java/org/springframework/data/envers/repository/support/RepositoryIntegrationTest.java b/src/test/java/org/springframework/data/envers/repository/support/RepositoryIntegrationTests.java similarity index 98% rename from src/test/java/org/springframework/data/envers/repository/support/RepositoryIntegrationTest.java rename to src/test/java/org/springframework/data/envers/repository/support/RepositoryIntegrationTests.java index 128c544..e59070a 100755 --- a/src/test/java/org/springframework/data/envers/repository/support/RepositoryIntegrationTest.java +++ b/src/test/java/org/springframework/data/envers/repository/support/RepositoryIntegrationTests.java @@ -46,7 +46,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = Config.class) -public class RepositoryIntegrationTest { +public class RepositoryIntegrationTests { @Autowired LicenseRepository licenseRepository; @Autowired CountryRepository countryRepository; diff --git a/src/test/resources/log4j.properties b/src/test/resources/log4j.properties deleted file mode 100755 index 8fe189a..0000000 --- a/src/test/resources/log4j.properties +++ /dev/null @@ -1,7 +0,0 @@ -log4j.rootCategory=WARN, console - -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{ABSOLUTE} %5p %40.40c:%4L - %m%n -log4j.appender.console=org.apache.log4j.ConsoleAppender - -log4j.logger.org.springframework=INFO \ No newline at end of file diff --git a/src/test/resources/logback.xml b/src/test/resources/logback.xml new file mode 100644 index 0000000..b2160dd --- /dev/null +++ b/src/test/resources/logback.xml @@ -0,0 +1,16 @@ + + + + + + %d %5p %40.40c:%4L - %m%n + + + + + + + + + + \ No newline at end of file diff --git a/template.mf b/template.mf new file mode 100644 index 0000000..3321d44 --- /dev/null +++ b/template.mf @@ -0,0 +1,15 @@ +Bundle-SymbolicName: org.springframework.data.envers +Bundle-Name: ${project.name} +Bundle-Vendor: Pivotal Software, Inc. +Bundle-Version: ${project.version} +Bundle-ManifestVersion: 2 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Import-Template: + com.querydsl.*;version="${querydsl:[=.=.=,+1.0.0)}";resolution:=optional, + javax.persistence.*;version="[2.0.0,3.0.0)", + org.hibernate.envers.*;version="${hibernate.envers:[=.=.=,+1.0.0)}", + org.joda.time.*;version="${jodatime:[=.=.=,+1.0.0)}", + org.springframework.*;version="${spring:[=.=.=,+1.0.0)}", + org.springframework.data.*;version="${springdata.commons:[=.=.=,+1.0.0)}", + org.springframework.data.jpa.*;version="${springdata.jpa:[=.=.=,+1.0.0)}" +DynamicImport-Package: *