cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cschnei...@apache.org
Subject cxf-dosgi git commit: Update apache parent, remove duplicates
Date Mon, 10 Jul 2017 13:12:42 GMT
Repository: cxf-dosgi
Updated Branches:
  refs/heads/master 5f34bc9e1 -> 584283f3b


Update apache parent, remove duplicates


Project: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/commit/584283f3
Tree: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/tree/584283f3
Diff: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/diff/584283f3

Branch: refs/heads/master
Commit: 584283f3bd40e6ae78d5bf211acc0bca9dec4dad
Parents: 5f34bc9
Author: Christian Schneider <chris@die-schneider.net>
Authored: Mon Jul 10 15:12:23 2017 +0200
Committer: Christian Schneider <chris@die-schneider.net>
Committed: Mon Jul 10 15:12:23 2017 +0200

----------------------------------------------------------------------
 parent/pom.xml |  1 +
 pom.xml        | 96 +++++++++++++++--------------------------------------
 2 files changed, 28 insertions(+), 69 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/584283f3/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 3ce6811..2fd7989 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -52,6 +52,7 @@
         <slf4j.version>1.7.14</slf4j.version>
         <exam.version>4.8.0</exam.version>
         <baseline.skip>true</baseline.skip>
+        <topDirectoryLocation>..</topDirectoryLocation>
     </properties>
 
     <dependencyManagement>

http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/584283f3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 720b44a..da39f58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,6 +19,13 @@
 -->
 <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>org.apache</groupId>
+        <artifactId>apache</artifactId>
+        <version>18</version>
+    </parent>
+
     <groupId>org.apache.cxf.dosgi</groupId>
     <artifactId>cxf-dosgi-main</artifactId>
     <version>2.2.0-SNAPSHOT</version>
@@ -29,32 +36,14 @@
     <scm>
         <connection>scm:git:http://git-wip-us.apache.org/repos/asf/cxf-dosgi.git</connection>
         <developerConnection>scm:git:http://git-wip-us.apache.org/repos/asf/cxf-dosgi.git</developerConnection>
-      <tag>HEAD</tag>
-  </scm>
+        <tag>HEAD</tag>
+    </scm>
 
     <issueManagement>
         <system>jira</system>
         <url>https://issues.apache.org/jira/browse/DOSGI</url>
     </issueManagement>
 
-    <prerequisites>
-        <maven>3.0</maven>
-    </prerequisites>
-
-    <distributionManagement>
-        <repository>
-            <id>apache.releases.https</id>
-            <name>Apache Release Distribution Repository</name>
-            <url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
-        </repository>
-        <snapshotRepository>
-            <id>apache.snapshots.https</id>
-            <name>Apache Development Snapshot Repository</name>
-            <url>https://repository.apache.org/content/repositories/snapshots</url>
-            <uniqueVersion>false</uniqueVersion>
-        </snapshotRepository>
-    </distributionManagement>
-
     <inceptionYear>2008</inceptionYear>
     <mailingLists>
         <mailingList>
@@ -87,19 +76,6 @@
         </mailingList>
     </mailingLists>
 
-    <licenses>
-        <license>
-            <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-
-    <organization>
-        <name>The Apache Software Foundation</name>
-        <url>http://www.apache.org/</url>
-    </organization>
-
     <modules>
         <module>parent</module>
         <module>decorator</module>
@@ -111,40 +87,24 @@
         <module>itests</module>
     </modules>
 
-    <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>
-    </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>
@@ -153,12 +113,10 @@
                     <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>
+                        <releaseProfiles>apache-release</releaseProfiles>
                         <autoVersionSubmodules>true</autoVersionSubmodules>
                         <mavenExecutorId>forked-path</mavenExecutorId>
+                        <tagNameFormat>cxf-dosgi-@{project.version}</tagNameFormat>
                     </configuration>
                 </plugin>
             </plugins>


Mime
View raw message