You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2019/01/04 23:05:32 UTC

[1/2] directory-fortress-commander git commit: Exclude commons-fileupload from Wicket + add a fixed version

Repository: directory-fortress-commander
Updated Branches:
  refs/heads/master 262424ee3 -> 571206e20


Exclude commons-fileupload from Wicket + add a fixed version


Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/commit/358e00e8
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/tree/358e00e8
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/diff/358e00e8

Branch: refs/heads/master
Commit: 358e00e8d1333cf52c1b792d63c469988494ce49
Parents: 39f865f
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Jan 4 16:22:51 2019 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Jan 4 16:22:51 2019 +0000

----------------------------------------------------------------------
 pom.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/358e00e8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7e394a8..8ba9f65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,6 +135,19 @@
       <groupId>org.apache.wicket</groupId>
       <artifactId>wicket-spring</artifactId>
       <version>${wicket.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-fileupload</groupId>
+          <artifactId>commons-fileupload</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <!-- Required as log as Wicket 7.0.x picks up Commons Fileupload 1.3.2 -->
+    <dependency>
+      <groupId>commons-fileupload</groupId>
+      <artifactId>commons-fileupload</artifactId>
+      <version>1.3.3</version>
     </dependency>
     
     <dependency>


[2/2] directory-fortress-commander git commit: Merge branch 'pr/2'

Posted by sm...@apache.org.
Merge branch 'pr/2'


Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/commit/571206e2
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/tree/571206e2
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/diff/571206e2

Branch: refs/heads/master
Commit: 571206e20a7d6cd795448b886722a475b56ce691
Parents: 262424e 358e00e
Author: Shawn McKinney <sm...@apache.org>
Authored: Fri Jan 4 15:05:12 2019 -0800
Committer: Shawn McKinney <sm...@apache.org>
Committed: Fri Jan 4 15:05:12 2019 -0800

----------------------------------------------------------------------
 pom.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/571206e2/pom.xml
----------------------------------------------------------------------