directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject [directory-buildtools] 01/03: Add aggregator pom, use as parent, update version number
Date Sun, 29 Oct 2017 09:07:43 GMT
This is an automated email from the ASF dual-hosted git repository.

seelmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-buildtools.git

commit 3a8b3e28d47d45b39c53ddf71cb5c8fa5ad5d6f5
Author: Stefan Seelmann <mail@stefan-seelmann.de>
AuthorDate: Sat Oct 28 17:15:47 2017 +0200

    Add aggregator pom, use as parent, update version number
---
 checkstyle-configuration/pom.xml            | 32 +++--------------------
 junit-addons/pom.xml                        | 27 +++----------------
 checkstyle-configuration/pom.xml => pom.xml | 24 ++++++++++-------
 skins/apacheds-skin/pom.xml                 |  4 +--
 skins/api-skin/pom.xml                      |  4 +--
 skins/pom.xml                               | 40 ++++-------------------------
 skins/studio-skin/pom.xml                   |  4 +--
 skins/triplesec-skin/pom.xml                |  4 +--
 8 files changed, 36 insertions(+), 103 deletions(-)

diff --git a/checkstyle-configuration/pom.xml b/checkstyle-configuration/pom.xml
index 47d89c7..8a93273 100644
--- a/checkstyle-configuration/pom.xml
+++ b/checkstyle-configuration/pom.xml
@@ -22,44 +22,20 @@
 <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.directory.project</groupId>
-    <artifactId>project</artifactId>
-    <version>34</version>
-    <relativePath />
+    <groupId>org.apache.directory.buildtools</groupId>
+    <artifactId>buildtools-parent</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+    <relativePath>../</relativePath>
   </parent>
   
   <groupId>org.apache.directory.buildtools</groupId>
   <artifactId>checkstyle-configuration</artifactId>
   <name>Apache Directory Checkstyle Configuration</name>
   <packaging>jar</packaging>
-  <version>0.4-SNAPSHOT</version>
 
   <description>
      Customized checkstyle configuration used by the maven-checkstyle-plugin.
   </description>
 
-  <properties>
-    <skin.version>1.0.2</skin.version>
-    <distMgmtSiteUrl>scpexe://people.apache.org/www/directory.apache.org/checkstyle-configuration/gen-docs/${project.version}/</distMgmtSiteUrl>
-  </properties>
-
-  <distributionManagement>
-    <site>
-      <id>apache.directory</id>
-      <url>${distMgmtSiteUrl}</url>
-    </site>
-  </distributionManagement>
-
-  <issueManagement>
-    <system>JIRA</system>
-    <url>http://issues.apache.org/jira/browse/DIR</url>
-  </issueManagement>
-
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/directory/buildtools/checkstyle-configuration/trunk</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/directory/buildtools/checkstyle-configuration/trunk</developerConnection>
-    <url>http://svn.apache.org/viewvc/directory/buildtools/checkstyle-configuration/trunk</url>
-  </scm>
-
 </project>
 
diff --git a/junit-addons/pom.xml b/junit-addons/pom.xml
index 6477802..ab7eae7 100644
--- a/junit-addons/pom.xml
+++ b/junit-addons/pom.xml
@@ -20,20 +20,19 @@
 <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.directory.project</groupId>
-    <artifactId>project</artifactId>
-    <version>32</version>
+    <groupId>org.apache.directory.buildtools</groupId>
+    <artifactId>buildtools-parent</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+    <relativePath>../</relativePath>
   </parent>
   
   <groupId>org.apache.directory.junit</groupId>
   <artifactId>junit-addons</artifactId>
-  <version>0.2-SNAPSHOT</version>
   <name>Apache Directory JUnit Add-ons</name>
   <packaging>bundle</packaging>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <skin.version>1.0.2</skin.version>
   </properties>
 
   <dependencies>
@@ -44,24 +43,6 @@
     </dependency>
   </dependencies>
 
