#240 - Fix hamcrest version and archtetype test templates

sculptor · Mar 7, 2021 · db4450d · db4450d
1 parent b74210c
commit db4450d
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 48 deletions.
diff --git a/...ptor-maven/sculptor-maven-archetype-parent/src/main/resources/archetype-resources/pom.xml b/...ptor-maven/sculptor-maven-archetype-parent/src/main/resources/archetype-resources/pom.xml
@@ -32,7 +32,7 @@
 		<xstream-version>${xstream-version}</xstream-version>
 
 		<junit-version>${junit-version}</junit-version>
-		<hamcrest-version>2.2</hamcrest-version>
+		<hamcrest-version>${hamcrest-version}</hamcrest-version>
 #if( $mongodb != "true" && $mongodb != "y" && $mongodb != "yes")
 		<hsqldb-version>${hsqldb-version}</hsqldb-version>
 #end

diff --git a/...culptor-maven-archetype-parent/src/test/resources/projects/ejb-with-ear/reference/pom.xml b/...culptor-maven-archetype-parent/src/test/resources/projects/ejb-with-ear/reference/pom.xml
@@ -16,22 +16,22 @@
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 
-		<sculptor-version>3.2.0-SNAPSHOT</sculptor-version>
-		<jboss-javaee6-version>3.0.3.Final</jboss-javaee6-version>
-		<hibernate-validator-version>6.2.0.Final</hibernate-validator-version>
-		<ehcache-version>3.9.0</ehcache-version>
-		<tomcat-jasper-el>9.0.41</tomcat-jasper-el>
-		<slf4j-version>1.7.30</slf4j-version>
-		<logback-version>1.2.3</logback-version>
-		<spring-version>5.3.3</spring-version>
-		<aspectj-version>1.9.6</aspectj-version>
-		<joda-time-version>2.10.9</joda-time-version>
-		<jackson-version>2.12.0</jackson-version>
-		<xstream-version>1.4.15</xstream-version>
+		<sculptor-version>${project.version}</sculptor-version>
+		<jboss-javaee6-version>${jboss-javaee6-version}</jboss-javaee6-version>
+		<hibernate-validator-version>${hibernate-validator-version}</hibernate-validator-version>
+		<ehcache-version>${ehcache-version}</ehcache-version>
+		<tomcat-jasper-el>${tomcat-jasper-el}</tomcat-jasper-el>
+		<slf4j-version>${slf4j-version}</slf4j-version>
+		<logback-version>${logback-version}</logback-version>
+		<spring-version>${spring-version}</spring-version>
+		<aspectj-version>${aspectj-version}</aspectj-version>
+		<joda-time-version>${joda-time-version}</joda-time-version>
+		<jackson-version>${jackson-version}</jackson-version>
+		<xstream-version>${xstream-version}</xstream-version>
 
-		<junit-version>5.7.0</junit-version>
-		<hamcrest-version>2.2</hamcrest-version>
-		<hsqldb-version>2.5.1</hsqldb-version>
+		<junit-version>${junit-version}</junit-version>
+		<hamcrest-version>${hamcrest-version}</hamcrest-version>
+		<hsqldb-version>${hsqldb-version}</hsqldb-version>
 	</properties>
 
 	<modules>

diff --git a/...maven/sculptor-maven-archetype-parent/src/test/resources/projects/plain/reference/pom.xml b/...maven/sculptor-maven-archetype-parent/src/test/resources/projects/plain/reference/pom.xml
@@ -16,22 +16,22 @@
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 
-		<sculptor-version>3.2.0-SNAPSHOT</sculptor-version>
-		<jboss-javaee6-version>3.0.3.Final</jboss-javaee6-version>
-		<hibernate-validator-version>6.2.0.Final</hibernate-validator-version>
-		<ehcache-version>3.9.0</ehcache-version>
-		<tomcat-jasper-el>9.0.41</tomcat-jasper-el>
-		<slf4j-version>1.7.30</slf4j-version>
-		<logback-version>1.2.3</logback-version>
-		<spring-version>5.3.3</spring-version>
-		<aspectj-version>1.9.6</aspectj-version>
-		<joda-time-version>2.10.9</joda-time-version>
-		<jackson-version>2.12.0</jackson-version>
-		<xstream-version>1.4.15</xstream-version>
+		<sculptor-version>${project.version}</sculptor-version>
+		<jboss-javaee6-version>${jboss-javaee6-version}</jboss-javaee6-version>
+		<hibernate-validator-version>${hibernate-validator-version}</hibernate-validator-version>
+		<ehcache-version>${ehcache-version}</ehcache-version>
+		<tomcat-jasper-el>${tomcat-jasper-el}</tomcat-jasper-el>
+		<slf4j-version>${slf4j-version}</slf4j-version>
+		<logback-version>${logback-version}</logback-version>
+		<spring-version>${spring-version}</spring-version>
+		<aspectj-version>${aspectj-version}</aspectj-version>
+		<joda-time-version>${joda-time-version}</joda-time-version>
+		<jackson-version>${jackson-version}</jackson-version>
+		<xstream-version>${xstream-version}</xstream-version>
 
