[JENKINS-34877] Migrate to 2.9 parent pom. Fix PCT against 2.x baseline

jenkinsci · May 17, 2016 · c0250cd · c0250cd
1 parent 792b70b
commit c0250cd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,6 @@ target
 work
 .idea/
 *.iml
+.classpath
+.project
+.settings
diff --git a/pom.xml b/pom.xml
@@ -3,9 +3,8 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>1.580.1</version>
+        <version>2.9</version>
     </parent>
-    <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plain-credentials</artifactId>
     <version>1.2-SNAPSHOT</version>
     <packaging>hpi</packaging>
@@ -18,12 +17,17 @@
             <url>http://repo.jenkins-ci.org/public/</url>
         </repository>
     </repositories>
+
     <pluginRepositories>
         <pluginRepository>
             <id>repo.jenkins-ci.org</id>
             <url>http://repo.jenkins-ci.org/public/</url>
         </pluginRepository>
     </pluginRepositories>
+    <properties>
+        <jenkins.version>1.580.1</jenkins.version>
+        <java.level>6</java.level>
+    </properties>
     <licenses>
         <license>
             <name>MIT</name>
@@ -35,27 +39,20 @@
         <developerConnection>scm:git:git@github.com:jenkinsci/${project.artifactId}-plugin.git</developerConnection>
         <url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
       <tag>HEAD</tag>
-  </scm>
+    </scm>
     <dependencies>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>credentials</artifactId>
             <version>1.21</version>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     <build>
         <plugins>
             <plugin>
                 <groupId>org.jenkins-ci.tools</groupId>
                 <artifactId>maven-hpi-plugin</artifactId>
                 <configuration>
-                    <compatibleSinceVersion>1.0-beta-4</compatibleSinceVersion>
                     <loggers>
                         <org.jenkinsci.plugins.plaincredentials>FINE</org.jenkinsci.plugins.plaincredentials>
                     </loggers>

diff --git a/src/main/resources/index.jelly b/src/main/resources/index.jelly
@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <div>
     Allows use of plain strings and files as credentials.
 </div>