[JENKINS-34713] Upgrade to 2.7 parent pom. Fix tests.

jenkinsci · May 10, 2016 · 89e80ec · 89e80ec
1 parent e87edf2
commit 89e80ec
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 38 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,65 +3,38 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>1.580</version>
+    <version>2.7</version>
   </parent>
 
   <artifactId>translation</artifactId>
   <version>1.15-SNAPSHOT</version>
   <packaging>hpi</packaging>
   <name>Jenkins Translation Assistance plugin</name>
-  <url>http://wiki.jenkins-ci.org/display/JENKINS/Translation+Assistance+Plugin</url>
+  <url>https://wiki.jenkins-ci.org/display/JENKINS/Translation+Assistance+Plugin</url>
 
   <scm>
     <connection>scm:git:git://github.com/jenkinsci/${project.artifactId}-plugin.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/${project.artifactId}-plugin.git</developerConnection>
-    <url>http://github.com/jenkinsci/${project.artifactId}-plugin</url>
+    <url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
     <tag>HEAD</tag>
   </scm>
 
-  <dependencies>
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>annotations</artifactId>
-      <version>3.0.0</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <version>3.0.1</version>
-        <configuration>
-          <xmlOutput>true</xmlOutput>
-          <failOnError>true</failOnError>
-        </configuration>
-        <executions>
-          <execution>
-            <id>run-findbugs</id>
-            <phase>verify</phase> 
-            <goals>
-              <goal>check</goal> 
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
+  <properties>
+     <jenkins.version>1.580</jenkins.version>
+     <java.level>6</java.level>
+   </properties>
 
   <repositories>
     <repository>
       <id>repo.jenkins-ci.org</id>
-      <url>http://repo.jenkins-ci.org/public/</url>
+      <url>https://repo.jenkins-ci.org/public/</url>
     </repository>
   </repositories>
 
   <pluginRepositories>
     <pluginRepository>
       <id>repo.jenkins-ci.org</id>
-      <url>http://repo.jenkins-ci.org/public/</url>
+      <url>https://repo.jenkins-ci.org/public/</url>
     </pluginRepository>
   </pluginRepositories>
 </project>  

diff --git a/src/main/resources/hudson/plugins/translation/L10nDecorator/dialog.jelly b/src/main/resources/hudson/plugins/translation/L10nDecorator/dialog.jelly
@@ -25,6 +25,7 @@ THE SOFTWARE.
 <!--
   Called from the dialog.js to render the dialog content HTML
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:f="/lib/form">
   <l:ajax>
     <style>

diff --git a/src/main/resources/hudson/plugins/translation/L10nDecorator/footer.jelly b/src/main/resources/hudson/plugins/translation/L10nDecorator/footer.jelly
@@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
-
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout">
 <l:hasPermission permission="${app.READ}">
   <!-- content of the dialog will be populated when the dialog is opened -->

diff --git a/src/main/resources/hudson/plugins/translation/L10nDecorator/header.jelly b/src/main/resources/hudson/plugins/translation/L10nDecorator/header.jelly
@@ -21,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout">
   <j:set var="_" value="${it.startRecording(request)}"/>
   <l:yui module="cookie" suffix='-beta' />

diff --git a/src/main/resources/hudson/plugins/translation/L10nDecorator/text.jelly b/src/main/resources/hudson/plugins/translation/L10nDecorator/text.jelly
@@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
-
+<?jelly escape-by-default='true'?>
 <!--
   Render the main portion of the dialog that shows English text and localized texts
 -->