[JENKINS-35088] Migrate to new parent pom

jenkinsci · May 24, 2016 · 9a63245 · 9a63245
1 parent 1ff6063
commit 9a63245
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 47 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>1.509</version>
+    <version>2.9</version>
   </parent>
 
   <artifactId>mapdb-api</artifactId>
@@ -34,10 +34,6 @@
     </developer>
   </developers>
 
-  <prerequisites>
-    <maven>2.2.1</maven>
-  </prerequisites>
-
   <scm>
     <connection>scm:git:git://github.com/jenkinsci/mapdb-api-plugin.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/mapdb-api-plugin.git</developerConnection>
@@ -46,22 +42,21 @@
   </scm>
 
   <properties>
-    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <project.build.outputEncoding>UTF-8</project.build.outputEncoding>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <jenkins.version>1.565</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>
 
@@ -77,41 +72,4 @@
     <!-- test dependencies -->
   </dependencies>
 
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-enforcer-plugin</artifactId>
-          <version>1.2</version>
-          <executions>
-            <execution>
-              <id>enforce-maven</id>
-              <goals>
-                <goal>enforce</goal>
-              </goals>
-              <configuration>
-                <rules>
-                  <requireMavenVersion>
-                    <version>(,2.1.0),(2.1.0,2.2.0),(2.2.0,)</version>
-                    <message>Maven 2.1.0 and 2.2.0 produce incorrect GPG signatures and checksums respectively.</message>
-                  </requireMavenVersion>
-                  <requireMavenVersion>
-                    <version>(,3.0),[3.0.4,)</version>
-                    <message>Maven 3.0 through 3.0.3 inclusive do not pass correct settings.xml to Maven Release Plugin.</message>
-                  </requireMavenVersion>
-                </rules>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-    <plugins>
-      <plugin>
-        <artifactId>maven-release-plugin</artifactId>
-        <version>2.5.1</version>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>
diff --git a/src/main/resources/index.jelly b/src/main/resources/index.jelly
@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <div>
   This plugin provides a shared dependency on the <a href="http://www.mapdb.org">MapDB</a> library so that other plugins can co-operate when using this library.
 </div>