Author: gk
Date: Thu Jul 23 12:57:07 2020
New Revision: 1880203
URL: http://svn.apache.org/viewvc?rev=1880203&view=rev
Log:
- fix and simplify integration-test move all generated files to target folder
Removed:
turbine/fulcrum/trunk/yaafi-crypto/src/filters/
Modified:
turbine/fulcrum/trunk/yaafi-crypto/pom.xml
turbine/fulcrum/trunk/yaafi-crypto/src/ant/integration-test-build-pw.xml
Modified: turbine/fulcrum/trunk/yaafi-crypto/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/yaafi-crypto/pom.xml?rev=1880203&r1=1880202&r2=1880203&view=diff
==============================================================================
--- turbine/fulcrum/trunk/yaafi-crypto/pom.xml (original)
+++ turbine/fulcrum/trunk/yaafi-crypto/pom.xml Thu Jul 23 12:57:07 2020
@@ -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" />
Modified:
turbine/fulcrum/trunk/yaafi-crypto/src/ant/integration-test-build-pw.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/yaafi-crypto/src/ant/integration-test-build-pw.xml?rev=1880203&r1=1880202&r2=1880203&view=diff
==============================================================================
--- turbine/fulcrum/trunk/yaafi-crypto/src/ant/integration-test-build-pw.xml
(original)
+++ turbine/fulcrum/trunk/yaafi-crypto/src/ant/integration-test-build-pw.xml
Thu Jul 23 12:57:07 2020
@@ -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
