Skip to content

Commit

Permalink
[maven-release-plugin] prepare release v6.0.0-m2
Browse files Browse the repository at this point in the history
  • Loading branch information
WSO2 Builder committed Jan 31, 2017
1 parent a08b5b8 commit 7b67482
Show file tree
Hide file tree
Showing 35 changed files with 99 additions and 131 deletions.
2 changes: 1 addition & 1 deletion components/org.wso2.carbon.integrator.core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.ei</groupId>
<artifactId>ei-component-parent</artifactId>
<version>6.0.0-SNAPSHOT</version>
<version>6.0.0-m2</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion components/org.wso2.ei.styles/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.wso2.ei</groupId>
<artifactId>ei-component-parent</artifactId>
<version>6.0.0-SNAPSHOT</version>
<version>6.0.0-m2</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion components/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.ei</groupId>
<artifactId>wso2ei-parent</artifactId>
<version>6.0.0-SNAPSHOT</version>
<version>6.0.0-m2</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
112 changes: 48 additions & 64 deletions distribution/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,12 @@
~ under the License.
-->

<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

<parent>
<groupId>org.wso2.ei</groupId>
<artifactId>wso2ei-parent</artifactId>
<version>6.0.0-SNAPSHOT</version>
<version>6.0.0-m2</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -176,70 +174,62 @@
</goals>
<configuration>
<tasks>
<property name="tempdir" value="target/docs-temp"/>
<mkdir dir="${tempdir}"/>
<property name="tempdir" value="target/docs-temp" />
<mkdir dir="${tempdir}" />
<unzip dest="${tempdir}">
<fileset dir="target">
<include name="wso2ei-${product.ei.version}.zip"/>
<include name="wso2ei-${product.ei.version}.zip" />
</fileset>
</unzip>
<copy todir="target/wso2carbon-core-${carbon.kernel.version}/wso2/components/"
overwrite="false">
<fileset
dir="${tempdir}/wso2ei-${product.ei.version}/wso2/components/">
<copy todir="target/wso2carbon-core-${carbon.kernel.version}/wso2/components/" overwrite="false">
<fileset dir="${tempdir}/wso2ei-${product.ei.version}/wso2/components/">
</fileset>
</copy>
<delete file="target/wso2ei-${product.ei.version}.zip"/>
<delete dir="${tempdir}"/>
<mkdir dir="${tempdir}"/>
<delete file="target/wso2ei-${product.ei.version}.zip" />
<delete dir="${tempdir}" />
<mkdir dir="${tempdir}" />
<unzip dest="${tempdir}">
<fileset
dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/plugins/">
<include name="*.ui*.jar"/>
<fileset dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/plugins/">
<include name="*.ui*.jar" />
</fileset>
</unzip>
<move todir="${tempdir}/web/" includeemptydirs="false">
<fileset dir="${tempdir}/web/">
<exclude name="**/yui/**"/>
<exclude name="**/ajax/**"/>
<exclude name="**/editarea/**"/>
<exclude name="**/codepress/**"/>
<exclude name="**/WEB-INF/**"/>
<include name="**/*.html"/>
<exclude name="**/yui/**" />
<exclude name="**/ajax/**" />
<exclude name="**/editarea/**" />
<exclude name="**/codepress/**" />
<exclude name="**/WEB-INF/**" />
<include name="**/*.html" />
</fileset>
<mapper type="glob" from="*.html" to="*.xml"/>
<mapper type="glob" from="*.html" to="*.xml" />
</move>
<mkdir dir="src/site/xdoc"/>
<copy todir="src/site/xdoc" overwrite="false"
includeemptydirs="false">
<mkdir dir="src/site/xdoc" />
<copy todir="src/site/xdoc" overwrite="false" includeemptydirs="false">
<fileset dir="${tempdir}/web">
<exclude name="**/yui/**"/>
<exclude name="**/ajax/**"/>
<exclude name="**/WEB-INF/**"/>
<exclude name="**/*.html"/>
<exclude name="**/*.js"/>
<exclude name="**/*.jsp"/>
<exclude name="**/*.xsl"/>
<exclude name="*.*"/>
<exclude name="**/yui/**" />
<exclude name="**/ajax/**" />
<exclude name="**/WEB-INF/**" />
<exclude name="**/*.html" />
<exclude name="**/*.js" />
<exclude name="**/*.jsp" />
<exclude name="**/*.xsl" />
<exclude name="*.*" />
</fileset>
</copy>
<copy todir="src/site" overwrite="false" includeemptydirs="false">
<fileset dir="../docs">
</fileset>
</copy>
<copy todir="target/site/" overwrite="false"
includeemptydirs="false">
<copy todir="target/site/" overwrite="false" includeemptydirs="false">
<fileset dir="src/site/xdoc/">
<include name="**/images/*.*"/>
<include name="**/images/*.*" />
</fileset>
</copy>
<delete dir="${tempdir}"/>
<replace
file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/user-mgt.xml"
token="&lt;Property name=&quot;GetAllRolesOfUserEnabled&quot;&gt;true&lt;/Property&gt;"
value="&lt;!--Property name=&quot;GetAllRolesOfUserEnabled&quot;&gt;true&lt;/Property--&gt;"/>
<property name="tempdir2" value="target/identity-ui"/>
<mkdir dir="${tempdir2}"/>
<delete dir="${tempdir}" />
<replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/user-mgt.xml" token="&lt;Property name=&quot;GetAllRolesOfUserEnabled&quot;&gt;true&lt;/Property&gt;" value="&lt;!--Property name=&quot;GetAllRolesOfUserEnabled&quot;&gt;true&lt;/Property--&gt;" />
<property name="tempdir2" value="target/identity-ui" />
<mkdir dir="${tempdir2}" />
<!-- Move identity:user-roles menu to config_menu -->

