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/presence/trunk@101783 66ffb92e-73f9-0310-93c1-f5514f145a0a
  • Loading branch information
@botimer
botimer committed Dec 15, 2011
1 parent 26a1588 commit 1ca7f64
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 130 deletions.
123 changes: 2 additions & 121 deletions presence/pom.xml
View file
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-commons-tool</artifactId>
<groupId>org.sakaiproject</groupId>
<artifactId>master</artifactId>
<version>2.9-SNAPSHOT</version>
</parent>

Expand All @@ -23,12 +23,6 @@
<module>presence-util/util</module>
</modules>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<sakai.courier.version>2.9-SNAPSHOT</sakai.courier.version>
<sakai.velocity.version>2.9-SNAPSHOT</sakai.velocity.version>
</properties>

<scm>
<connection>scm:svn:https://source.sakaiproject.org/svn/presence/trunk</connection>
<developerConnection>scm:svn:https://source.sakaiproject.org/svn/presence/trunk</developerConnection>
Expand All @@ -43,77 +37,8 @@
</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>
<groupId>${project.groupId}</groupId>
<artifactId>sakai-presence-api</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>sakai-presence-impl</artifactId>
Expand All @@ -124,51 +49,7 @@
<artifactId>sakai-presence-util</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.sakaiproject.courier</groupId>
<artifactId>sakai-courier-api</artifactId>
<version>${sakai.courier.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.sakaiproject.courier</groupId>
<artifactId>sakai-courier-util</artifactId>
<version>${sakai.courier.version}</version>
</dependency>
<dependency>
<groupId>org.sakaiproject.velocity</groupId>
<artifactId>sakai-velocity-tool-api</artifactId>
<version>${sakai.velocity.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.sakaiproject.velocity</groupId>
<artifactId>sakai-velocity-tool</artifactId>
<version>${sakai.velocity.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.8</version>
<configuration>
<debug>true</debug>
<links>
<link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
<link>http://download.oracle.com/javase/6/docs/api/</link>
</links>
<breakiterator>true</breakiterator>
<verbose>false</verbose>
<aggregate>true</aggregate>
<minmemory>168m</minmemory>
<maxmemory>1024m</maxmemory>
<additionalJOption>-J-Xms168m -J-Xmx1024m -J-XX:PermSize=128m -J-XX:NewSize=64m</additionalJOption>
</configuration>
</plugin>
</plugins>
</reporting>
</project>
10 changes: 1 addition & 9 deletions presence/presence-api/api/pom.xml
View file
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.presence</groupId>
<artifactId>presence</artifactId>
<version>2.9-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
-->

<name>sakai-presence-api</name>
<groupId>org.sakaiproject.presence</groupId>
Expand Down Expand Up @@ -49,4 +41,4 @@
</dependency>
</dependencies>

</project>
</project>

0 comments on commit 1ca7f64

Please sign in to comment.