You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2016/03/17 09:48:34 UTC
syncope git commit: [SYNCOPE-776] The problem is due to an incomplete
step in the release process: when building with -PskipTests,
fit/core-reference will be missing Activiti and Camel components;
the solution is to use -PskipTests,all
Repository: syncope
Updated Branches:
refs/heads/master 04183d50f -> d72befc59
[SYNCOPE-776] The problem is due to an incomplete step in the release process: when building with -PskipTests, fit/core-reference will be missing Activiti and Camel components; the solution is to use -PskipTests,all
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/d72befc5
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/d72befc5
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/d72befc5
Branch: refs/heads/master
Commit: d72befc59157c17da6d05f67d4c84e233fbb413e
Parents: 04183d5
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Thu Mar 17 09:48:25 2016 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Thu Mar 17 09:48:25 2016 +0100
----------------------------------------------------------------------
src/site/xdoc/release-process.xml | 2 +-
standalone/pom.xml | 56 +++++++++++++++++-----------------
2 files changed, 29 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/d72befc5/src/site/xdoc/release-process.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/release-process.xml b/src/site/xdoc/release-process.xml
index e38b5a8..52b6395 100644
--- a/src/site/xdoc/release-process.xml
+++ b/src/site/xdoc/release-process.xml
@@ -289,7 +289,7 @@ svn commit -m "Staging artifacts for $VERSION vote"]]></source>
<source><![CDATA[
unzip $SYNCOPE_RELEASE_DIR/target/syncope-$VERSION-source-release.zip
cd syncope-$VERSION
-mvn -PskipTests
+mvn -PskipTests,all
# if releasing from 1_2_X
mvn javadoc:aggregate
http://git-wip-us.apache.org/repos/asf/syncope/blob/d72befc5/standalone/pom.xml
----------------------------------------------------------------------
diff --git a/standalone/pom.xml b/standalone/pom.xml
index 26f5765..8f47b58 100644
--- a/standalone/pom.xml
+++ b/standalone/pom.xml
@@ -129,71 +129,71 @@ under the License.
<phase>verify</phase>
<configuration>
<target>
- <mkdir dir="${work.dir}" />
+ <mkdir dir="${work.dir}"/>
<!-- legal stuff -->
- <copy file="${project.build.outputDirectory}/README" todir="${work.dir}" />
- <copy file="LICENSE" todir="${work.dir}" />
- <copy file="NOTICE" todir="${work.dir}" />
+ <copy file="${project.build.outputDirectory}/README" todir="${work.dir}"/>
+ <copy file="LICENSE" todir="${work.dir}"/>
+ <copy file="NOTICE" todir="${work.dir}"/>
<!-- Unzip Tomcat and remove docs and examples from webapps (space saving) -->
- <unzip src="${settings.localRepository}/org/codehaus/cargo/cargo-container-archives/apache-tomcat-${tomcat.version}.zip" dest="${work.dir}" />
- <delete dir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/docs" />
- <delete dir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/examples" />
+ <unzip src="${settings.localRepository}/org/codehaus/cargo/cargo-container-archives/apache-tomcat-${tomcat.version}.zip" dest="${work.dir}"/>
+ <delete dir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/docs"/>
+ <delete dir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/examples"/>
<!-- Syncope core -->
<copy todir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope">
- <fileset dir="../fit/core-reference/target/syncope-fit-core-reference-${project.version}" includes="**/*" />
+ <fileset dir="../fit/core-reference/target/syncope-fit-core-reference-${project.version}" includes="**/*"/>
</copy>
<copy todir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope/WEB-INF/classes" overwrite="true">
- <fileset dir="${project.build.outputDirectory}/core" />
+ <fileset dir="${project.build.outputDirectory}/core"/>
</copy>
<!-- Syncope console -->
<copy todir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-console">
- <fileset dir="../fit/console-reference/target/syncope-fit-console-reference-${project.version}" includes="**/*" />
+ <fileset dir="../fit/console-reference/target/syncope-fit-console-reference-${project.version}" includes="**/*"/>
</copy>
<copy todir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-console/WEB-INF/classes" overwrite="true">
- <fileset dir="${project.build.outputDirectory}/console" />
+ <fileset dir="${project.build.outputDirectory}/console"/>
</copy>
<!-- Syncope enduser -->
<copy todir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-enduser">
- <fileset dir="../fit/enduser-reference/target/syncope-fit-enduser-reference-${project.version}" includes="**/*" />
+ <fileset dir="../fit/enduser-reference/target/syncope-fit-enduser-reference-${project.version}" includes="**/*"/>
</copy>
<copy todir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-enduser/WEB-INF/classes" overwrite="true">
- <fileset dir="${project.build.outputDirectory}/enduser" />
+ <fileset dir="${project.build.outputDirectory}/enduser"/>
</copy>
- <mkdir dir="${work.dir}/apache-tomcat-${tomcat.version}/${test.csvdir.path}" />
- <copy file="../fit/core-reference/src/test/resources/test.csv" todir="${work.dir}/apache-tomcat-${tomcat.version}/${test.csvdir.path}" />
+ <mkdir dir="${work.dir}/apache-tomcat-${tomcat.version}/${test.csvdir.path}"/>
+ <copy file="../fit/core-reference/src/test/resources/test.csv" todir="${work.dir}/apache-tomcat-${tomcat.version}/${test.csvdir.path}"/>
<!-- ConnId's SOAP wssample (provides endpoint for SOAP resources) -->
- <copy file="${settings.localRepository}/net/tirasa/connid/bundles/soap/wssample/${connid.soap.version}/wssample-${connid.soap.version}.war" tofile="${work.dir}/apache-tomcat-${tomcat.version}/webapps/wssample.war" />
+ <copy file="${settings.localRepository}/net/tirasa/connid/bundles/soap/wssample/${connid.soap.version}/wssample-${connid.soap.version}.war" tofile="${work.dir}/apache-tomcat-${tomcat.version}/webapps/wssample.war"/>
<!-- Syncope build tools (provide H2 and Apache DS resources + ConnId connector server) -->
<copy todir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-build-tools">
- <fileset dir="../fit/build-tools/target/syncope-fit-build-tools-${project.version}" includes="**/*" />
+ <fileset dir="../fit/build-tools/target/syncope-fit-build-tools-${project.version}" includes="**/*"/>
</copy>
<copy todir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-build-tools/WEB-INF/lib">
- <fileset dir="../fit/core-reference/target/bundles/" includes="**/*" />
+ <fileset dir="../fit/core-reference/target/bundles/" includes="**/*"/>
</copy>
- <zip destfile="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-build-tools.war" basedir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-build-tools" />
- <delete dir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-build-tools" />
+ <zip destfile="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-build-tools.war" basedir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-build-tools"/>
+ <delete dir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope-build-tools"/>
<!-- Tomcat shared libraries: H2, groovy, StAX2 API, Woodstox -->
- <copy file="${settings.localRepository}/com/h2database/h2/${h2.version}/h2-${h2.version}.jar" todir="${work.dir}/apache-tomcat-${tomcat.version}/lib" />
- <copy file="${settings.localRepository}/org/codehaus/groovy/groovy-all/${groovy.version}/groovy-all-${groovy.version}.jar" todir="${work.dir}/apache-tomcat-${tomcat.version}/lib" />
+ <copy file="${settings.localRepository}/com/h2database/h2/${h2.version}/h2-${h2.version}.jar" todir="${work.dir}/apache-tomcat-${tomcat.version}/lib"/>
+ <copy file="${settings.localRepository}/org/codehaus/groovy/groovy-all/${groovy.version}/groovy-all-${groovy.version}.jar" todir="${work.dir}/apache-tomcat-${tomcat.version}/lib"/>
<copy todir="${work.dir}/apache-tomcat-${tomcat.version}/lib">
- <fileset dir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope/WEB-INF/lib" includes="stax2-api-*.jar" />
- <fileset dir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope/WEB-INF/lib" includes="woodstox-core-asl-*.jar" />
+ <fileset dir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope/WEB-INF/lib" includes="stax2-api-*.jar"/>
+ <fileset dir="${work.dir}/apache-tomcat-${tomcat.version}/webapps/syncope/WEB-INF/lib" includes="woodstox-core-asl-*.jar"/>
</copy>
<!-- Other custom Tomcat resources -->
- <copy file="../fit/core-reference/target/classes/context.xml" todir="${work.dir}/apache-tomcat-${tomcat.version}/conf" overwrite="true" />
- <copy file="src/main/resources/setenv.sh" todir="${work.dir}/apache-tomcat-${tomcat.version}/bin" />
- <copy file="src/main/resources/setenv.bat" todir="${work.dir}/apache-tomcat-${tomcat.version}/bin" />
- <replace file="${work.dir}/apache-tomcat-${tomcat.version}/conf/server.xml" token="8080" value="${cargo.servlet.port}" />
+ <copy file="../fit/core-reference/target/classes/context.xml" todir="${work.dir}/apache-tomcat-${tomcat.version}/conf" overwrite="true"/>
+ <copy file="src/main/resources/setenv.sh" todir="${work.dir}/apache-tomcat-${tomcat.version}/bin"/>
+ <copy file="src/main/resources/setenv.bat" todir="${work.dir}/apache-tomcat-${tomcat.version}/bin"/>
+ <replace file="${work.dir}/apache-tomcat-${tomcat.version}/conf/server.xml" token="8080" value="${cargo.servlet.port}"/>
</target>
</configuration>
</execution>