Author: ilgrosso
Date: Mon Jul 7 07:09:13 2014
New Revision: 1608351
URL: http://svn.apache.org/r1608351
Log:
[maven-release-plugin] prepare branch 1_2_X
Modified:
syncope/trunk/common/pom.xml
syncope/trunk/console/pom.xml
syncope/trunk/core/pom.xml
syncope/trunk/pom.xml
Modified: syncope/trunk/common/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/common/pom.xml?rev=1608351&r1=1608350&r2=1608351&view=diff
==============================================================================
--- syncope/trunk/common/pom.xml (original)
+++ syncope/trunk/common/pom.xml Mon Jul 7 07:09:13 2014
@@ -183,7 +183,7 @@ under the License.
<namespacePrefix>syncope</namespacePrefix>
<addResourceAndMethodIds>true</addResourceAndMethodIds>
<linkAnyMediaTypeToXmlSchema>true</linkAnyMediaTypeToXmlSchema>
- <classResourceNames/>
+ <classResourceNames />
<basePackages>org.apache.syncope.common.services</basePackages>
<docProvider>org.apache.cxf.maven_plugin.javatowadl.ResourceMapJavaDocProvider</docProvider>
<attachWadl>true</attachWadl>
Modified: syncope/trunk/console/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/pom.xml?rev=1608351&r1=1608350&r2=1608351&view=diff
==============================================================================
--- syncope/trunk/console/pom.xml (original)
+++ syncope/trunk/console/pom.xml Mon Jul 7 07:09:13 2014
@@ -213,40 +213,33 @@ under the License.
<phase>process-resources</phase>
<configuration>
<target>
- <unzip
src="${settings.localRepository}/org/activiti/activiti-webapp-explorer2/${activiti.version}/activiti-webapp-explorer2-${activiti.version}.war"
-
dest="${project.build.directory}/activiti-webapp-explorer2"/>
+ <unzip
src="${settings.localRepository}/org/activiti/activiti-webapp-explorer2/${activiti.version}/activiti-webapp-explorer2-${activiti.version}.war"
dest="${project.build.directory}/activiti-webapp-explorer2" />
- <mkdir dir="${activiti-modeler.directory}"/>
+ <mkdir dir="${activiti-modeler.directory}" />
- <mkdir dir="${activiti-modeler.directory}/editor"/>
+ <mkdir dir="${activiti-modeler.directory}/editor" />
<copy todir="${activiti-modeler.directory}/editor">
<fileset
dir="${project.build.directory}/activiti-webapp-explorer2/editor">
- <exclude name="oryx.js"/>
+ <exclude name="oryx.js" />
</fileset>
</copy>
- <copy
file="${project.build.directory}/activiti-webapp-explorer2/WEB-INF/classes/plugins.xml"
- todir="${activiti-modeler.directory}/editor"/>
- <copy
file="${project.build.directory}/activiti-webapp-explorer2/WEB-INF/classes/stencilset.json"
- todir="${activiti-modeler.directory}/editor"/>
+ <copy
file="${project.build.directory}/activiti-webapp-explorer2/WEB-INF/classes/plugins.xml"
todir="${activiti-modeler.directory}/editor" />
+ <copy
file="${project.build.directory}/activiti-webapp-explorer2/WEB-INF/classes/stencilset.json"
todir="${activiti-modeler.directory}/editor" />
- <mkdir dir="${activiti-modeler.directory}/explorer"/>
+ <mkdir dir="${activiti-modeler.directory}/explorer" />
<copy todir="${activiti-modeler.directory}/explorer">
- <fileset
dir="${project.build.directory}/activiti-webapp-explorer2/explorer"/>
+ <fileset
dir="${project.build.directory}/activiti-webapp-explorer2/explorer" />
</copy>
- <mkdir dir="${activiti-modeler.directory}/libs"/>
+ <mkdir dir="${activiti-modeler.directory}/libs" />
<copy todir="${activiti-modeler.directory}/libs">
- <fileset
dir="${project.build.directory}/activiti-webapp-explorer2/libs"/>
+ <fileset
dir="${project.build.directory}/activiti-webapp-explorer2/libs" />
</copy>
- <fixcrlf
srcdir="${project.build.directory}/activiti-webapp-explorer2/editor/"
- includes="oryx.debug.js"
- eol="unix"/>
- <patch
patchfile="${basedir}/src/main/resources/oryx.debug.js.patch"
-
originalfile="${project.build.directory}/activiti-webapp-explorer2/editor/oryx.debug.js"
-
destfile="${activiti-modeler.directory}/editor/oryx.debug.js"/>
+ <fixcrlf
srcdir="${project.build.directory}/activiti-webapp-explorer2/editor/"
includes="oryx.debug.js" eol="unix" />
+ <patch
patchfile="${basedir}/src/main/resources/oryx.debug.js.patch"
originalfile="${project.build.directory}/activiti-webapp-explorer2/editor/oryx.debug.js"
destfile="${activiti-modeler.directory}/editor/oryx.debug.js" />
- <delete
dir="${project.build.directory}/activiti-webapp-explorer2"/>
+ <delete
dir="${project.build.directory}/activiti-webapp-explorer2" />
</target>
</configuration>
<goals>
@@ -258,13 +251,13 @@ under the License.
<phase>pre-integration-test</phase>
<configuration>
<target>
- <unzip src="${basedir}/../core/target/syncope.war"
dest="${cargo.run.dir}"/>
- <copy file="${project.build.directory}/test-classes/db.jsp"
todir="${cargo.run.dir}"/>
+ <unzip src="${basedir}/../core/target/syncope.war"
dest="${cargo.run.dir}" />
+ <copy file="${project.build.directory}/test-classes/db.jsp"
todir="${cargo.run.dir}" />
<copy todir="${cargo.run.dir}/WEB-INF/classes"
includeEmptyDirs="false">
<fileset dir="${project.build.directory}/test-classes">
- <exclude name="**/*.class"/>
- <exclude name="restClientContext.xml"/>
- <exclude name="rest.properties"/>
+ <exclude name="**/*.class" />
+ <exclude name="restClientContext.xml" />
+ <exclude name="rest.properties" />
</fileset>
</copy>
</target>
@@ -278,7 +271,7 @@ under the License.
<phase>pre-integration-test</phase>
<configuration>
<target>
- <copy file="${project.build.directory}/test-classes/test.csv"
todir="${test.csvdir.path}" overwrite="true"/>
+ <copy file="${project.build.directory}/test-classes/test.csv"
todir="${test.csvdir.path}" overwrite="true" />
</target>
</configuration>
<goals>
@@ -445,7 +438,7 @@ under the License.
<profile>
<id>skipTests</id>
<properties>
- <javaagent/>
+ <javaagent />
</properties>
<build>
@@ -535,11 +528,11 @@ under the License.
<phase>pre-integration-test</phase>
<configuration>
<target>
- <touch millis="0"
file="${project.build.directory}/test-classes/web.xml"/>
+ <touch millis="0"
file="${project.build.directory}/test-classes/web.xml" />
<war
destfile="${project.build.directory}/${project.build.finalName}.war"
update="true">
<mappedresources>
- <fileset dir="${project.build.directory}/test-classes"
includes="web.xml"/>
- <globmapper from="web.xml" to="WEB-INF/web.xml"/>
+ <fileset dir="${project.build.directory}/test-classes"
includes="web.xml" />
+ <globmapper from="web.xml" to="WEB-INF/web.xml" />
</mappedresources>
</war>
</target>
@@ -600,11 +593,11 @@ under the License.
<phase>pre-integration-test</phase>
<configuration>
<target>
- <touch millis="0"
file="${project.build.directory}/test-classes/web.xml"/>
+ <touch millis="0"
file="${project.build.directory}/test-classes/web.xml" />
<war
destfile="${project.build.directory}/${project.build.finalName}.war"
update="true">
<mappedresources>
- <fileset dir="${project.build.directory}/test-classes"
includes="web.xml"/>
- <globmapper from="web.xml" to="WEB-INF/web.xml"/>
+ <fileset dir="${project.build.directory}/test-classes"
includes="web.xml" />
+ <globmapper from="web.xml" to="WEB-INF/web.xml" />
</mappedresources>
</war>
</target>
@@ -663,7 +656,7 @@ under the License.
<id>selenium</id>
<properties>
- <javaagent/>
+ <javaagent />
</properties>
<build>
Modified: syncope/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/pom.xml?rev=1608351&r1=1608350&r2=1608351&view=diff
==============================================================================
--- syncope/trunk/core/pom.xml (original)
+++ syncope/trunk/core/pom.xml Mon Jul 7 07:09:13 2014
@@ -454,14 +454,11 @@ under the License.
<phase>pre-integration-test</phase>
<configuration>
<target>
- <unzip
src="${project.build.directory}/${project.build.finalName}.war"
dest="${cargo.run.dir}"/>
- <copy
file="${project.build.directory}/test-classes/org/apache/syncope/core/sync/TestSyncActions.class"
-
todir="${cargo.run.dir}/WEB-INF/classes/org/apache/syncope/core/sync"/>
- <copy
file="${project.build.directory}/test-classes/org/apache/syncope/core/sync/TestSyncRule.class"
-
todir="${cargo.run.dir}/WEB-INF/classes/org/apache/syncope/core/sync"/>
- <copy
file="${project.build.directory}/test-classes/org/apache/syncope/core/rest/data/DoubleValueAttributableTransformer.class"
-
todir="${cargo.run.dir}/WEB-INF/classes/org/apache/syncope/core/rest/data"/>
- <copy file="${project.build.directory}/test-classes/db.jsp"
todir="${cargo.run.dir}"/>
+ <unzip
src="${project.build.directory}/${project.build.finalName}.war"
dest="${cargo.run.dir}" />
+ <copy
file="${project.build.directory}/test-classes/org/apache/syncope/core/sync/TestSyncActions.class"
todir="${cargo.run.dir}/WEB-INF/classes/org/apache/syncope/core/sync" />
+ <copy
file="${project.build.directory}/test-classes/org/apache/syncope/core/sync/TestSyncRule.class"
todir="${cargo.run.dir}/WEB-INF/classes/org/apache/syncope/core/sync" />
+ <copy
file="${project.build.directory}/test-classes/org/apache/syncope/core/rest/data/DoubleValueAttributableTransformer.class"
todir="${cargo.run.dir}/WEB-INF/classes/org/apache/syncope/core/rest/data" />
+ <copy file="${project.build.directory}/test-classes/db.jsp"
todir="${cargo.run.dir}" />
<copy todir="${cargo.run.dir}/WEB-INF/classes"
includeEmptyDirs="false">
<fileset dir="${project.build.directory}/test-classes">
<exclude name="**/*.class" />
@@ -478,8 +475,7 @@ under the License.
<phase>pre-integration-test</phase>
<configuration>
<target>
- <copy file="${project.build.directory}/test-classes/test.csv"
todir="${test.csvdir.path}"
- overwrite="true"/>
+ <copy file="${project.build.directory}/test-classes/test.csv"
todir="${test.csvdir.path}" overwrite="true" />
</target>
</configuration>
<goals>
@@ -959,8 +955,7 @@ under the License.
<phase>process-test-resources</phase>
<configuration>
<target>
- <copy
tofile="${project.build.directory}/classes/META-INF/orm.xml"
-
file="${basedir}/src/main/resources/META-INF/orm.xml.oracle" overwrite="true"/>
+ <copy
tofile="${project.build.directory}/classes/META-INF/orm.xml"
file="${basedir}/src/main/resources/META-INF/orm.xml.oracle" overwrite="true" />
</target>
</configuration>
<goals>
@@ -1015,8 +1010,7 @@ under the License.
<phase>process-test-resources</phase>
<configuration>
<target>
- <copy
tofile="${project.build.directory}/classes/META-INF/orm.xml"
-
file="${basedir}/src/main/resources/META-INF/orm.xml.sqlserver"
overwrite="true"/>
+ <copy
tofile="${project.build.directory}/classes/META-INF/orm.xml"
file="${basedir}/src/main/resources/META-INF/orm.xml.sqlserver"
overwrite="true" />
</target>
</configuration>
<goals>
@@ -1199,11 +1193,9 @@ under the License.
<phase>pre-integration-test</phase>
<configuration>
<target>
- <unzip
src="${settings.localRepository}/org/apache/syncope/syncope-build-tools/${project.version}/syncope-build-tools-${project.version}.war"
dest="${project.build.directory}/syncope-build-tools-test"/>
- <copy
file="${project.build.outputDirectory}/META-INF/MANIFEST.MF"
-
todir="${project.build.directory}/syncope-build-tools-test/META-INF"
overwrite="true"/>
- <copy
file="${settings.localRepository}/com/h2database/h2/${h2.version}/h2-${h2.version}.jar"
-
todir="${project.build.directory}/syncope-build-tools-test/WEB-INF/lib"
overwrite="true"/>
+ <unzip
src="${settings.localRepository}/org/apache/syncope/syncope-build-tools/${project.version}/syncope-build-tools-${project.version}.war"
dest="${project.build.directory}/syncope-build-tools-test" />
+ <copy
file="${project.build.outputDirectory}/META-INF/MANIFEST.MF"
todir="${project.build.directory}/syncope-build-tools-test/META-INF"
overwrite="true" />
+ <copy
file="${settings.localRepository}/com/h2database/h2/${h2.version}/h2-${h2.version}.jar"
todir="${project.build.directory}/syncope-build-tools-test/WEB-INF/lib"
overwrite="true" />
</target>
</configuration>
<goals>
@@ -1323,14 +1315,12 @@ under the License.
<configuration>
<target>
<!-- Needed because WebLogic has problems in running
ApacheDS from the WAR archive -->
- <unzip
src="${settings.localRepository}/org/apache/syncope/syncope-build-tools/${project.version}/syncope-build-tools-${project.version}.war"
dest="${project.build.directory}/syncope-build-tools-test"/>
+ <unzip
src="${settings.localRepository}/org/apache/syncope/syncope-build-tools/${project.version}/syncope-build-tools-${project.version}.war"
dest="${project.build.directory}/syncope-build-tools-test" />
<!-- Needed because WebLogic is installed (H2 dependency
cannot be injected via cargo) -->
- <copy
file="${settings.localRepository}/com/h2database/h2/${h2.version}/h2-${h2.version}.jar"
-
todir="${project.build.directory}/syncope-build-tools-test/WEB-INF/lib"
overwrite="true"/>
+ <copy
file="${settings.localRepository}/com/h2database/h2/${h2.version}/h2-${h2.version}.jar"
todir="${project.build.directory}/syncope-build-tools-test/WEB-INF/lib"
overwrite="true" />
<!-- Needed because WebLogic deploys first core then
build-tools: this JSP will just ask core to
reload all connectors -->
- <copy
file="${project.build.directory}/test-classes/conninstance-reload.jsp"
-
todir="${project.build.directory}/syncope-build-tools-test" overwrite="true"/>
+ <copy
file="${project.build.directory}/test-classes/conninstance-reload.jsp"
todir="${project.build.directory}/syncope-build-tools-test" overwrite="true" />
</target>
</configuration>
<goals>
Modified: syncope/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1608351&r1=1608350&r2=1608351&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Mon Jul 7 07:09:13 2014
@@ -33,7 +33,7 @@ under the License.
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>14</version>
- <relativePath/>
+ <relativePath />
</parent>
<url>http://syncope.apache.org/</url>
@@ -49,9 +49,9 @@ under the License.
</licenses>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/syncope/trunk</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/syncope/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc/syncope/trunk</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/syncope/branches/1_2_X</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/syncope/branches/1_2_X</developerConnection>
+ <url>http://svn.apache.org/viewvc/syncope/branches/1_2_X</url>
</scm>
<issueManagement>
