You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by dr...@apache.org on 2015/02/09 07:27:59 UTC

[18/30] directory-kerberos git commit: Some consistency changes to the poms

Some consistency changes to the poms


Project: http://git-wip-us.apache.org/repos/asf/directory-kerberos/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerberos/commit/d93c2c65
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerberos/tree/d93c2c65
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerberos/diff/d93c2c65

Branch: refs/heads/installation
Commit: d93c2c65d1cf2cdf4b0b78e2373994fd854a8dc8
Parents: 35ab61e
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Feb 4 12:16:56 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Feb 4 12:16:56 2015 +0000

----------------------------------------------------------------------
 3rdparty/not-yet-commons-ssl/pom.xml |  7 ++++---
 3rdparty/pom.xml                     | 23 -----------------------
 benchmark/pom.xml                    |  4 ++--
 kerby-asn1/README.md                 |  2 +-
 kerby-kdc/pom.xml                    |  1 +
 kerby-kerb/kerb-core-test/pom.xml    |  6 +++---
 kerby-kerb/kerb-core/pom.xml         |  2 +-
 kerby-kerb/pom.xml                   |  1 +
 lib/kerby-token/pom.xml              |  2 +-
 lib/pom.xml                          |  1 +
 10 files changed, 15 insertions(+), 34 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/d93c2c65/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 819d78d..8f6c402 100644
--- a/3rdparty/not-yet-commons-ssl/pom.xml
+++ b/3rdparty/not-yet-commons-ssl/pom.xml
@@ -29,7 +29,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.18</version>
+        <version>2.18.1</version>
         <configuration>
           <skipTests>true</skipTests>
         </configuration>
@@ -73,20 +73,21 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <scope>test</scope>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-ext-jdk15on</artifactId>
       <version>1.51</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
-      <scope>test</scope>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
       <version>1.9.5</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
+      <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/d93c2c65/3rdparty/pom.xml
----------------------------------------------------------------------
diff --git a/3rdparty/pom.xml b/3rdparty/pom.xml
index 9474003..e9fb76e 100644
--- a/3rdparty/pom.xml
+++ b/3rdparty/pom.xml
@@ -30,27 +30,4 @@
     <module>not-yet-commons-ssl</module>
   </modules>
 
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.rat</groupId>
-          <artifactId>apache-rat-plugin</artifactId>
-          <version>0.11</version>
-          <configuration>
-            <skip>true</skip>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
 </project>

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/d93c2c65/benchmark/pom.xml
----------------------------------------------------------------------
diff --git a/benchmark/pom.xml b/benchmark/pom.xml
index 5d112ea..9e7a2b4 100644
--- a/benchmark/pom.xml
+++ b/benchmark/pom.xml
@@ -35,12 +35,12 @@
     <dependency>
       <groupId>org.apache.kerby</groupId>
       <artifactId>kerby-asn1</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.kerby</groupId>
       <artifactId>kerb-core</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.server</groupId>

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/d93c2c65/kerby-asn1/README.md
----------------------------------------------------------------------
diff --git a/kerby-asn1/README.md b/kerby-asn1/README.md
index eb35929..21c11fc 100644
--- a/kerby-asn1/README.md
+++ b/kerby-asn1/README.md
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-haox-asn1
+kerby-asn1
 =========
 
 ### A ASN1 parser with easy and simple API

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/d93c2c65/kerby-kdc/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kdc/pom.xml b/kerby-kdc/pom.xml
index 7052a13..ec54b2a 100644
--- a/kerby-kdc/pom.xml
+++ b/kerby-kdc/pom.xml
@@ -49,6 +49,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
+      <version>${junit.version}</version> 
       <scope>test</scope>
     </dependency>
   </dependencies>

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/d93c2c65/kerby-kerb/kerb-core-test/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/pom.xml b/kerby-kerb/kerb-core-test/pom.xml
index bf980e6..dc79b28 100644
--- a/kerby-kerb/kerb-core-test/pom.xml
+++ b/kerby-kerb/kerb-core-test/pom.xml
@@ -30,17 +30,17 @@
     <dependency>
       <groupId>org.apache.kerby</groupId>
       <artifactId>kerby-asn1</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.kerby</groupId>
       <artifactId>kerb-core</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.kerby</groupId>
       <artifactId>kerb-util</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>${project.version}</version>
     </dependency>
   </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/d93c2c65/kerby-kerb/kerb-core/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/pom.xml b/kerby-kerb/kerb-core/pom.xml
index 9bd0963..aa01230 100644
--- a/kerby-kerb/kerb-core/pom.xml
+++ b/kerby-kerb/kerb-core/pom.xml
@@ -30,7 +30,7 @@
     <dependency>
       <groupId>org.apache.kerby</groupId>
       <artifactId>kerby-asn1</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>${project.version}</version>
     </dependency>
 
   </dependencies>

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/d93c2c65/kerby-kerb/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/pom.xml b/kerby-kerb/pom.xml
index 2ec1b40..4422235 100644
--- a/kerby-kerb/pom.xml
+++ b/kerby-kerb/pom.xml
@@ -42,6 +42,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
+      <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/d93c2c65/lib/kerby-token/pom.xml
----------------------------------------------------------------------
diff --git a/lib/kerby-token/pom.xml b/lib/kerby-token/pom.xml
index a018130..e15128c 100644
--- a/lib/kerby-token/pom.xml
+++ b/lib/kerby-token/pom.xml
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>org.apache.kerby</groupId>
       <artifactId>kerby-asn1</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>${project.version}</version>
     </dependency>
   </dependencies>
 

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/d93c2c65/lib/pom.xml
----------------------------------------------------------------------
diff --git a/lib/pom.xml b/lib/pom.xml
index 8a1cd49..e6284ef 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -38,6 +38,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
+      <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>