-  <distributionManagement>
-    <site>
-      <id>apache.directory.buildtools.junit-addons</id>
-      <url>${distMgmtSiteUrl}</url>
-    </site>
-  </distributionManagement>
-
-  <issueManagement>
-    <system>JIRA</system>
-    <url>http://issues.apache.org/jira/browse/DIR</url>
-  </issueManagement>
-
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/directory/buildtools/junit-addons/trunk</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/directory/buildtools/junit-addons/trunk</developerConnection>
-    <url>http://svn.apache.org/viewvc/directory/buildtools/trunk/junit-addons</url>
-  </scm>
-  
   <build>
     <plugins>
       <plugin>
diff --git a/checkstyle-configuration/pom.xml b/pom.xml
similarity index 73%
copy from checkstyle-configuration/pom.xml
copy to pom.xml
index 47d89c7..5706040 100644
--- a/checkstyle-configuration/pom.xml
+++ b/pom.xml
@@ -24,18 +24,18 @@
   <parent>
     <groupId>org.apache.directory.project</groupId>
     <artifactId>project</artifactId>
-    <version>34</version>
+    <version>41</version>
     <relativePath />
   </parent>
   
   <groupId>org.apache.directory.buildtools</groupId>
-  <artifactId>checkstyle-configuration</artifactId>
-  <name>Apache Directory Checkstyle Configuration</name>
-  <packaging>jar</packaging>
-  <version>0.4-SNAPSHOT</version>
+  <artifactId>buildtools-parent</artifactId>
+  <name>Apache Directory Buildtools Parent</name>
+  <packaging>pom</packaging>
+  <version>2.0.0-SNAPSHOT</version>
 
   <description>
-     Customized checkstyle configuration used by the maven-checkstyle-plugin.
+     Custom build tools used by the Apache Directory project.
   </description>
 
   <properties>
@@ -56,10 +56,16 @@
   </issueManagement>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/directory/buildtools/checkstyle-configuration/trunk</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/directory/buildtools/checkstyle-configuration/trunk</developerConnection>
-    <url>http://svn.apache.org/viewvc/directory/buildtools/checkstyle-configuration/trunk</url>
+    <connection>scm:git:https://gitbox.apache.org/repos/asf/directory-buildtools.git</connection>
+    <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/directory-buildtools.git</developerConnection>
+    <url>https://gitbox.apache.org/repos/asf/directory-buildtools.git</url>
   </scm>
 
+  <modules>
+    <module>skins</module>
+    <module>junit-addons</module>
+    <module>checkstyle-configuration</module>
+  </modules>
+
 </project>
 
diff --git a/skins/apacheds-skin/pom.xml b/skins/apacheds-skin/pom.xml
index bf0e173..6a44c05 100644
--- a/skins/apacheds-skin/pom.xml
+++ b/skins/apacheds-skin/pom.xml
@@ -25,11 +25,11 @@ under the License.
   <parent>
     <groupId>org.apache.directory.skins</groupId>
     <artifactId>directory-parent-skin</artifactId>
-    <version>1.0.4-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>directory-skin</artifactId>
-  <name>Directory Skin</name>
+  <name>Apache Directory Server Skin</name>
   <description>Apache Directory Skin used by the ApacheDS and general projects.</description>
 
   <build>
diff --git a/skins/api-skin/pom.xml b/skins/api-skin/pom.xml
index 4651ef5..e7cdb90 100644
--- a/skins/api-skin/pom.xml
+++ b/skins/api-skin/pom.xml
@@ -25,11 +25,11 @@ under the License.
   <parent>
     <groupId>org.apache.directory.skins</groupId>
     <artifactId>directory-parent-skin</artifactId>
-    <version>1.0.4-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>directory-api-skin</artifactId>
-  <name>Directory API Skin</name>
+  <name>Apache Directory API Skin</name>
   <description>Apache Directory Skin used by the API project.</description>
 
   <build>
