Commits

Samuel Le Berrigaud -=[Atlassian]=-  committed d26f039

APL-67: Re-organised the pom.xml (a little) and updated to use AMPS for bulding plugins.

  • Participants
  • Parent commits 95b67f6

Comments (0)

Files changed (9)

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-      <groupId>com.atlassian.pom</groupId>
-      <artifactId>atlassian-public-pom</artifactId>
-      <version>20</version>
-  </parent>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.atlassian.pom</groupId>
+        <artifactId>atlassian-public-pom</artifactId>
+        <version>20</version>
+    </parent>
 
-  <groupId>com.atlassian.applinks</groupId>
-  <artifactId>applinks-parent</artifactId>
-  <version>2.1.0-SNAPSHOT</version>
-  <name>Application Links Parent POM</name>
-  <packaging>pom</packaging>
+    <groupId>com.atlassian.applinks</groupId>
+    <artifactId>applinks-parent</artifactId>
+    <version>2.1.0-SNAPSHOT</version>
+    <name>Application Links Parent POM</name>
+    <packaging>pom</packaging>
 
-  <modules>
-      <module>applinks-api</module>
-      <module>applinks-core</module>
-      <module>applinks-refapp-plugin</module>
-      <module>applinks-confluence-plugin</module>
-      <module>applinks-fisheye-plugin</module>
-      <module>applinks-bamboo-plugin</module>
-      <module>applinks-legacyjira-plugin</module>
-      <module>applinks-package</module>
-  </modules>
+    <modules>
+        <module>applinks-api</module>
+        <module>applinks-core</module>
+        <module>applinks-refapp-plugin</module>
+        <module>applinks-confluence-plugin</module>
+        <module>applinks-fisheye-plugin</module>
+        <module>applinks-bamboo-plugin</module>
+        <module>applinks-legacyjira-plugin</module>
+        <module>applinks-package</module>
+    </modules>
 
-
-  <build>
-      <resources>
-          <resource>
-             <directory>src/main/resources</directory>
-              <filtering>true</filtering>
-              <includes>
-                  <include>atlassian-plugin.xml</include>
-              </includes>
-          </resource>
-          <resource>
-              <directory>src/main/resources</directory>
-              <filtering>false</filtering>
-              <excludes>
-                  <exclude>atlassian-plugin.xml</exclude>
-              </excludes>
-          </resource>
-      </resources>
-  </build>
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>com.atlassian.maven.plugins</groupId>
+                    <artifactId>maven-refapp-plugin</artifactId>
+                    <version>3.0-beta1</version>
+                    <extensions>true</extensions>
+                    <configuration>
+                        <!--  TODO, enable manifest validation -->
+                        <skipManifestValidation>true</skipManifestValidation>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
 
     <dependencies>
         <!-- test dependencies -->
         </dependency>
     </dependencies>
 
-  <scm>
-      <connection>scm:svn:https://studio.atlassian.com/svn/APL/trunk</connection>
-      <developerConnection>scm:svn:https://studio.atlassian.com/svn/APL/trunk</developerConnection>
-      <url>https://studio.atlassian.com/svn/APL/trunk</url>
-  </scm>
+    <scm>
+        <connection>scm:svn:https://studio.atlassian.com/svn/APL/trunk</connection>
+        <developerConnection>scm:svn:https://studio.atlassian.com/svn/APL/trunk</developerConnection>
+        <url>https://studio.atlassian.com/svn/APL/trunk</url>
+    </scm>
 
     <properties>
-        <jdkLevel>1.5</jdkLevel>
         <sal.version>2.0.0</sal.version>
-        <fisheye-jar.version>2.0-410</fisheye-jar.version>
+        <fisheye.version>2.0-410</fisheye.version>
         <confluence.version>2.10.2</confluence.version>
-        <jira.version>3.13</jira.version>
         <bamboo.version>2.3-m6</bamboo.version>
+        <jira.version>4.0.0-Beta3</jira.version>
+        <jira.legacy.version>3.13</jira.legacy.version>
     </properties>
-</project>
+</project>