<unzip src="target/wso2carbon-core-${carbon.kernel.version}/wso2/components/plugins/org.wso2.carbon.user.mgt.ui_${carbon.identity.framework.version}.jar" dest="${tempdir2}" />
Expand All @@ -260,16 +250,10 @@
<zip destfile="target/wso2carbon-core-${carbon.kernel.version}/wso2/components/plugins/org.wso2.carbon.registry.indexing_${carbon.registry.version}.jar" basedir="${tempdir2}" />


<replace
file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/Owasp.CsrfGuard.Carbon.properties"
token="org.owasp.csrfguard.unprotected.Services=%servletContext%/services/*"
value="org.owasp.csrfguard.unprotected.Services=%servletContext%/services/*${line.separator}org.owasp.csrfguard.unprotected.Sequences=%servletContext%/carbon/sequences/*${line.separator}org.owasp.csrfguard.unprotected.Configadmin=%servletContext%/carbon/configadmin/*${line.separator}org.owasp.csrfguard.unprotected.Localentries=%servletContext%/carbon/localentries/*${line.separator}org.owasp.csrfguard.unprotected.Api=%servletContext%/carbon/api/*${line.separator}org.owasp.csrfguard.unprotected.Proxyservices=%servletContext%/carbon/proxyservices/*${line.separator}org.owasp.csrfguard.unprotected.Resources=%servletContext%/carbon/resources/*${line.separator}org.owasp.csrfguard.unprotected.Task=%servletContext%/carbon/task/*${line.separator}org.owasp.csrfguard.unprotected.RegistryResource=%servletContext%/registry/resource/*${line.separator}org.owasp.csrfguard.unprotected.TenantServices=^%servletContext%/t/.*/services/.*$${line.separator}org.owasp.csrfguard.unprotected.TenantProxyServices=^%servletContext%/t/.*/carbon/proxyservices/.*$${line.separator}org.owasp.csrfguard.unprotected.Saml2SSO=%servletContext%/acs"/>
<replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/Owasp.CsrfGuard.Carbon.properties" token="org.owasp.csrfguard.unprotected.Services=%servletContext%/services/*" value="org.owasp.csrfguard.unprotected.Services=%servletContext%/services/*${line.separator}org.owasp.csrfguard.unprotected.Sequences=%servletContext%/carbon/sequences/*${line.separator}org.owasp.csrfguard.unprotected.Configadmin=%servletContext%/carbon/configadmin/*${line.separator}org.owasp.csrfguard.unprotected.Localentries=%servletContext%/carbon/localentries/*${line.separator}org.owasp.csrfguard.unprotected.Api=%servletContext%/carbon/api/*${line.separator}org.owasp.csrfguard.unprotected.Proxyservices=%servletContext%/carbon/proxyservices/*${line.separator}org.owasp.csrfguard.unprotected.Resources=%servletContext%/carbon/resources/*${line.separator}org.owasp.csrfguard.unprotected.Task=%servletContext%/carbon/task/*${line.separator}org.owasp.csrfguard.unprotected.RegistryResource=%servletContext%/registry/resource/*${line.separator}org.owasp.csrfguard.unprotected.TenantServices=^%servletContext%/t/.*/services/.*$${line.separator}org.owasp.csrfguard.unprotected.TenantProxyServices=^%servletContext%/t/.*/carbon/proxyservices/.*$${line.separator}org.owasp.csrfguard.unprotected.Saml2SSO=%servletContext%/acs" />

