Skip to content

Commit

Permalink
DASH-372 Dashboard remove legacy profiles
Browse files Browse the repository at this point in the history 
- remove legacy 2.9 profiles
- remove unnecessary commented portions of poms
- update quartz dependency
  • Loading branch information
@ern
ern committed Apr 11, 2016
1 parent 8047b33 commit f2ec313
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 193 deletions.
5 changes: 0 additions & 5 deletions dashboard/bundles/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@
<name>dashboard - Bundles</name>
<groupId>org.sakaiproject.dash</groupId>
<artifactId>dashboard-bundles</artifactId>
<organization>
<name>The Sakai Foundation</name>
<url>http://sakaiproject.org/</url>
</organization>
<inceptionYear>2003</inceptionYear>
<packaging>jar</packaging>

<build>
Expand Down
27 changes: 1 addition & 26 deletions dashboard/hbm/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<version>12-SNAPSHOT</version>
</parent>

<name>sakai-dashboard-hbm</name>
<name>dashboard - HBM</name>
<groupId>org.sakaiproject.dash</groupId>
<artifactId>dashboard-hbm</artifactId>
<packaging>jar</packaging>
Expand Down Expand Up @@ -37,30 +37,5 @@
</includes>
</resource>
</resources>

<!--
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<phase>process-resources</phase>
<configuration>
<tasks>
<copy todir="../tool/src/ddl/">
<fileset file="src/java/org/sakaiproject/lessonbuildertool/simplepageitem.hbm.xml" />
<fileset file="src/java/org/sakaiproject/lessonbuildertool/simplepage.hbm.xml" />
<fileset file="src/java/org/sakaiproject/lessonbuildertool/simplepagelogentry.hbm.xml" />
</copy>
</tasks>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
-->
</build>
</project>
117 changes: 36 additions & 81 deletions dashboard/impl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,81 +14,42 @@
<artifactId>dashboard-impl</artifactId>

<packaging>jar</packaging>
<profiles>
<profile>
<id>sakai10</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<!-- Spring, Hibernate & Quartz -->
<dependencies>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
</dependency>
<!-- needed by hibernate unit tests -->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-ehcache</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
</dependency>
</dependencies>
</profile>

<profile>
<id>sakai2.9</id>
<dependencies>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
<version>${sakai.spring.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-mock</artifactId>
<version>2.0.8</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.opensymphony.quartz</groupId>
<artifactId>quartz</artifactId>
<version>${sakai.quartz.version}</version>
</dependency>
</dependencies>
</profile>
</profiles>

<dependencies>
<!-- project dependencies -->
<dependencies>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
</dependency>
<!-- needed by hibernate unit tests -->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-ehcache</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
</dependency>
<!-- project dependencies -->
<dependency>
<groupId>org.sakaiproject.dash</groupId>
<artifactId>dashboard-api</artifactId>
Expand Down Expand Up @@ -238,12 +199,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<!--
By default, the surefire plugin will automatically include all test classes with the following wildcard patterns:
"**/Test*.java" - includes all of its subdirectory and all java filenames that start with "Test".
"**/*Test.java" - includes all of its subdirectory and all java filenames that end with "Test".
"**/*TestCase.java" - includes all of its subdirectory and all java filenames that end with "TestCase".
-->
</plugin>
</plugins>
<testResources>
Expand Down
77 changes: 0 additions & 77 deletions dashboard/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,83 +62,6 @@
</dependencies>
</dependencyManagement>

<!--
<repositories>
<repository>
<id>sakai-maven</id>
<name>Sakai Maven Repo</name>
<layout>default</layout>
<url>http://source.sakaiproject.org/maven2</url>
<releases> </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> </snapshots>
</repository>
<repository>
<id>default</id>
<name>Maven Repository Switchboard</name>
<layout>default</layout>
<url>http://repo1.maven.org/maven2</url>
<releases> </releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>projectlombok.org</id>
<url>http://projectlombok.org/mavenrepo</url>
</repository>
<repository>
<id>sonatype-nexus-snapshots</id>
<name>Sonatype Nexus Snapshots</name>
<url>
https://oss.sonatype.org/content/repositories/snapshots
</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>maven2-central-repo</id>
<name>Maven2 Central Repo</name>
<url>http://repo1.maven.org/maven2/</url>
<releases> </releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>Sakai Plugin Repo</id>
<url>http://source.sakaiproject.org/maven2</url>
<releases> </releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<name>oss.sonatype.org - github-releases</name>
<id>oss.sonatype.org-github-releases</id>
<url>http://oss.sonatype.org/content/repositories/github-releases</url>
</pluginRepository>
</pluginRepositories>
-->

<modules>
<module>app</module>
<module>bundles</module>
Expand Down
4 changes: 0 additions & 4 deletions dashboard/util/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@
<packaging>jar</packaging>

<dependencies>

<!-- project dependencies -->

<!-- Sakai dependencies -->
<dependency>
<groupId>org.sakaiproject.kernel</groupId>
<artifactId>sakai-kernel-api</artifactId>
Expand Down

0 comments on commit f2ec313

Please sign in to comment.