aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cschnei...@apache.org
Subject [1/2] aries-rsa git commit: Using apache defaults for release
Date Wed, 06 Jul 2016 15:53:02 GMT
Repository: aries-rsa
Updated Branches:
  refs/heads/testrelease [created] 6e21eafd4


Using apache defaults for release


Project: http://git-wip-us.apache.org/repos/asf/aries-rsa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-rsa/commit/d674ad45
Tree: http://git-wip-us.apache.org/repos/asf/aries-rsa/tree/d674ad45
Diff: http://git-wip-us.apache.org/repos/asf/aries-rsa/diff/d674ad45

Branch: refs/heads/testrelease
Commit: d674ad45eda2cdb5e31263bf2068f1ae6da2cb45
Parents: fe14770
Author: Christian Schneider <chris@die-schneider.net>
Authored: Wed Jul 6 17:51:36 2016 +0200
Committer: Christian Schneider <chris@die-schneider.net>
Committed: Wed Jul 6 17:51:36 2016 +0200

----------------------------------------------------------------------
 parent/pom.xml | 83 +++++++++++++++++++++++++++++++++++------------------
 pom.xml        | 52 ---------------------------------
 2 files changed, 55 insertions(+), 80 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d674ad45/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index f6d9104..a4ad615 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -219,6 +219,20 @@
                          <additionalparam>-Xdoclint:none</additionalparam>
                      </configuration>
                  </plugin>
+                 <plugin>
+                     <groupId>org.apache.maven.plugins</groupId>
+                     <artifactId>maven-release-plugin</artifactId>
+                     <version>2.5.2</version>
+                     <configuration>
+                         <useReleaseProfile>false</useReleaseProfile>
+                         <preparationGoals>clean install</preparationGoals>
+                         <goals>deploy</goals>
+                         <arguments>-Prelease,deploy</arguments>
+                         <autoVersionSubmodules>true</autoVersionSubmodules>
+                         <mavenExecutorId>forked-path</mavenExecutorId>
+                         <tagNameFormat>org.apache.aries.rsa-@{project.version}</tagNameFormat>
+                     </configuration>
+                 </plugin>
 
             </plugins>
         </pluginManagement>
@@ -252,6 +266,47 @@
         </plugins>
     </build>
 
+    <profiles>
+        <profile>
+            <id>deploy</id>
+            <properties>
+                <createSourceJar>true</createSourceJar>
+            </properties>
+            <build>
+                <defaultGoal>deploy</defaultGoal>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>attach-sources</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <configuration>
+                            <source>1.7</source>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>attach-javadocs</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
     <repositories>
         <repository>
             <id>apache.snapshots</id>
@@ -282,32 +337,4 @@
         </pluginRepository>
     </pluginRepositories>
 
-    <profiles>
-        <profile>
-            <id>release-sign-artifacts</id>
-            <activation>
-                <property>
-                    <name>performRelease</name>
-                    <value>true</value>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>sign-artifacts</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/d674ad45/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ecbb9cd..d59b69c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,35 +90,6 @@
 
     <profiles>
         <profile>
-            <id>release</id>
-            <build>
-                <plugins>
-                    <!-- We want to deploy the artifact to a staging location for perusal
-->
-                    <plugin>
-                        <inherited>true</inherited>
-                        <artifactId>maven-deploy-plugin</artifactId>
-                        <version>2.6</version>
-                        <configuration>
-                            <altDeploymentRepository>${deploy.altRepository}</altDeploymentRepository>
-                            <updateReleaseInfo>true</updateReleaseInfo>
-                        </configuration>
-                    </plugin>
-                    <!-- We want to sign the artifact, the POM, and all attached artifacts
-->
-                    <plugin>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.3</version>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
             <id>rat</id>
             <build>
                 <plugins>
@@ -175,29 +146,6 @@
         </profile>
     </profiles>
 
-    <build>
-        <defaultGoal>install</defaultGoal>
-
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-release-plugin</artifactId>
-                    <version>2.5.2</version>
-                    <configuration>
-                        <useReleaseProfile>false</useReleaseProfile>
-                        <preparationGoals>clean install</preparationGoals>
-                        <goals>deploy</goals>
-                        <arguments>-Prelease,deploy</arguments>
-                        <autoVersionSubmodules>true</autoVersionSubmodules>
-                        <mavenExecutorId>forked-path</mavenExecutorId>
-                        <tagNameFormat>org.apache.aries.rsa-@{project.version}</tagNameFormat>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
     <reporting>
         <plugins>
             <plugin>


Mime
View raw message