add some missing release bits, formatting

git-svn-id: https://svn.apache.org/repos/asf/archiva/parent@655387 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/pom.xml b/pom.xml
index 278eff2aa444add8a3309f8799963b8bf4521533..e966e0f294048561d8c8297f472d9c3e69d6201c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -93,15 +93,6 @@
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/archiva/parent</developerConnection>
     <url>http://svn.apache.org/viewcvs.cgi/archiva/parent</url>
   </scm>
-
-  <distributionManagement>
-    <repository>
-      <id>archiva.staging</id>
-      <url>scp://people.apache.org/www/people.apache.org/builds/archiva/${project.version}/staging-repo</url>
-    </repository>
-  </distributionManagement>
-
-
   <properties>
     <siteBaseDeployment>scp://people.apache.org/www/archiva.apache.org</siteBaseDeployment>
   </properties>
@@ -152,12 +143,39 @@
               </execution>
             </executions>
           </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-deploy-plugin</artifactId>
+            <configuration>
+              <altDeploymentRepository>${deploy.altRepository}</altDeploymentRepository>
+              <updateReleaseInfo>true</updateReleaseInfo>
+            </configuration>
+          </plugin>
         </plugins>
       </build>
     </profile>
   </profiles>
 
   <build>
+    <plugins>
+      <!-- We want to package up license resources in the JARs produced -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>process</goal>
+            </goals>
+            <configuration>
+              <resourceBundles>
+                <resourceBundle>org.apache:apache-jar-resource-bundle:1.3</resourceBundle>
+              </resourceBundles>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
     <pluginManagement>
       <plugins>
         <!-- set versions of common plugins for reproducibility, ordered alphabetically -->
@@ -166,24 +184,24 @@
           <artifactId>maven-clean-plugin</artifactId>
           <version>2.2</version>
         </plugin>
-               <plugin>
-                 <groupId>org.apache.maven.plugins</groupId>
-                 <artifactId>maven-gpg-plugin</artifactId>
-                 <version>1.0-alpha-4</version>
-               </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-gpg-plugin</artifactId>
+          <version>1.0-alpha-4</version>
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
           <version>2.3</version>
-               </plugin>
-               <plugin>
-                 <groupId>org.apache.maven.plugins</groupId>
-                 <artifactId>maven-release-plugin</artifactId>
-                 <version>2.0-beta-7</version>
-                 <configuration>
-                       <tagBase>https://svn.apache.org/repos/asf/archiva/tags/</tagBase>
-                 </configuration>
-               </plugin>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-release-plugin</artifactId>
+          <version>2.0-beta-7</version>
+          <configuration>
+            <tagBase>https://svn.apache.org/repos/asf/archiva/tags/</tagBase>
+          </configuration>
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>