aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cschnei...@apache.org
Subject aries-rsa git commit: Fix pom for release
Date Sat, 01 Jul 2017 12:02:03 GMT
Repository: aries-rsa
Updated Branches:
  refs/heads/master 9f15e0b03 -> bbec05093


Fix pom 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/bbec0509
Tree: http://git-wip-us.apache.org/repos/asf/aries-rsa/tree/bbec0509
Diff: http://git-wip-us.apache.org/repos/asf/aries-rsa/diff/bbec0509

Branch: refs/heads/master
Commit: bbec05093c76b89722b5b847e1716fd9f27cfc85
Parents: 9f15e0b
Author: Christian Schneider <chris@die-schneider.net>
Authored: Sat Jul 1 14:01:56 2017 +0200
Committer: Christian Schneider <chris@die-schneider.net>
Committed: Sat Jul 1 14:01:56 2017 +0200

----------------------------------------------------------------------
 pom.xml | 105 +++++++++++++++++++++--------------------------------------
 1 file changed, 38 insertions(+), 67 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/bbec0509/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c56d297..3d3e93c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,35 +92,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>
@@ -155,13 +126,16 @@
                                 <exclude>**/.classpath</exclude>
                                 <exclude>**/.settings/**</exclude>
                                 <exclude>**/eclipse-classes/**/*</exclude>
-                                <!-- manifest files don't support comments so don't contain
the ASL2.0 header -->
+                                <!-- manifest files don't support comments 
+                                    so don't contain the ASL2.0 header -->
                                 <exclude>**/APPLICATION.MF</exclude>
                                 <exclude>**/MANIFEST.MF</exclude>
                                 <exclude>**/*.MF</exclude>
-                                <!--RAT doesn't seem to recognize MIT style licenses -->
+                                <!--RAT doesn't seem to recognize MIT style 
+                                    licenses -->
                                 <exclude>manual/src/styles/print.css</exclude>
-                                <!-- RAT doesn't recognize BSD license in transaction-manager
logger -->
+                                <!-- RAT doesn't recognize BSD license in 
+                                    transaction-manager logger -->
                                 <exclude>**/objectweb/howl/log/Logger.java</exclude>
                                 <exclude>.gitignore</exclude>
                                 <exclude>osgi.bnd</exclude>
@@ -177,41 +151,38 @@
         </profile>
     </profiles>
 
-	<build>
-		<defaultGoal>install</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>
-		</plugins>
-		<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>
+    <build>
+        <defaultGoal>install</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>
+        </plugins>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-release-plugin</artifactId>
+                    <version>2.5.2</version>
+                    <configuration>
+                        <releaseProfiles>apache-release</releaseProfiles>
+                        <autoVersionSubmodules>true</autoVersionSubmodules>
+                        <mavenExecutorId>forked-path</mavenExecutorId>
+                        <tagNameFormat>org.apache.aries.rsa-@{project.version}</tagNameFormat>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
 
     <reporting>
         <plugins>


Mime
View raw message