Skip to content

Commit

Permalink
SIGNUP-239 thin out <dependencyManagement> in favor of inheritance, a…
Browse files Browse the repository at this point in the history 
…dd version properties, other minor cleanup

git-svn-id: https://source.sakaiproject.org/svn/signup/trunk@305928 66ffb92e-73f9-0310-93c1-f5514f145a0a
  • Loading branch information
@arwhyte
arwhyte committed Jan 17, 2014
1 parent 05ba966 commit 39f33e6
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 132 deletions.
1 change: 0 additions & 1 deletion signup/api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
<name>Sakai Signup API</name>
<groupId>org.sakaiproject.signup</groupId>
<artifactId>signup-api</artifactId>

<packaging>jar</packaging>

<properties>
Expand Down
1 change: 0 additions & 1 deletion signup/help/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
<name>Sakai Signup Help</name>
<groupId>org.sakaiproject.signup</groupId>
<artifactId>signup-help</artifactId>

<packaging>jar</packaging>

<properties>
Expand Down
18 changes: 7 additions & 11 deletions signup/impl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,13 @@
<name>Sakai Signup Implementation</name>
<groupId>org.sakaiproject.signup</groupId>
<artifactId>signup-impl</artifactId>

<packaging>jar</packaging>

<dependencies>
<!-- project dependencies -->
<dependency>
<groupId>org.sakaiproject.signup</groupId>
<artifactId>signup-api</artifactId>
</dependency>

<!-- sakai dependencies -->
<dependency>
<groupId>org.sakaiproject.kernel</groupId>
<artifactId>sakai-kernel-api</artifactId>
Expand All @@ -44,15 +40,15 @@
<groupId>org.sakaiproject</groupId>
<artifactId>generic-dao</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
<version>3.2.3.RELEASE</version>
<version>${sakai.spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
Expand Down Expand Up @@ -90,7 +86,7 @@
<artifactId>spring-test</artifactId>
</dependency>
<dependency>
<groupId>hsqldb</groupId>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
</dependency>
<dependency>
Expand All @@ -107,7 +103,7 @@
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
<artifactId>ehcache-core</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
Expand Down
6 changes: 0 additions & 6 deletions signup/pack/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,17 @@
<name>Sakai Signup Components Pack</name>
<groupId>org.sakaiproject.signup</groupId>
<artifactId>signup-pack</artifactId>

<packaging>sakai-component</packaging>

<properties>
<deploy.target>components</deploy.target>
</properties>

<dependencies>

<!-- project dependencies -->
<dependency>
<groupId>org.sakaiproject.signup</groupId>
<artifactId>signup-impl</artifactId>
</dependency>

<!-- Sakai dependencies -->
<dependency>
<groupId>org.sakaiproject.kernel</groupId>
<artifactId>sakai-kernel-util</artifactId>
Expand All @@ -36,7 +31,6 @@
<artifactId>generic-dao</artifactId>
<scope>compile</scope>
</dependency>

</dependencies>

<build />
Expand Down
104 changes: 7 additions & 97 deletions signup/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,6 @@

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.azeckoski</groupId>
<artifactId>reflectutils</artifactId>
<version>0.9.18</version>
</dependency>
<!-- project dependencies -->
<dependency>
<groupId>${project.groupId}</groupId>
Expand All @@ -87,34 +82,22 @@
</dependency>

<!-- sakai dependencies -->
<dependency>
<groupId>org.sakaiproject</groupId>
<artifactId>sakai-calendar-api</artifactId>
<version>${sakai.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.sakaiproject.calendaring</groupId>
<artifactId>external-calendaring-service-api</artifactId>
<version>${sakai.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.sakaiproject.entitybroker</groupId>
<artifactId>entitybroker-api</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.sakaiproject.entitybroker</groupId>
<artifactId>entitybroker-utils</artifactId>
<version>${project.version}</version>
<version>${sakai.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.sakaiproject</groupId>
<artifactId>generic-dao</artifactId>
<version>0.9.18</version>
<version>${generic-dao.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -137,95 +120,22 @@
</dependency>

<!-- third party dependencies -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
<version>2.5.6.SEC01</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>3.6.10.Final</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
<version>2.7.6</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
<version>1.8.6</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.azeckoski</groupId>
<artifactId>reflectutils</artifactId>
<version>${reflectutils.version}</version>
</dependency>
<dependency>
<groupId>easymock</groupId>
<artifactId>easymock</artifactId>
<version>1.2_Java1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>2.5.6.SEC01</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>1.8.0.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
<version>1.6.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jta</groupId>
<artifactId>jta</artifactId>
<version>h2.1.8</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<version>2.1_3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
<version>1.6.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.tomahawk</groupId>
Expand Down
18 changes: 2 additions & 16 deletions signup/tool/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,13 @@
<groupId>org.sakaiproject.signup</groupId>
<artifactId>sakai-signup-tool</artifactId>
<description>Signup webapp (tool) for Sakai</description>

<packaging>war</packaging>

<dependencies>

<!-- project dependencies -->
<dependency>
<groupId>org.sakaiproject.signup</groupId>
<artifactId>signup-api</artifactId>
</dependency>

<!-- why is the impl packaged in the webapp? -->
<!--Remove it- dependency>
<groupId>org.sakaiproject.signup</groupId>
<artifactId>signup-impl</artifactId>
<scope>compile</scope>
</dependency -->

<!-- Sakai dependencies -->
<dependency>
<groupId>org.sakaiproject.kernel</groupId>
<artifactId>sakai-kernel-api</artifactId>
Expand Down Expand Up @@ -77,12 +65,12 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>3.2.3.RELEASE</version>
<version>${sakai.spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
<version>3.2.3.RELEASE</version>
<version>${sakai.spring.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Expand Down Expand Up @@ -136,7 +124,6 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>0.10.8</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
Expand All @@ -148,7 +135,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down

0 comments on commit 39f33e6

Please sign in to comment.