Skip to content

Commit

Permalink
SAK-21564 - First pass; moving pure-poms parents back to master, clea…
Browse files Browse the repository at this point in the history
…ning up most duplication.

git-svn-id: https://source.sakaiproject.org/svn/courier/trunk@101783 66ffb92e-73f9-0310-93c1-f5514f145a0a
  • Loading branch information
botimer committed Dec 15, 2011
1 parent a3cd264 commit c3be758
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 78 deletions.
10 changes: 1 addition & 9 deletions courier/courier-api/api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,12 @@
<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">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.sakaiproject.purepoms</groupId>
<artifactId>sakai-basic-tool</artifactId>
<version>2.9-SNAPSHOT</version>
</parent>

<!--
<parent>
<groupId>org.sakaiproject.courier</groupId>
<artifactId>courier</artifactId>
<artifactId>courier-base</artifactId>
<version>2.9-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
-->

<name>sakai-courier-api</name>
<groupId>org.sakaiproject.courier</groupId>
Expand Down
71 changes: 2 additions & 69 deletions courier/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.sakaiproject.purepoms</groupId>
<artifactId>sakai-standard-tool</artifactId>
<groupId>org.sakaiproject</groupId>
<artifactId>master</artifactId>
<version>2.9-SNAPSHOT</version>
</parent>

Expand All @@ -23,10 +23,6 @@
<module>courier-util/util</module>
</modules>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<scm>
<connection>scm:svn:https://source.sakaiproject.org/svn/courier/trunk</connection>
<developerConnection>scm:svn:https://source.sakaiproject.org/svn/courier/trunk</developerConnection>
Expand All @@ -41,69 +37,6 @@
</site>
</distributionManagement>

<pluginRepositories>
<pluginRepository>
<id>maven2-central-repo</id>
<name>Maven2 Central Repo</name>
<url>http://repo1.maven.org/maven2/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>Sakai Plugin Repo</id>
<url>http://source.sakaiproject.org/maven2</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>

<repositories>
<repository>
<id>sakai-maven</id>
<name>Sakai Maven Repo</name>
<layout>default</layout>
<url>http://source.sakaiproject.org/maven2</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>sakai-maven2-snapshots</id>
<name>Sakai Maven Repo</name>
<layout>default</layout>
<url>http://source.sakaiproject.org/maven2-snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>default</id>
<name>Maven Repository Switchboard</name>
<layout>default</layout>
<url>http://repo1.maven.org/maven2</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>

<dependencyManagement>
<dependencies>
<dependency>
Expand Down

0 comments on commit c3be758

Please sign in to comment.