Merge branch 'sprint50'
diff --git a/org.eclipse.ote.mavenbuild/codeStyle/osee_check_style.xml b/org.eclipse.ote.mavenbuild/codeStyle/osee_check_style.xml
index 5f5f284..f231578 100644
--- a/org.eclipse.ote.mavenbuild/codeStyle/osee_check_style.xml
+++ b/org.eclipse.ote.mavenbuild/codeStyle/osee_check_style.xml
@@ -16,7 +16,6 @@
<module name="ConstantName"/>
<module name="LocalFinalVariableName"/>
<module name="LocalVariableName"/>
- <module name="MemberName"/>
<module name="MethodName"/>
<module name="PackageName"/>
<module name="ParameterName"/>
@@ -43,7 +42,6 @@
<module name="HiddenField"/>
<module name="IllegalInstantiation"/>
<module name="InnerAssignment"/>
- <module name="MagicNumber"/>
<module name="MissingSwitchDefault"/>
<module name="RedundantThrows">
<property name="logLoadErrors" value="true"/>
@@ -51,11 +49,9 @@
</module>
<module name="SimplifyBooleanExpression"/>
<module name="SimplifyBooleanReturn"/>
- <module name="DesignForExtension"/>
<module name="FinalClass"/>
<module name="HideUtilityClassConstructor"/>
<module name="InterfaceIsType"/>
- <module name="VisibilityModifier"/>
<module name="ArrayTypeStyle"/>
<module name="UpperEll"/>
<module name="ExecutableStatementCount">
diff --git a/org.eclipse.ote.mavenbuild/codeStyle/osee_pmd_rule_set.xml b/org.eclipse.ote.mavenbuild/codeStyle/osee_pmd_rule_set.xml
index 8cf263c..857aa63 100644
--- a/org.eclipse.ote.mavenbuild/codeStyle/osee_pmd_rule_set.xml
+++ b/org.eclipse.ote.mavenbuild/codeStyle/osee_pmd_rule_set.xml
@@ -221,9 +221,6 @@
<rule ref="rulesets/naming.xml/SuspiciousHashcodeMethodName">
<priority>3</priority>
</rule>
- <rule ref="rulesets/naming.xml/SuspiciousConstantFieldName">
- <priority>3</priority>
- </rule>
<rule ref="rulesets/migrating.xml/ReplaceVectorWithList">
<priority>3</priority>
</rule>
diff --git a/org.eclipse.ote.mavenbuild/pom.xml b/org.eclipse.ote.mavenbuild/pom.xml
index 8c18e69..9d73157 100644
--- a/org.eclipse.ote.mavenbuild/pom.xml
+++ b/org.eclipse.ote.mavenbuild/pom.xml
@@ -19,6 +19,7 @@
<eclipse-site>http://download.eclipse.org/releases/${platform-version-name}</eclipse-site>
<wikitext-site>http://download.eclipse.org/tools/mylyn/update/weekly</wikitext-site>
<nebula-site>http://download.eclipse.org/technology/nebula/snapshot</nebula-site>
+ <eclipse-ip-site>http://somelocallocation/org.eclipse.ip/org.eclipse.ip.p2/target/repository</eclipse-ip-site>
<maven-antrun-version>1.6</maven-antrun-version>
<ant-contrib-version>1.0b3</ant-contrib-version>
@@ -58,6 +59,11 @@
<layout>p2</layout>
<url>${osee-site}</url>
</repository>
+ <repository>
+ <id>eclipse-ip</id>
+ <layout>p2</layout>
+ <url>${eclipse-ip-site}</url>
+ </repository>
</repositories>
<profiles>
