Skip to content

Commit

Permalink
SAM-2603 Cleanup Samigo project
Browse files Browse the repository at this point in the history
- move samigo shared deploy jars to the newer sakai shared deploy
    OkiOSID
    commons-math
- remove standalone
- remove unused dirs and files from build
- reorganize the samigo-app, it produces the same exact war but
    is now better organized
- remove samigo-archive/sam-handlers in favor of samigo-import
- citations was also deploying OkiOSID
  • Loading branch information
ern committed Aug 3, 2015
1 parent cb90df3 commit 17ea12f
Show file tree
Hide file tree
Showing 88 changed files with 465 additions and 7,598 deletions.
1 change: 0 additions & 1 deletion citations/citations-api/api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
<dependency>
<groupId>OKI</groupId>
<artifactId>OkiOSID</artifactId>
<version>2.0</version>
</dependency>
</dependencies>
<build>
Expand Down
1 change: 0 additions & 1 deletion citations/citations-impl/impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
<dependency>
<groupId>OKI</groupId>
<artifactId>OkiOSID</artifactId>
<version>2.0</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Expand Down
1 change: 0 additions & 1 deletion citations/citations-osid/web2bridge/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
<dependency>
<groupId>OKI</groupId>
<artifactId>OkiOSID</artifactId>
<version>2.0</version>
</dependency>
<dependency>
<groupId>zing</groupId>
Expand Down
1 change: 0 additions & 1 deletion citations/citations-osid/xserver/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
<dependency>
<groupId>OKI</groupId>
<artifactId>OkiOSID</artifactId>
<version>2.0</version>
</dependency>
<!--${sakai.ehcache.groupId}${sakai.ehcache.artifactId}${sakai.ehcache.version}-->
</dependencies>
Expand Down
44 changes: 0 additions & 44 deletions citations/citations-shared-deploy/pom.xml

This file was deleted.

1 change: 0 additions & 1 deletion citations/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
<module>citations-osid/xserver</module>
<module>citations-impl/impl</module>
<module>citations-impl/pack</module>
<module>citations-shared-deploy</module>
</modules>

<dependencyManagement>
Expand Down
14 changes: 14 additions & 0 deletions deploy/shared/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -240,5 +240,19 @@
<version>${sakai.jackson.version}</version>
<scope>compile</scope>
</dependency>

<!-- Samigo shared dependencies -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math</artifactId>
<version>${sakai.commons-math.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>OKI</groupId>
<artifactId>OkiOSID</artifactId>
<version>${sakai.okiosid.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>
10 changes: 9 additions & 1 deletion master/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
<sakai.commons.lang3.version>3.4</sakai.commons.lang3.version>
<sakai.commons-logging.version>1.2</sakai.commons-logging.version>
<sakai.commons.fileupload.version>1.3.1</sakai.commons.fileupload.version>
<sakai.commons-math.version>2.2</sakai.commons-math.version>
<sakai.ehcache.groupId>net.sf.ehcache</sakai.ehcache.groupId>
<sakai.ehcache.artifactId>ehcache-core</sakai.ehcache.artifactId>
<sakai.ehcache.version>2.6.6</sakai.ehcache.version>
Expand Down Expand Up @@ -121,6 +122,7 @@
<sakai.log4j.version>1.2.17</sakai.log4j.version>
<sakai.slf4j.version>1.7.5</sakai.slf4j.version>
<sakai.poi.version>3.12</sakai.poi.version>
<sakai.okiosid.version>2.0</sakai.okiosid.version>
<rsfutil.version>0.8.1-SNAPSHOT</rsfutil.version>
<sakairsf.components.version>11-SNAPSHOT</sakairsf.components.version>
<sakairsf.version>11-SNAPSHOT</sakairsf.version>
Expand Down Expand Up @@ -554,6 +556,12 @@
<version>${sakai.commons.lang3.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math</artifactId>
<version>${sakai.commons-math.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>zing</groupId>
<artifactId>cql-java-0.7</artifactId>
Expand Down Expand Up @@ -746,7 +754,7 @@
<dependency>
<groupId>OKI</groupId>
<artifactId>OkiOSID</artifactId>
<version>2.0</version>
<version>${sakai.okiosid.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
7 changes: 0 additions & 7 deletions samigo/.mymetadata

This file was deleted.

11 changes: 0 additions & 11 deletions samigo/.mystrutsdata

This file was deleted.

2 changes: 0 additions & 2 deletions samigo/.xdoclet

This file was deleted.

117 changes: 0 additions & 117 deletions samigo/README.txt

This file was deleted.

61 changes: 0 additions & 61 deletions samigo/build.xml

This file was deleted.

Loading

0 comments on commit 17ea12f

Please sign in to comment.