You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2015/01/12 00:54:21 UTC
directory-kerberos git commit: Bumped up to the latest dependencies
version; Added properties for some of the dependencies in teh top evel pom;
Added some missing plugin definition in the PluginManagements part in the main
pom.xml;
Repository: directory-kerberos
Updated Branches:
refs/heads/maven-refactor 23c1fd120 -> 589a7981f
Bumped up to the latest dependencies version; Added properties for some of the dependencies in teh top evel pom; Added some missing plugin definition in the PluginManagements part in the main pom.xml;
Project: http://git-wip-us.apache.org/repos/asf/directory-kerberos/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerberos/commit/589a7981
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerberos/tree/589a7981
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerberos/diff/589a7981
Branch: refs/heads/maven-refactor
Commit: 589a7981f70746e1e08a5f794662643063f15973
Parents: 23c1fd1
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Mon Jan 12 00:54:10 2015 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Mon Jan 12 00:54:10 2015 +0100
----------------------------------------------------------------------
3rdparty/not-yet-commons-ssl/pom.xml | 5 +-
3rdparty/pom.xml | 1 -
contrib/haox-config/pom.xml | 30 ++---
contrib/pom.xml | 49 ++++----
haox-kerb/kerb-crypto/pom.xml | 43 +++----
haox-kerb/pom.xml | 50 ++++----
pom.xml | 187 +++++++++++++++++++-----------
7 files changed, 209 insertions(+), 156 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/589a7981/3rdparty/not-yet-commons-ssl/pom.xml
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/pom.xml b/3rdparty/not-yet-commons-ssl/pom.xml
index 5d79a5c..9287a24 100644
--- a/3rdparty/not-yet-commons-ssl/pom.xml
+++ b/3rdparty/not-yet-commons-ssl/pom.xml
@@ -62,7 +62,7 @@
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <version>3.0</version>
+ <version>3.1</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
@@ -72,9 +72,8 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.8.2</version>
<scope>test</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/589a7981/3rdparty/pom.xml
----------------------------------------------------------------------
diff --git a/3rdparty/pom.xml b/3rdparty/pom.xml
index b8a816c..2de7738 100644
--- a/3rdparty/pom.xml
+++ b/3rdparty/pom.xml
@@ -21,7 +21,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.8.2</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/589a7981/contrib/haox-config/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/haox-config/pom.xml b/contrib/haox-config/pom.xml
index 3e519db..0f6f6cb 100644
--- a/contrib/haox-config/pom.xml
+++ b/contrib/haox-config/pom.xml
@@ -2,21 +2,21 @@
<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/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>contrib</artifactId>
- <groupId>org.haox</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>haox-config</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.5</version>
- </dependency>
- </dependencies>
+ <parent>
+ <groupId>org.haox</groupId>
+ <artifactId>contrib</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
-</project>
\ No newline at end of file
+ <artifactId>haox-config</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ </dependencies>
+</project>
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/589a7981/contrib/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/pom.xml b/contrib/pom.xml
index 39bac1b..7fbc4a8 100644
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -1,33 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.haox</groupId>
- <artifactId>haox-all</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.haox</groupId>
+ <artifactId>haox-all</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
- <artifactId>contrib</artifactId>
- <name>Contrib Projects</name>
- <description>Contrib Projects</description>
- <packaging>pom</packaging>
+ <artifactId>contrib</artifactId>
+ <name>Contrib Projects</name>
+ <description>Contrib Projects</description>
+ <packaging>pom</packaging>
- <modules>
- <module>haox-config</module>
- <module>haox-event</module>
- <module>haox-asn1</module>
- <module>haox-pkix</module>
- <module>haox-token</module>
- </modules>
+ <modules>
+ <module>haox-config</module>
+ <module>haox-event</module>
+ <module>haox-asn1</module>
+ <module>haox-pkix</module>
+ <module>haox-token</module>
+ </modules>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/589a7981/haox-kerb/kerb-crypto/pom.xml
----------------------------------------------------------------------
diff --git a/haox-kerb/kerb-crypto/pom.xml b/haox-kerb/kerb-crypto/pom.xml
index 8166952..589fc23 100644
--- a/haox-kerb/kerb-crypto/pom.xml
+++ b/haox-kerb/kerb-crypto/pom.xml
@@ -1,28 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.haox</groupId>
- <artifactId>haox-kerb</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.haox</groupId>
+ <artifactId>haox-kerb</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
- <artifactId>kerb-crypto</artifactId>
+ <artifactId>kerb-crypto</artifactId>
- <name>Haox-kerb Crypto</name>
- <description>Haox-kerb Crypto facility</description>
+ <name>Haox-kerb Crypto</name>
+ <description>Haox-kerb Crypto facility</description>
- <dependencies>
- <dependency>
- <groupId>org.haox</groupId>
- <artifactId>haox-config</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.haox</groupId>
- <artifactId>kerb-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.haox</groupId>
+ <artifactId>haox-config</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.haox</groupId>
+ <artifactId>kerb-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/589a7981/haox-kerb/pom.xml
----------------------------------------------------------------------
diff --git a/haox-kerb/pom.xml b/haox-kerb/pom.xml
index 0c1704e..4514750 100644
--- a/haox-kerb/pom.xml
+++ b/haox-kerb/pom.xml
@@ -1,27 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.haox</groupId>
- <artifactId>haox-all</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>haox-kerb</artifactId>
- <name>Haox-kerb Project</name>
+ <parent>
+ <groupId>org.haox</groupId>
+ <artifactId>haox-all</artifactId>
<version>1.0-SNAPSHOT</version>
- <packaging>pom</packaging>
+ </parent>
+
+ <artifactId>haox-kerb</artifactId>
+ <name>Haox-kerb Project</name>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
- <modules>
- <module>kerb-core</module>
- <module>kerb-core-test</module>
- <module>kerb-common</module>
- <module>kerb-util</module>
- <module>kerb-crypto</module>
- <module>kerb-identity</module>
- <module>kerb-client</module>
- <module>kerb-server</module>
- <module>kerb-kdc-test</module>
- </modules>
+ <modules>
+ <module>kerb-core</module>
+ <module>kerb-core-test</module>
+ <module>kerb-common</module>
+ <module>kerb-util</module>
+ <module>kerb-crypto</module>
+ <module>kerb-identity</module>
+ <module>kerb-client</module>
+ <module>kerb-server</module>
+ <module>kerb-kdc-test</module>
+ </modules>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/589a7981/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f08a00c..777e7c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,81 +1,128 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>
+ <modelVersion>4.0.0</modelVersion>
- <groupId>org.haox</groupId>
- <artifactId>haox-all</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>pom</packaging>
+ <groupId>org.haox</groupId>
+ <artifactId>haox-all</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
- <name>Haox Project</name>
- <description>Haox, just for the way</description>
- <url>http://www.haox.org</url>
- <inceptionYear>2014</inceptionYear>
+ <name>Haox Project</name>
+ <description>Haox, just for the way</description>
+ <url>http://www.haox.org</url>
+ <inceptionYear>2014</inceptionYear>
- <properties>
- <scala.version>2.10.3</scala.version>
- </properties>
+ <properties>
+ <scala.version>2.10.3</scala.version>
+ <junit.version>4.12</junit.version>
+ <slf4j.version>1.7.10</slf4j.version>
+ </properties>
- <modules>
- <module>3rdparty</module>
- <module>contrib</module>
- <module>haox-kerb</module>
- <module>haox-kdc</module>
- <module>benchmark</module>
- </modules>
+ <prerequisites>
+ <maven>3.2.0</maven>
+ </prerequisites>
+ <modules>
+ <module>3rdparty</module>
+ <module>contrib</module>
+ <module>haox-kerb</module>
+ <module>haox-kdc</module>
+ <module>benchmark</module>
+ </modules>
+
+ <dependencyManagement>
<dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.2</version>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
</dependencies>
+ </dependencyManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.2</version>
+ <configuration>
+ <source>1.7</source>
+ <target>1.7</target>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.18.1</version>
+ <configuration>
+ <reuseForks>false</reuseForks>
+ <systemPropertyVariables>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.7</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>2.5.2</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.4</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.8.2</version>
+ <inherited>true</inherited>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.6.1</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.16</version>
- <configuration>
- <reuseForks>false</reuseForks>
- <systemPropertyVariables>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <phase>compile</phase>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>compile</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>