Skip to content

Commit

Permalink
SCO-138 update poms to reference master 10.7, update project version …
Browse files Browse the repository at this point in the history 
…to 10.7 (#18)
  • Loading branch information
@bjones86
bjones86 committed Apr 27, 2016
1 parent 0222f91 commit 5d2fd58
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 129 deletions.
22 changes: 2 additions & 20 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
<groupId>org.sakaiproject</groupId>
<artifactId>master</artifactId>
<relativePath>../master/pom.xml</relativePath>
<version>10-SNAPSHOT</version>
<version>10.7</version>
</parent>

<name>Sakai SCORM Project</name>
<artifactId>sakai-scorm-base</artifactId>
<version>10-SNAPSHOT</version>
<version>10.7</version>
<packaging>pom</packaging>
<organization>
<name>Sakai Project</name>
Expand Down Expand Up @@ -96,24 +96,6 @@
<autoVersionSubmodules>true</autoVersionSubmodules>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>1.8</version>
<configuration>
<licenseName>ecl_v2</licenseName>
<licenseResolver>classpath://org/sakaiproject</licenseResolver>
<addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>

</configuration>
<dependencies>
<dependency>
<groupId>org.sakaiproject.license</groupId>
<artifactId>ecl-license</artifactId>
<version>1.0</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</project>
16 changes: 1 addition & 15 deletions scorm-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.sakaiproject</groupId>
<artifactId>sakai-scorm-base</artifactId>
<version>10-SNAPSHOT</version>
<version>10.7</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -62,19 +62,5 @@
</includes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>check-file-header</goal>
</goals>
<phase>process-sources</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
19 changes: 1 addition & 18 deletions scorm-impl/adl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.sakaiproject</groupId>
<artifactId>sakai-scorm-base</artifactId>
<version>10-SNAPSHOT</version>
<version>10.7</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -81,21 +81,4 @@
<type>jar</type>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>check-file-header</goal>
</goals>
<phase>process-sources</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
2 changes: 1 addition & 1 deletion scorm-impl/client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.sakaiproject</groupId>
<artifactId>sakai-scorm-base</artifactId>
<version>10-SNAPSHOT</version>
<version>10.7</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
14 changes: 1 addition & 13 deletions scorm-impl/content/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.sakaiproject</groupId>
<artifactId>sakai-scorm-base</artifactId>
<version>10-SNAPSHOT</version>
<version>10.7</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -86,18 +86,6 @@
</systemProperties>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>check-file-header</goal>
</goals>
<phase>process-sources</phase>
</execution>
</executions>
</plugin>
</plugins>
<resources>
<resource>
Expand Down
16 changes: 1 addition & 15 deletions scorm-impl/model/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.sakaiproject</groupId>
<artifactId>sakai-scorm-base</artifactId>
<version>10-SNAPSHOT</version>
<version>10.7</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -126,19 +126,5 @@
</includes>
</testResource>
</testResources>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>check-file-header</goal>
</goals>
<phase>process-sources</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
19 changes: 1 addition & 18 deletions scorm-impl/pack/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.sakaiproject</groupId>
<artifactId>sakai-scorm-base</artifactId>
<version>10-SNAPSHOT</version>
<version>10.7</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -69,21 +69,4 @@
<scope>runtime</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>check-file-header</goal>
</goals>
<phase>process-sources</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
16 changes: 1 addition & 15 deletions scorm-impl/service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.sakaiproject</groupId>
<artifactId>sakai-scorm-base</artifactId>
<version>10-SNAPSHOT</version>
<version>10.7</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -95,19 +95,5 @@
</includes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>check-file-header</goal>
</goals>
<phase>process-sources</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
14 changes: 1 addition & 13 deletions scorm-tool/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.sakaiproject</groupId>
<artifactId>sakai-scorm-base</artifactId>
<version>10-SNAPSHOT</version>
<version>10.7</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -185,18 +185,6 @@
<artifactId>maven-war-plugin</artifactId>
<version>2.1.1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>check-file-header</goal>
</goals>
<phase>process-sources</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
2 changes: 1 addition & 1 deletion wicket-tool/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.sakaiproject</groupId>
<artifactId>sakai-scorm-base</artifactId>
<version>10-SNAPSHOT</version>
<version>10.7</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down

0 comments on commit 5d2fd58

Please sign in to comment.