-		<junit-version>5.7.0</junit-version>
-		<hamcrest-version>2.2</hamcrest-version>
-		<hsqldb-version>2.5.1</hsqldb-version>
+		<junit-version>${junit-version}</junit-version>
+		<hamcrest-version>${hamcrest-version}</hamcrest-version>
+		<hsqldb-version>${hsqldb-version}</hsqldb-version>
 	</properties>
 
 	<modules>

diff --git a/...ptor-maven-archetype-parent/src/test/resources/projects/spring-with-ear/reference/pom.xml b/...ptor-maven-archetype-parent/src/test/resources/projects/spring-with-ear/reference/pom.xml
@@ -16,22 +16,22 @@
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 
-		<sculptor-version>3.2.0-SNAPSHOT</sculptor-version>
-		<jboss-javaee6-version>3.0.3.Final</jboss-javaee6-version>
-		<hibernate-validator-version>6.2.0.Final</hibernate-validator-version>
-		<ehcache-version>3.9.0</ehcache-version>
-		<tomcat-jasper-el>9.0.41</tomcat-jasper-el>
-		<slf4j-version>1.7.30</slf4j-version>
-		<logback-version>1.2.3</logback-version>
-		<spring-version>5.3.3</spring-version>
-		<aspectj-version>1.9.6</aspectj-version>
-		<joda-time-version>2.10.9</joda-time-version>
-		<jackson-version>2.12.0</jackson-version>
-		<xstream-version>1.4.15</xstream-version>
+		<sculptor-version>${project.version}</sculptor-version>
+		<jboss-javaee6-version>${jboss-javaee6-version}</jboss-javaee6-version>
+		<hibernate-validator-version>${hibernate-validator-version}</hibernate-validator-version>
+		<ehcache-version>${ehcache-version}</ehcache-version>
+		<tomcat-jasper-el>${tomcat-jasper-el}</tomcat-jasper-el>
+		<slf4j-version>${slf4j-version}</slf4j-version>
+		<logback-version>${logback-version}</logback-version>
+		<spring-version>${spring-version}</spring-version>
+		<aspectj-version>${aspectj-version}</aspectj-version>
+		<joda-time-version>${joda-time-version}</joda-time-version>
+		<jackson-version>${jackson-version}</jackson-version>
+		<xstream-version>${xstream-version}</xstream-version>
 
-		<junit-version>5.7.0</junit-version>
-		<hamcrest-version>2.2</hamcrest-version>
-		<hsqldb-version>2.5.1</hsqldb-version>
+		<junit-version>${junit-version}</junit-version>
+		<hamcrest-version>${hamcrest-version}</hamcrest-version>
+		<hsqldb-version>${hsqldb-version}</hsqldb-version>
 	</properties>
 
 	<modules>

diff --git a/sculptor-maven/sculptor-maven-archetype/src/main/resources/archetype-resources/pom.xml b/sculptor-maven/sculptor-maven-archetype/src/main/resources/archetype-resources/pom.xml
@@ -49,7 +49,7 @@
 		<xstream-version>${xstream-version}</xstream-version>
 
 		<junit-version>${junit-version}</junit-version>
-		<hamcrest-version>2.2</hamcrest-version>
+		<hamcrest-version>${hamcrest-version}</hamcrest-version>
 #if( $mongodb != "true" && $mongodb != "y" && $mongodb != "yes")
 		<hsqldb-version>${hsqldb-version}</hsqldb-version>
 #end

diff --git a/.../sculptor-maven-archetype/src/test/resources/projects/spring-standalone/reference/pom.xml b/.../sculptor-maven-archetype/src/test/resources/projects/spring-standalone/reference/pom.xml
@@ -29,7 +29,7 @@
 		<xstream-version>${xstream-version}</xstream-version>
 
 		<junit-version>${junit-version}</junit-version>
-		<hamcrest-version>2.2</hamcrest-version>
+		<hamcrest-version>${hamcrest-version}</hamcrest-version>
 		<hsqldb-version>${hsqldb-version}</hsqldb-version>
 	</properties>