diff --git a/skins/pom.xml b/skins/pom.xml
index 1819439..24ec097 100644
--- a/skins/pom.xml
+++ b/skins/pom.xml
@@ -24,36 +24,22 @@ under the License.
   <inceptionYear>2009</inceptionYear>
 
   <parent>
-    <groupId>org.apache.directory.project</groupId>
-    <artifactId>project</artifactId>
-    <version>38</version>
-    <relativePath />
+    <groupId>org.apache.directory.buildtools</groupId>
+    <artifactId>buildtools-parent</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+    <relativePath>../</relativePath>
   </parent>
 
   <groupId>org.apache.directory.skins</groupId>
   <artifactId>directory-parent-skin</artifactId>
-  <version>1.0.4-SNAPSHOT</version>
-  <name>Directory Skins</name>
+  <name>Apache Directory Skins</name>
   <packaging>pom</packaging>
   <description>Apache Directory Skins used by maven site generation for the directory
projects.</description>
 
   <properties>
     <projectName>Apache Directory Skins</projectName>
-    <distMgmtSiteUrl>scpexe://people.apache.org/www/directory.apache.org/skins/gen-docs/${project.version}/</distMgmtSiteUrl>
   </properties>
 
-  <distributionManagement>
-    <site>
-      <id>apache.directory</id>
-      <url>${distMgmtSiteUrl}</url>
-    </site>
-  </distributionManagement>
-
-  <issueManagement>
-    <system>JIRA</system>
-    <url>http://issues.apache.org/jira/browse/DIR</url>
-  </issueManagement>
-
   <modules>
     <module>apacheds-skin</module>
     <module>api-skin</module>
@@ -61,12 +47,6 @@ under the License.
     <module>triplesec-skin</module>
   </modules>
 
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/directory/buildtools/skins/trunk</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/directory/buildtools/skins/trunk</developerConnection>
-    <url>http://svn.apache.org/viewvc/directory/buildtools/skins/trunk</url>
-  </scm>
-
   <build>
     <pluginManagement>
       <plugins>
@@ -98,16 +78,6 @@ under the License.
         </plugin>
       </plugins>
     </pluginManagement>
-
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-release-plugin</artifactId>
-        <configuration>
-          <tagBase>https://svn.apache.org/repos/asf/directory/skins/tags</tagBase>
-        </configuration>
-      </plugin>
-    </plugins>
   </build>
 
   <profiles>
diff --git a/skins/studio-skin/pom.xml b/skins/studio-skin/pom.xml
index 27d5e6d..a6abc78 100644
--- a/skins/studio-skin/pom.xml
+++ b/skins/studio-skin/pom.xml
@@ -25,11 +25,11 @@ under the License.
   <parent>
     <groupId>org.apache.directory.skins</groupId>
     <artifactId>directory-parent-skin</artifactId>
-    <version>1.0.4-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>directory-studio-skin</artifactId>
-  <name>Directory Studio Skin</name>
+  <name>Apache Directory Studio Skin</name>
   <description>Apache Directory Skin used by the Studio project.</description>
 
   <build>
diff --git a/skins/triplesec-skin/pom.xml b/skins/triplesec-skin/pom.xml
index e0257e4..dd9bbde 100644
--- a/skins/triplesec-skin/pom.xml
+++ b/skins/triplesec-skin/pom.xml
@@ -25,11 +25,11 @@ under the License.
   <parent>
     <groupId>org.apache.directory.skins</groupId>
     <artifactId>directory-parent-skin</artifactId>
-    <version>1.0.4-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>directory-triplesec-skin</artifactId>
-  <name>Directory TripleSec Skin</name>
+  <name>Apache Directory TripleSec Skin</name>
   <description>Apache Directory Skin used by the TripleSec project</description>
 
   <build>

-- 
To stop receiving notification emails like this one, please contact
"commits@directory.apache.org" <commits@directory.apache.org>.

Mime
View raw message