- fix and simplify integration-test move all generated files to target folder
git-svn-id: https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/yaafi-crypto@1880203 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index 7556de7..b6dfd91 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,15 +117,9 @@
<directory>src/test</directory>
<includes> <include>**/*.xml</include><include>**/*.properties</include>
</includes>
- <filtering>true</filtering>
</testResource>
</testResources>
- <!-- only needed for integration-test and manifest class testing -->
- <filters>
- <filter>${basedir}/src/filters/filter-integration-test.properties</filter>
- </filters>
-
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -153,6 +147,7 @@
<configuration>
<skip>${skip.pw.encrypt}</skip>
<target>
+ <touch file="${basedir}/target/integration-test/filter-integration-test.properties" mkdirs="true"/>
<ant
antfile="${basedir}/src/ant/integration-test-build-pw.xml"
target="init">
@@ -163,7 +158,7 @@
<property name="jarname" value="${project.build.finalName}" />
<!-- generates encrypted password, saved in vcs: -->
<property name="target.property.path"
- value="${basedir}/src/filters/filter-integration-test.properties" />
+ value="${basedir}/target/integration-test/filter-integration-test.properties" />
</ant>
</target>
</configuration>
@@ -182,7 +177,7 @@
<configuration>
<skip>${skip.pw.gen}</skip>
<target>
- <touch file="${basedir}/target/integration-test/filtered-pw.properties" mkdirs="true" />
+ <touch file="${basedir}/target/integration-test/filtered-pw.properties" mkdirs="true" />
<ant
antfile="${basedir}/src/ant/integration-test-build-pw.xml"
target="build">
@@ -193,7 +188,7 @@
<property name="jarname" value="${project.build.finalName}" />
<!-- contains encrypted password, saved in vcs: -->
<property name="source.property.path"
- value="${basedir}/src/filters/filter-integration-test.properties" />
+ value="${basedir}/target/integration-test/filter-integration-test.properties" />
<!-- should not be saved in vcs: -->
<property name="target.property.path"
value="${basedir}/target/integration-test/filtered-pw.properties" />
diff --git a/src/ant/integration-test-build-pw.xml b/src/ant/integration-test-build-pw.xml
index 3a8ae02..d1c2b21 100644
--- a/src/ant/integration-test-build-pw.xml
+++ b/src/ant/integration-test-build-pw.xml
@@ -64,6 +64,6 @@
<!-- encrypt to password_encrypted -->
<target name="init" depends="testjava, encrypt, init-update">
- </target>
+ </target>
</project>
\ No newline at end of file
diff --git a/src/filters/filter-integration-test.properties b/src/filters/filter-integration-test.properties
deleted file mode 100644
index b08a2f5..0000000
--- a/src/filters/filter-integration-test.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-#Thu, 23 Jul 2020 13:53:53 +0200
-password_encrypted=0e88b1ae1cc8bcee9df12575805fbb770d70123259929778998a8285730b1d53453632a50fd9cac77d8a8f1603b622f4
