deenath
/
device-mgt-plugins
forked from community/device-mgt-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing pom files - moving dependencies to parent pom, corretly propertizing the versions

Browse Source
revert-dabc3590
Geeth Munasinghe 10 years ago
parent d167daef78
commit 61663b430b
2 changed files with 241 additions and 34 deletions
Show Stats Download Patch File Download Diff File

251
pom.xml
Unescape View File

@ -76,7 +76,7 @@
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.integration.common.admin.client</artifactId> <artifactId>org.wso2.carbon.integration.common.admin.client</artifactId>
<version>${automation.stub.version}</version> <version>${test.automation.stub.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
@ -332,17 +332,17 @@
<dependency> <dependency>
<groupId>com.h2database.wso2</groupId> <groupId>com.h2database.wso2</groupId>
<artifactId>h2-database-engine</artifactId> <artifactId>h2-database-engine</artifactId>
<version>${orbit.version.h2.engine}</version> <version>${orbit.h2.engine.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.tomcat.wso2</groupId> <groupId>org.apache.tomcat.wso2</groupId>
<artifactId>tomcat</artifactId> <artifactId>tomcat</artifactId>
<version>${orbit.version.tomcat}</version> <version>${orbit.tomcat.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.tomcat.wso2</groupId> <groupId>org.apache.tomcat.wso2</groupId>
<artifactId>jdbc-pool</artifactId> <artifactId>jdbc-pool</artifactId>
<version>${tomcat.jdbc.pooling.version}</version> <version>${orbit.tomcat.jdbc.pooling.version}</version>
</dependency> </dependency>
@ -559,45 +559,252 @@
<cdm.core.version.range>[1.0.0, 2.0.0)</cdm.core.version.range> <cdm.core.version.range>[1.0.0, 2.0.0)</cdm.core.version.range>
<testng.version>6.1.1</testng.version>
<carbon.platform.version>4.3.0-SNAPSHOT</carbon.platform.version> <carbon.platform.version>4.3.0-SNAPSHOT</carbon.platform.version>
<carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version> <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
<!--Maven build number plugin-->
<maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version> <maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version>
<axis2.osgi.version.range>[1.6.1.wso2v11, 1.7.0)</axis2.osgi.version.range>
<jboss-transaction-api.version>1.0.0.Final</jboss-transaction-api.version> <!--<carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>-->
<carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
<cdm.version>2.0.0-SNAPSHOT</cdm.version>
<!--Jaggery --> <!--Jaggery -->
<jaggery.feature.version>0.9.0-SNAPSHOT</jaggery.feature.version> <jaggery.feature.version>0.9.0-SNAPSHOT</jaggery.feature.version>
<carbon.feature.version>1.1.0</carbon.feature.version> <jaggery.carbon.module.version>1.1.0</jaggery.carbon.module.version>
<process.feature.version>1.0.0</process.feature.version> <jaggery.process.module.version>1.0.0</jaggery.process.module.version>
<uuid.feature.version>1.0.0</uuid.feature.version> <jaggery.uuid.module.version>1.0.0</jaggery.uuid.module.version>
<sso.feature.version>1.1.0-SNAPSHOT</sso.feature.version> <jaggery.sso.feature.version>1.1.0-SNAPSHOT</jaggery.sso.feature.version>
<i18n.feature.version>1.1.0-SNAPSHOT</i18n.feature.version> <jaggery.i18n.feature.version>1.1.0-SNAPSHOT</jaggery.i18n.feature.version>
<jaggery-test.feature.version>1.1.0</jaggery-test.feature.version> <jaggery.test.feature.version>1.1.0</jaggery.test.feature.version>
<!--Testing --> <!--Testing -->
<test.framework.version>4.3.1</test.framework.version> <test.framework.version>4.3.1</test.framework.version>
<testng.version>6.8</testng.version> <testng.version>6.8</testng.version>
<automation.stub.version>4.3.0-SNAPSHOT</automation.stub.version> <test.automation.stub.version>4.3.0-SNAPSHOT</test.automation.stub.version>
<test.automation.emm.ui.version>1.1.0</test.automation.emm.ui.version> <test.automation.emm.ui.version>1.1.0</test.automation.emm.ui.version>
<!--Eclipse Osgi--> <!--Eclipse Osgi-->
<eclipse.equinox.common.version>3.6.100.v20120522-1841</eclipse.equinox.common.version> <eclipse.equinox.common.version>3.6.100.v20120522-1841</eclipse.equinox.common.version>
<eclipse.osgi.version>3.8.1.v20120830-144521</eclipse.osgi.version> <eclipse.osgi.version>3.8.1.v20120830-144521</eclipse.osgi.version>
<orbit.version.h2.engine>1.2.140.wso2v3</orbit.version.h2.engine> <!--Orbit versions-->
<orbit.h2.engine.version>1.2.140.wso2v3</orbit.h2.engine.version>
<orbit.tomcat.version>7.0.52.wso2v5</orbit.tomcat.version>
<orbit.tomcat.jdbc.pooling.version>7.0.34.wso2v2</orbit.tomcat.jdbc.pooling.version>
<!--API Manager-->
<apim.version>4.3.0-SNAPSHOT</apim.version> <apim.version>4.3.0-SNAPSHOT</apim.version>
<orbit.version.tomcat>7.0.52.wso2v5</orbit.version.tomcat>
<tomcat.jdbc.pooling.version>7.0.34.wso2v2</tomcat.jdbc.pooling.version>
<mdm.android.agent.archetype.version>1.0.0-SNAPSHOT</mdm.android.agent.archetype.version>
<!--MDM android Agent-->
<!--CXF properties--> <mdm.android.agent.archetype.version>1.0.0-SNAPSHOT</mdm.android.agent.archetype.version>
<!--CXF properties-->
<cxf.version>2.6.1</cxf.version> <cxf.version>2.6.1</cxf.version>
<jackson.version>1.9.0</jackson.version> <jackson.version>1.9.0</jackson.version>
<javax.ws.rs.version>1.1.1</javax.ws.rs.version> <javax.ws.rs.version>1.1.1</javax.ws.rs.version>
</properties> </properties>
<scm>
<url>https://github.com/wso2/product-mdm.git</url>
<developerConnection>scm:git:https://github.com/wso2/product-mdm.git</developerConnection>
<connection>scm:git:https://github.com/wso2/product-mdm.git</connection>
<tag>HEAD</tag>
</scm>
<build>
<extensions>
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
<version>2.1</version>
</extension>
</extensions>
<plugins>
<plugin>
<groupId>org.jvnet.maven.incrementalbuild</groupId>
<artifactId>incremental-build-plugin</artifactId>
<version>1.3</version>
<executions>
<execution>
<goals>
<goal>incremental-build</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.1</version>
<configuration>
<encoding>UTF-8</encoding>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
<preparationGoals>clean install</preparationGoals>
<autoVersionSubmodules>true</autoVersionSubmodules>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
<version>1.7.2</version>
<executions>
<execution>
<id>generate-scr-scrdescriptor</id>
<goals>
<goal>scr</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.3.5</version>
<extensions>true</extensions>
<configuration>
<obrRepository>NONE</obrRepository>
<!--<instructions>
<_include>-osgi.bnd</_include>
</instructions>-->
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.1.2</version>
<executions>
<execution>
<id>attach-sources</id>
<phase>verify</phase>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.4</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.8</version>
</plugin>
</plugins>
</pluginManagement>
</build>
<pluginRepositories>
<pluginRepository>
<id>wso2.releases</id>
<name>WSO2 internal Repository</name>
<url>http://maven.wso2.org/nexus/content/repositories/releases/</url>
<releases>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
<checksumPolicy>ignore</checksumPolicy>
</releases>
</pluginRepository>
<pluginRepository>
<id>wso2.snapshots</id>
<name>Apache Snapshot Repository</name>
<url>http://maven.wso2.org/nexus/content/repositories/snapshots/</url>
<snapshots>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
</snapshots>
<releases>
<enabled>false</enabled>
</releases>
</pluginRepository>
<pluginRepository>
<id>wso2-nexus</id>
<name>WSO2 internal Repository</name>
<url>http://maven.wso2.org/nexus/content/groups/wso2-public/</url>
<releases>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
<checksumPolicy>ignore</checksumPolicy>
</releases>
</pluginRepository>
</pluginRepositories>
<repositories>
<!-- Before adding ANYTHING in here, please start a discussion on the dev list.
Ideally the Axis2 build should only use Maven central (which is available
by default) and nothing else. We had troubles with other repositories in
the past. Therefore configuring additional repositories here should be
considered very carefully. -->
<repository>
<id>wso2-nexus</id>
<name>WSO2 internal Repository</name>
<url>http://maven.wso2.org/nexus/content/groups/wso2-public/</url>
<releases>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
<checksumPolicy>ignore</checksumPolicy>
</releases>
</repository>
<repository>
<id>wso2.releases</id>
<name>WSO2 internal Repository</name>
<url>http://maven.wso2.org/nexus/content/repositories/releases/</url>
<releases>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
<checksumPolicy>ignore</checksumPolicy>
</releases>
</repository>
<repository>
<id>wso2.snapshots</id>
<name>WSO2 Snapshot Repository</name>
<url>http://maven.wso2.org/nexus/content/repositories/snapshots/</url>
<snapshots>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
</snapshots>
<releases>
<enabled>false</enabled>
</releases>
</repository>
<repository>
<id>nexus-releases</id>
<name>WSO2 Release Distribution Repository</name>
<url>http://maven.wso2.org/nexus/service/local/staging/deploy/maven2/</url>
</repository>
</repositories>
</project> </project>

24
product/modules/p2-profile-gen/pom.xml
Unescape View File

@ -119,22 +119,22 @@
org.jaggeryjs:org.jaggeryjs.feature:${jaggery.feature.version} org.jaggeryjs:org.jaggeryjs.feature:${jaggery.feature.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.jaggeryjs.modules:carbon.feature:${carbon.feature.version} org.jaggeryjs.modules:carbon.feature:${jaggery.carbon.module.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.jaggeryjs.modules:process.feature:${process.feature.version} org.jaggeryjs.modules:process.feature:${jaggery.process.module.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.jaggeryjs.modules:uuid.feature:${uuid.feature.version} org.jaggeryjs.modules:uuid.feature:${jaggery.uuid.module.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.jaggeryjs.modules:sso.feature:${sso.feature.version} org.jaggeryjs.modules:sso.feature:${jaggery.sso.feature.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.jaggeryjs.modules:i18n.feature:${sso.feature.version} org.jaggeryjs.modules:i18n.feature:${jaggery.i18n.feature.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.jaggeryjs.modules:jaggery-test.feature:${jaggery-test.feature.version} org.jaggeryjs.modules:jaggery-test.feature:${jaggery.test.feature.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.transport.mgt.feature:${carbon.platform.version} org.wso2.carbon:org.wso2.carbon.transport.mgt.feature:${carbon.platform.version}
@ -357,27 +357,27 @@
</feature> </feature>
<feature> <feature>
<id>org.jaggeryjs.modules.carbon.feature.group</id> <id>org.jaggeryjs.modules.carbon.feature.group</id>
<version>${carbon.feature.version}</version> <version>${jaggery.carbon.module.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.jaggeryjs.modules.process.feature.group</id> <id>org.jaggeryjs.modules.process.feature.group</id>
<version>${process.feature.version}</version> <version>${jaggery.process.module.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.jaggeryjs.modules.uuid.feature.group</id> <id>org.jaggeryjs.modules.uuid.feature.group</id>
<version>${uuid.feature.version}</version> <version>${jaggery.uuid.module.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.jaggeryjs.modules.sso.feature.group</id> <id>org.jaggeryjs.modules.sso.feature.group</id>
<version>${sso.feature.version}</version> <version>${jaggery.sso.feature.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.jaggeryjs.modules.i18n.feature.group</id> <id>org.jaggeryjs.modules.i18n.feature.group</id>
<version>${i18n.feature.version}</version> <version>${jaggery.i18n.feature.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.jaggeryjs.modules.jaggery-test.feature.group</id> <id>org.jaggeryjs.modules.jaggery-test.feature.group</id>
<version>${jaggery-test.feature.version}</version> <version>${jaggery.test.feature.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.transport.mgt.feature.group</id> <id>org.wso2.carbon.transport.mgt.feature.group</id>

Write Preview
Loading…
Cancel
Save