<!-- Update Owasp.CsrfGuard.properties file with ValidateWhenNoSessionExists to disable validation on requests made with no valid session -->
<replace
file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/Owasp.CsrfGuard.Carbon.properties"
token="org.owasp.csrfguard.ValidateWhenNoSessionExists = true"
value="org.owasp.csrfguard.ValidateWhenNoSessionExists = false"/>
<replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/Owasp.CsrfGuard.Carbon.properties" token="org.owasp.csrfguard.ValidateWhenNoSessionExists = true" value="org.owasp.csrfguard.ValidateWhenNoSessionExists = false" />
</tasks>
</configuration>
</execution>
Expand All @@ -278,17 +262,17 @@
<phase>install</phase>
<configuration>
<tasks>
<delete dir="target/archive-tmp"/>
<delete dir="target/dependency-maven-plugin-markers"/>
<delete dir="target/maven-archiver"/>
<delete dir="target/wso2carbon-core-${carbon.kernel.version}"/>
<delete dir="target/sources"/>
<delete dir="target/site"/>
<delete dir="src/site"/>
<delete dir="target/identity-ui"/>
<delete dir="target/bpmn-explorer"/>
<delete file="target/bpmn.war"/>
<delete dir="target/humantask-explorer"/>
<delete dir="target/archive-tmp" />
<delete dir="target/dependency-maven-plugin-markers" />
<delete dir="target/maven-archiver" />
<delete dir="target/wso2carbon-core-${carbon.kernel.version}" />
<delete dir="target/sources" />
<delete dir="target/site" />
<delete dir="src/site" />
<delete dir="target/identity-ui" />
<delete dir="target/bpmn-explorer" />
<delete file="target/bpmn.war" />
<delete dir="target/humantask-explorer" />
</tasks>
</configuration>
<goals>
Expand Down
2 changes: 1 addition & 1 deletion features/org.wso2.carbon.integrator.server.feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.wso2.ei</groupId>
<artifactId>integrator-features</artifactId>
<version>6.0.0-SNAPSHOT</version>
<version>6.0.0-m2</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion features/org.wso2.ei.samples.feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.ei</groupId>
<artifactId>integrator-features</artifactId>
<version>6.0.0-SNAPSHOT</version>
<version>6.0.0-m2</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion features/org.wso2.ei.styles.feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.ei</groupId>
<artifactId>integrator-features</artifactId>
<version>6.0.0-SNAPSHOT</version>
<version>6.0.0-m2</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion features/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.ei</groupId>
<artifactId>wso2ei-parent</artifactId>
<version>6.0.0-SNAPSHOT</version>
<version>6.0.0-m2</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion integration/automation-extensions/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.wso2.ei</groupId>
<artifactId>integrations</artifactId>
<version>6.0.0-SNAPSHOT</version>
<version>6.0.0-m2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<name>WSO2 Enterprise Integrator - Automation Extensions</name>
Expand Down
2 changes: 1 addition & 1 deletion integration/mediation-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.ei</groupId>
<artifactId>integrations</artifactId>
<version>6.0.0-SNAPSHOT</version>
<version>6.0.0-m2</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion integration/mediation-tests/service-samples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.wso2.ei</groupId>
<artifactId>mediation-integration</artifactId>
<version>6.0.0-SNAPSHOT</version>
<version>6.0.0-m2</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.wso2.ei</groupId>
<artifactId>integration-test-common</artifactId>
<version>6.0.0-SNAPSHOT</version>
<version>6.0.0-m2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>admin-clients</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.wso2.ei</groupId>
<artifactId>integration-test-common</artifactId>
<version>6.0.0-SNAPSHOT</version>
<version>6.0.0-m2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion integration/mediation-tests/tests-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.wso2.ei</groupId>
<artifactId>mediation-integration</artifactId>
<version>6.0.0-SNAPSHOT</version>
<version>6.0.0-m2</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion integration/mediation-tests/tests-common/ui-pages/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.wso2.ei</groupId>
<artifactId>integration-test-common</artifactId>
<version>6.0.0-SNAPSHOT</version>
<version>6.0.0-m2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<name>EI Integration Test UI Pages</name>
Expand Down
2 changes: 1 addition & 1 deletion integration/mediation-tests/tests-mediator-1/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.ei</groupId>
<artifactId>mediation-integration</artifactId>
<version>6.0.0-SNAPSHOT</version>
<version>6.0.0-m2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion integration/mediation-tests/tests-mediator-2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.wso2.ei</groupId>
<artifactId>mediation-integration</artifactId>
<version>6.0.0-SNAPSHOT</version>
<version>6.0.0-m2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion integration/mediation-tests/tests-other/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.wso2.ei</groupId>
<artifactId>mediation-integration</artifactId>
<version>6.0.0-SNAPSHOT</version>
<version>6.0.0-m2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion integration/mediation-tests/tests-patches/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.wso2.ei</groupId>
<artifactId>mediation-integration</artifactId>
<version>6.0.0-SNAPSHOT</version>
<version>6.0.0-m2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion integration/mediation-tests/tests-platform/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.ei</groupId>
<artifactId>mediation-integration</artifactId>
<version>6.0.0-SNAPSHOT</version>
<version>6.0.0-m2</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.wso2.ei</groupId>
<artifactId>org.wso2.carbon.ei.tests.platform</artifactId>
<version>6.0.0-SNAPSHOT</version>
<version>6.0.0-m2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.wso2.ei</groupId>
<artifactId>org.wso2.carbon.ei.tests.platform</artifactId>
<version>6.0.0-SNAPSHOT</version>
<version>6.0.0-m2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
Loading

0 comments on commit 7b67482

Please sign in to comment.