...
| Code Block |
|---|
|
<parent>
<artifactId>sakai-standard-tool</artifactId>
<groupId>org.sakaiproject.purepoms</groupId>
<version>2.7.0-build02-SNAPSHOT</version>
<!--
<artifactId>master</artifactId>
<groupId>org.sakaiproject</groupId>
<version>2.7.0-SNAPSHOT</version>
-->
</parent>
|
Profile cleanup
Remove all "K1" and "pre-K1" build profiles as they are not required for Sitestats 2.1.
base pom <dependencyManagement> cleanup
Remove redundant dependencies and add versions for Sakai-specific dependencies
| Code Block |
|---|
|
<dependencyManagement>
<dependencies>
<!-- Sakai other -->
<dependency>
<groupId>org.sakaiproject</groupId>
<artifactId>sakai-comp-shared-scheduler</artifactId>
<version>2.7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.sakaiproject</groupId>
<artifactId>sakai-mock</artifactId>
<version>2.7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.sakaiproject</groupId>
<artifactId>sakai-scheduler-api</artifactId>
<version>2.7.0-SNAPSHOT</version>
</dependency>
<!-- Remove these redundant testing dependencies -->
<!--
<dependency>
<groupId>${sakai.spring.groupId}</groupId>
<artifactId>${sakai.spring.test.artifactId}</artifactId>
<version>${sakai.spring.test.version}</version>
</dependency>
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>${hsqldb.version}</version>
</dependency>
<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
<version>${dom4j.version}</version>
</dependency>
<dependency>
<groupId>jta</groupId>
<artifactId>jta</artifactId>
<version>${jta.version}</version>
</dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<version>${cglib-nodep.version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>${commons-codec.version}</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>${commons-collection.version}</version>
</dependency>
<dependency>
<groupId>${sakai.ehcache.groupId}</groupId>
<artifactId>${sakai.ehcache.artifactId}</artifactId>
<version>${sakai.ehcache.version}</version>
</dependency>
-->
</dependencies>
</dependencyManagement>
|
Redundant properties
parent: master
...
| Code Block |
|---|
|
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
</dependency>
<!-- Test -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
<scope>test</scope>
</dependency>
|
Remove versions (K1 inheritance)
sitestats-impl pom
| Code Block |
|---|
|
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<!-- <version>${sakai.servletapi.version}</version> -->
<scope>test</scope>
</dependency>
|
sitestats-impl pom
Explicit versions defined (ex-master inheritance)
| Code Block |
|---|
|
<dependency>
<groupId>quartz</groupId>
<artifactId>quartz</artifactId>
<version>1.5.2</version>
<scope>provided</scope>
</dependency>
|