Skip to content

Commit

Permalink
fix poms for maven 2.0.6
Browse files Browse the repository at this point in the history
git-svn-id: https://source.sakaiproject.org/svn/common/trunk@60268 66ffb92e-73f9-0310-93c1-f5514f145a0a
  • Loading branch information
steveswinsburg committed Apr 20, 2009
1 parent de9cd1b commit 9c3f1bf
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 94 deletions.
88 changes: 5 additions & 83 deletions common/common-composite-component/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,12 @@
<dependency>
<groupId>org.sakaiproject</groupId>
<artifactId>sakai-common-manager-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.sakaiproject</groupId>
<artifactId>sakai-common-type-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.sakaiproject</groupId>
Expand All @@ -68,90 +70,10 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<!-- unit test runtime dependencies
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>1.7.3.0</version>
</dependency>
<dependency>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-full</artifactId>
<version>2.0.2</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.1</version>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
<version>1.2.2</version>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<version>1.2</version>
</dependency>
<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
<version>1.4</version>
</dependency>
<dependency>
<groupId>${sakai.ehcache.groupId}</groupId>
<artifactId>${sakai.ehcache.artifactId}</artifactId>
<version>${sakai.ehcache.version}</version>
</dependency>
<dependency>
<groupId>jdbc</groupId>
<artifactId>jdbc2_0-stdext</artifactId>
<version>h2.1.8</version>
</dependency>
<dependency>
<groupId>jta</groupId>
<artifactId>jta</artifactId>
<version>h2.1.8</version>
</dependency>
<dependency>
<groupId>odmg</groupId>
<artifactId>odmg</artifactId>
<version>3.0</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.8</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>3.0.10-stable-bin</version>
</dependency>
-->


</dependencies>
<build>
<resources>
Expand Down
2 changes: 2 additions & 0 deletions common/edu-person-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,12 @@
<dependency>
<groupId>org.sakaiproject</groupId>
<artifactId>sakai-common-manager-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.sakaiproject</groupId>
<artifactId>sakai-common-type-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
Expand Down
2 changes: 2 additions & 0 deletions common/pack/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<dependency>
<groupId>org.sakaiproject</groupId>
<artifactId>sakai-common-composite-component</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
Expand All @@ -31,6 +32,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
Expand Down
15 changes: 4 additions & 11 deletions common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,27 +39,25 @@

<dependencyManagement>
<dependencies>
<!-- internal dependencies -->

<!-- internal dependencies -->
<dependency>
<groupId>org.sakaiproject</groupId>
<artifactId>sakai-common-composite-component</artifactId>
<version>2.7.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.sakaiproject</groupId>
<artifactId>sakai-common-manager-api</artifactId>
<version>2.7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.sakaiproject</groupId>
<artifactId>sakai-common-type-api</artifactId>
<version>2.7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>

<!-- external dependencies -->
<!-- external dependencies -->
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
Expand All @@ -69,13 +67,8 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
</dependency>

</dependencies>
</dependencyManagement>
</project>
1 change: 1 addition & 0 deletions common/type-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<dependency>
<groupId>org.sakaiproject</groupId>
<artifactId>sakai-common-manager-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
Expand Down

0 comments on commit 9c3f1bf

Please sign in to comment.