Skip to content

Commit

Permalink
Merge pull request #3 from lewismc/ISSUE-2
Browse files Browse the repository at this point in the history
ISSUE-2 Upgrade OODT to 1.2.1
  • Loading branch information
lewismc authored Feb 8, 2018
2 parents 054de86 + 92ef84e commit 33affb4
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
20 changes: 10 additions & 10 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<oodt.version>1.0</oodt.version>
<oodt.pge.version>1.0</oodt.pge.version>
<oodt.version>1.2.1</oodt.version>
<oodt.pge.version>1.2.1</oodt.pge.version>
<!-- Maven plugin dependencies -->
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
<maven-jar-plugin.version>2.5</maven-jar-plugin.version>
<maven-javadoc-plugin.version>2.10.1</maven-javadoc-plugin.version>
<maven-eclipse-plugin.version>2.9</maven-eclipse-plugin.version>
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
<maven-surefire-plugin.version>2.20.1</maven-surefire-plugin.version>
<maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
<maven-javadoc-plugin.version>3.0.0</maven-javadoc-plugin.version>
<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
</properties>

<repositories>
Expand Down Expand Up @@ -77,8 +77,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -137,4 +137,4 @@
<module>distribution</module>
<module>webapps</module>
</modules>
</project>
</project>
4 changes: 2 additions & 2 deletions webapps/opsui/src/main/webapp/META-INF/context.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ the License.
value="[PCS_HOME]/policy/pcs-workflow-statuses.xml"/>

<Parameter name="ganglia.url" value="[GANGLIA_URL]"/>
<Parameter name="contact.email" value="[email protected]"/>
<Parameter name="contact.email" value="[email protected]"/>

<Parameter name="org.apache.oodt.pcs.trace.excludeList"
value=""/>
Expand All @@ -58,7 +58,7 @@ the License.
"classic" => The original, OCO (Orbiting Carbon Observatory) skin for OPSUI
OR add your own!
-->
<Parameter name="opsui.skin" value="cleanwhite"/>
<Parameter name="opsui.skin" value="navyblue"/>
<Parameter name="opsui.homepage" value="org.apache.oodt.pcs.opsui.HomePage"/>

</Context>

0 comments on commit 33affb4

Please sign in to comment.