Hi, I reverted the changes that has been done for APIMGT (apimgt/modules/distribution/product/pom.xml), since this gives some issues after building the pack.
Thanks, KasunW On Thu, Apr 5, 2012 at 10:51 AM, Sumedha Rubasinghe <[email protected]>wrote: > Pradeeban, > This fix broken API Mgt product build. > /sumedha > > On Thu, Apr 5, 2012 at 2:30 AM, <[email protected]> wrote: > >> Author: pradeeban >> Date: Wed Apr 4 17:00:28 2012 >> New Revision: 124781 >> URL: http://wso2.org/svn/browse/wso2?view=rev&revision=124781 >> >> Log: >> Fixing the maven3 warnings of gs2 and apimgt. These weren't found in the >> main-build, as they are not included in the products/pom.xml. >> >> >> Modified: >> >> carbon/platform/trunk/products/apimgt/modules/distribution/product/pom.xml >> carbon/platform/trunk/products/gs2/modules/distribution/product/pom.xml >> carbon/platform/trunk/products/gs2/modules/distribution/service/pom.xml >> >> carbon/platform/trunk/products/gs2/modules/integration/gs-integration-tests/pom.xml >> >> carbon/platform/trunk/products/gs2/modules/p2-profile-gen/service/pom.xml >> >> Modified: >> carbon/platform/trunk/products/apimgt/modules/distribution/product/pom.xml >> URL: >> http://wso2.org/svn/browse/wso2/carbon/platform/trunk/products/apimgt/modules/distribution/product/pom.xml?rev=124781&r1=124780&r2=124781&view=diff >> >> ============================================================================== >> --- >> carbon/platform/trunk/products/apimgt/modules/distribution/product/pom.xml >> (original) >> +++ >> carbon/platform/trunk/products/apimgt/modules/distribution/product/pom.xml >> Wed Apr 4 17:00:28 2012 >> @@ -94,7 +94,7 @@ >> <goal>run</goal> >> </goals> >> <configuration> >> - <tasks> >> + <target> >> <property name="tempdir" >> value="target/docs-temp"/> >> <mkdir dir="${tempdir}"/> >> <unzip dest="${tempdir}"> >> @@ -148,52 +148,14 @@ >> </fileset> >> </copy> >> <delete dir="${tempdir}"/> >> - </tasks> >> + </target> >> </configuration> >> </execution> >> - </executions> >> - </plugin> >> - >> - <plugin> >> - <groupId>org.apache.maven.plugins</groupId> >> - <artifactId>maven-site-plugin</artifactId> >> - <version>3.0</version> >> - <configuration> >> - <reportplugins> >> - <plugin> >> - <groupId>org.apache.maven.plugins</groupId> >> - >> <artifactId>maven-project-info-reports-plugin</artifactId> >> - <version>2.4</version> >> - <reportSets> >> - <reportSet> >> - <reports> >> - <report>index</report> >> - </reports> >> - </reportSet> >> - </reportSets> >> - </plugin> >> - </reportplugins> >> - </configuration> >> - <executions> >> - <execution> >> - <phase>package</phase> >> - <goals> >> - <goal>site</goal> >> - </goals> >> - </execution> >> - </executions> >> - </plugin> >> - >> - <plugin> >> - <groupId>org.apache.maven.plugins</groupId> >> - <artifactId>maven-antrun-plugin</artifactId> >> - <version>1.1</version> >> - <executions> >> <execution> >> <id>clean_target</id> >> <phase>install</phase> >> <configuration> >> - <tasks> >> + <target> >> <delete dir="target/archive-tmp"/> >> <delete >> dir="target/dependency-maven-plugin-markers"/> >> <delete dir="target/maven-archiver"/> >> @@ -201,21 +163,12 @@ >> <delete dir="target/sources"/> >> <delete dir="target/site"/> >> <delete dir="src/site"/> >> - </tasks> >> + </target> >> </configuration> >> <goals> >> <goal>run</goal> >> </goals> >> </execution> >> - </executions> >> - </plugin> >> - >> - <plugin> >> - <groupId>org.apache.maven.plugins</groupId> >> - <artifactId>maven-antrun-plugin</artifactId> >> - <version>1.1</version> >> - <executions> >> - >> <execution> >> <id>create-API-manager-database</id> >> <phase>package</phase> >> @@ -223,7 +176,7 @@ >> <goal>run</goal> >> </goals> >> <configuration> >> - <tasks> >> + <target> >> <path id="h2.classpath"> >> <path >> refid="maven.compile.classpath"/> >> </path> >> @@ -244,11 +197,42 @@ >> </sql> >> <echo >> message="##################### >> END ########################"/> >> - </tasks> >> + </target> >> </configuration> >> </execution> >> </executions> >> + </plugin> >> + >> + <plugin> >> + <groupId>org.apache.maven.plugins</groupId> >> + <artifactId>maven-site-plugin</artifactId> >> + <version>3.0</version> >> + <configuration> >> + <reportplugins> >> + <plugin> >> + <groupId>org.apache.maven.plugins</groupId> >> + >> <artifactId>maven-project-info-reports-plugin</artifactId> >> + <version>2.4</version> >> + <reportSets> >> + <reportSet> >> + <reports> >> + <report>index</report> >> + </reports> >> + </reportSet> >> + </reportSets> >> + </plugin> >> + </reportplugins> >> + </configuration> >> + <executions> >> + <execution> >> + <phase>package</phase> >> + <goals> >> + <goal>site</goal> >> + </goals> >> + </execution> >> + </executions> >> </plugin> >> + >> <plugin> >> <groupId>org.apache.maven.plugins</groupId> >> <artifactId>maven-assembly-plugin</artifactId> >> >> Modified: >> carbon/platform/trunk/products/gs2/modules/distribution/product/pom.xml >> URL: >> http://wso2.org/svn/browse/wso2/carbon/platform/trunk/products/gs2/modules/distribution/product/pom.xml?rev=124781&r1=124780&r2=124781&view=diff >> >> ============================================================================== >> --- >> carbon/platform/trunk/products/gs2/modules/distribution/product/pom.xml >> (original) >> +++ >> carbon/platform/trunk/products/gs2/modules/distribution/product/pom.xml >> Wed Apr 4 17:00:28 2012 >> @@ -294,7 +294,7 @@ >> <goal>run</goal> >> </goals> >> <configuration> >> - <tasks> >> + <target> >> <property name="tempdir" >> value="target/docs-temp"/> >> <mkdir dir="${tempdir}"/> >> <unzip dest="${tempdir}"> >> @@ -360,14 +360,14 @@ >> </filterset> >> </copy> >> <delete dir="${tempdir}"/> >> - </tasks> >> + </target> >> </configuration> >> </execution> >> <execution> >> <id>clean_target</id> >> <phase>install</phase> >> <configuration> >> - <tasks> >> + <target> >> <delete dir="target/archive-tmp"/> >> <delete >> dir="target/dependency-maven-plugin-markers"/> >> <delete dir="target/maven-archiver"/> >> @@ -376,7 +376,7 @@ >> <delete dir="target/sources"/> >> <delete dir="target/site"/> >> <delete dir="src/site"/> >> - </tasks> >> + </target> >> </configuration> >> <goals> >> <goal>run</goal> >> >> Modified: >> carbon/platform/trunk/products/gs2/modules/distribution/service/pom.xml >> URL: >> http://wso2.org/svn/browse/wso2/carbon/platform/trunk/products/gs2/modules/distribution/service/pom.xml?rev=124781&r1=124780&r2=124781&view=diff >> >> ============================================================================== >> --- >> carbon/platform/trunk/products/gs2/modules/distribution/service/pom.xml >> (original) >> +++ >> carbon/platform/trunk/products/gs2/modules/distribution/service/pom.xml >> Wed Apr 4 17:00:28 2012 >> @@ -28,7 +28,7 @@ >> >> <modelVersion>4.0.0</modelVersion> >> <artifactId>wso2stratos-gs</artifactId> >> - <version>${gadget.server.stratos.version}</version> >> + <version>1.1.0-SNAPSHOT</version> >> <packaging>jar</packaging> >> <name>WSO2 Gadget Server - Distribution</name> >> <description>WSO2 Gadget Server Distribution</description> >> @@ -121,7 +121,7 @@ >> <goal>run</goal> >> </goals> >> <configuration> >> - <tasks> >> + <target> >> <property name="tempdir" >> value="target/docs-temp"/> >> <mkdir dir="${tempdir}"/> >> <unzip dest="${tempdir}"> >> @@ -187,14 +187,14 @@ >> </filterset> >> </copy> >> <delete dir="${tempdir}"/> >> - </tasks> >> + </target> >> </configuration> >> </execution> >> <execution> >> <id>clean_target</id> >> <phase>install</phase> >> <configuration> >> - <tasks> >> + <target> >> <delete dir="target/archive-tmp"/> >> <delete >> dir="target/dependency-maven-plugin-markers"/> >> <delete dir="target/maven-archiver"/> >> @@ -203,7 +203,7 @@ >> <delete dir="target/sources"/> >> <delete dir="target/site"/> >> <delete dir="src/site"/> >> - </tasks> >> + </target> >> </configuration> >> <goals> >> <goal>run</goal> >> >> Modified: >> carbon/platform/trunk/products/gs2/modules/integration/gs-integration-tests/pom.xml >> URL: >> http://wso2.org/svn/browse/wso2/carbon/platform/trunk/products/gs2/modules/integration/gs-integration-tests/pom.xml?rev=124781&r1=124780&r2=124781&view=diff >> >> ============================================================================== >> --- >> carbon/platform/trunk/products/gs2/modules/integration/gs-integration-tests/pom.xml >> (original) >> +++ >> carbon/platform/trunk/products/gs2/modules/integration/gs-integration-tests/pom.xml >> Wed Apr 4 17:00:28 2012 >> @@ -32,12 +32,12 @@ >> </property> >> <property> >> <name>carbon.zip</name> >> - >> >> <value>${basedir}/../../../modules/distribution/product/target/wso2gs-${pom.version}.zip >> + >> >> <value>${basedir}/../../../modules/distribution/product/target/wso2gs-${project.version}.zip >> </value> >> </property> >> <!--<property> >> <name>extracted.dir</name> >> - <value>wso2gs-${pom.version}</value> >> + <value>wso2gs-${project.version}</value> >> </property> >> <property> >> <name>emma.home</name> >> @@ -65,7 +65,7 @@ >> </property> >> <property> >> <name>extracted.dir</name> >> - <value>wso2gs-${pom.version}</value> >> + <value>wso2gs-${project.version}</value> >> </property> >> </systemProperties> >> <workingDirectory>${basedir}/target</workingDirectory> >> @@ -113,16 +113,6 @@ >> </dependency> >> <dependency> >> <groupId>org.wso2.carbon</groupId> >> - >> <artifactId>org.wso2.carbon.dashboard.mgt.users.stub</artifactId> >> - <version>${carbon.version}</version> >> - </dependency> >> - <dependency> >> - <groupId>org.wso2.carbon</groupId> >> - >> <artifactId>org.wso2.carbon.dashboard.mgt.gadgetrepo.stub</artifactId> >> - <version>${carbon.version}</version> >> - </dependency> >> - <dependency> >> - <groupId>org.wso2.carbon</groupId> >> >> <artifactId>org.wso2.carbon.dashboard.mgt.users.stub</artifactId> >> <version>${carbon.version}</version> >> </dependency> >> >> Modified: >> carbon/platform/trunk/products/gs2/modules/p2-profile-gen/service/pom.xml >> URL: >> http://wso2.org/svn/browse/wso2/carbon/platform/trunk/products/gs2/modules/p2-profile-gen/service/pom.xml?rev=124781&r1=124780&r2=124781&view=diff >> >> ============================================================================== >> --- >> carbon/platform/trunk/products/gs2/modules/p2-profile-gen/service/pom.xml >> (original) >> +++ >> carbon/platform/trunk/products/gs2/modules/p2-profile-gen/service/pom.xml >> Wed Apr 4 17:00:28 2012 >> @@ -28,7 +28,7 @@ >> >> <modelVersion>4.0.0</modelVersion> >> <artifactId>gadget-profile-gen</artifactId> >> - <version>${gadget.server.stratos.version}</version> >> + <version>1.1.0-SNAPSHOT</version> >> <packaging>pom</packaging> >> <name>WSO2 Gadget Server - Gadget Server Profile Generation</name> >> <url>http://wso2.org</url> >> _______________________________________________ >> Commits mailing list >> [email protected] >> http://wso2.org/cgi-bin/mailman/listinfo/commits >> > > > > -- > /sumedha > +94 773017743 > > _______________________________________________ > Dev mailing list > [email protected] > http://wso2.org/cgi-bin/mailman/listinfo/dev > > -- *Kasun Weranga* Software Engineer ** *WSO2, Inc. *lean.enterprise.middleware. mobile : +94 772314602 <http://sanjeewamalalgoda.blogspot.com/>blog :<http://sanjeewamalalgoda.blogspot.com/> http://kasunweranga.blogspot.com/
_______________________________________________ Dev mailing list [email protected] http://wso2.org/cgi-bin/mailman/listinfo/dev
