You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ma...@apache.org on 2017/09/12 08:04:28 UTC
[1/6] oodt git commit: OODT-957 add maven dependency check plugin for
potential CVE detection
Repository: oodt
Updated Branches:
refs/heads/master 871803ae7 -> bc2aa2469
OODT-957 add maven dependency check plugin for potential CVE detection
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/87910318
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/87910318
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/87910318
Branch: refs/heads/master
Commit: 87910318d72575ff2495bf47afde6e8e4d29f614
Parents: 7443a7c
Author: Tom Barber <to...@analytical-labs.com>
Authored: Tue Sep 12 08:50:51 2017 +0100
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Tue Sep 12 08:50:51 2017 +0100
----------------------------------------------------------------------
core/pom.xml | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/87910318/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index bd13609..c01ef9f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -569,6 +569,17 @@ mm
</configuration>
</plugin>
<plugin>
+ <groupId>org.owasp</groupId>
+ <artifactId>dependency-check-maven</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
[5/6] oodt git commit: OODT-958 update commons collections
Posted by ma...@apache.org.
OODT-958 update commons collections
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/2c465c5d
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/2c465c5d
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/2c465c5d
Branch: refs/heads/master
Commit: 2c465c5d93d97cf1ab8b401484b9d755539347c1
Parents: 8491fb1
Author: Tom Barber <to...@analytical-labs.com>
Authored: Tue Sep 12 09:03:28 2017 +0100
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Tue Sep 12 09:03:28 2017 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/2c465c5d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 6a248e7..5d147d3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,7 +3,7 @@ Apache OODT Change Log
Release 1.3 - In Progress
* OODT-957 Add CVE reporting plugin to maven build chain
-
+* OODT-958 Update commons-collections
Release 1.2 - 08/14/2017
[4/6] oodt git commit: update commons-collections to resolve CVE
report
Posted by ma...@apache.org.
update commons-collections to resolve CVE report
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/8491fb1b
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/8491fb1b
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/8491fb1b
Branch: refs/heads/master
Commit: 8491fb1b16d77a5ec60210eda0845de0b81569d7
Parents: ed7036f
Author: Tom Barber <to...@analytical-labs.com>
Authored: Tue Sep 12 09:02:38 2017 +0100
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Tue Sep 12 09:02:38 2017 +0100
----------------------------------------------------------------------
core/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/8491fb1b/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 8ad58c7..165905b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -110,7 +110,7 @@ the License.
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
+ <version>3.2.2</version>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
[3/6] oodt git commit: OODT-957 add maven dependency check plugin for
potential CVE detection
Posted by ma...@apache.org.
OODT-957 add maven dependency check plugin for potential CVE detection
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/ed7036f1
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/ed7036f1
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/ed7036f1
Branch: refs/heads/master
Commit: ed7036f1ac30ea04fb02cffab581f6b1f84698eb
Parents: d07f91a
Author: Tom Barber <to...@analytical-labs.com>
Authored: Tue Sep 12 09:02:12 2017 +0100
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Tue Sep 12 09:02:12 2017 +0100
----------------------------------------------------------------------
core/pom.xml | 32 +++++++++++++++++++++-----------
1 file changed, 21 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed7036f1/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index c01ef9f..8ad58c7 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -569,17 +569,6 @@ mm
</configuration>
</plugin>
<plugin>
- <groupId>org.owasp</groupId>
- <artifactId>dependency-check-maven</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
@@ -994,5 +983,26 @@ mm
</plugins>
</build>
</profile>
+ <profile>
+ <id>cve-check</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.owasp</groupId>
+ <artifactId>dependency-check-maven</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
[6/6] oodt git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/oodt
Posted by ma...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/oodt
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/bc2aa246
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/bc2aa246
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/bc2aa246
Branch: refs/heads/master
Commit: bc2aa2469fc4c2632679571c2aa01ce80948f50b
Parents: 2c465c5 871803a
Author: Tom Barber <to...@analytical-labs.com>
Authored: Tue Sep 12 09:03:43 2017 +0100
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Tue Sep 12 09:03:43 2017 +0100
----------------------------------------------------------------------
README.md | 2 +-
config/pom.xml | 140 ++++++++++
config/src/main/assembly/assembly.xml | 97 +++++++
.../java/org/apache/oodt/config/Component.java | 51 ++++
.../oodt/config/ConfigurationManager.java | 66 +++++
.../config/ConfigurationManagerFactory.java | 86 ++++++
.../java/org/apache/oodt/config/Constants.java | 97 +++++++
.../DistributedConfigurationManager.java | 230 ++++++++++++++++
.../DistributedConfigurationPublisher.java | 273 +++++++++++++++++++
.../oodt/config/distributed/ZNodePaths.java | 102 +++++++
.../oodt/config/distributed/cli/CLIAction.java | 126 +++++++++
.../config/distributed/cli/ConfigPublisher.java | 37 +++
.../config/distributed/utils/ConfigUtils.java | 75 +++++
.../config/distributed/utils/CuratorUtils.java | 193 +++++++++++++
.../StandaloneConfigurationManager.java | 67 +++++
.../AbstractDistributedConfigurationTest.java | 51 ++++
config/src/main/resources/cmd-line-actions.xml | 38 +++
config/src/main/resources/cmd-line-options.xml | 85 ++++++
config/src/main/resources/config-publisher.xml | 80 ++++++
config/src/main/resources/log4j.xml | 53 ++++
config/src/main/scripts/conf-publisher | 40 +++
.../DistributedConfigurationManagerTest.java | 140 ++++++++++
.../DistributedConfigurationPublisherTest.java | 128 +++++++++
.../oodt/config/distributed/TestServer.java | 45 +++
config/src/test/resources/config-publisher.xml | 76 ++++++
core/pom.xml | 30 ++
filemgr/pom.xml | 13 +-
filemgr/src/main/assembly/assembly.xml | 49 ++--
filemgr/src/main/bin/filemgr | 28 +-
.../cas/filemgr/system/XmlRpcFileManager.java | 41 +--
filemgr/src/main/resources/log4j.xml | 40 +++
.../TestDistributedXmlRpcFileManager.java | 230 ++++++++++++++++
.../distributed/config/config-publisher.xml | 45 +++
.../distributed/config/filemgr.properties | 157 +++++++++++
filemgr/src/test/resources/filemgr.properties | 155 -----------
pom.xml | 1 +
resource/pom.xml | 8 +
.../resource/system/XmlRpcResourceManager.java | 48 ++--
.../system/TestXmlRpcResourceManager.java | 19 +-
.../TestDistributedXmlRpcResourceManager.java | 83 ++++++
.../config/distributed/config-publisher.xml | 40 +++
.../config/distributed/resource.properties | 75 +++++
workflow/pom.xml | 8 +
.../workflow/system/XmlRpcWorkflowManager.java | 34 ++-
.../TestAsynchronousLocalEngineRunner.java | 3 +-
.../TestDistributedXmlRpcWorkflowManager.java | 136 +++++++++
.../config/distributed/config-publisher.xml | 56 ++++
.../config/distributed/workflow.properties | 87 ++++++
48 files changed, 3518 insertions(+), 246 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/bc2aa246/core/pom.xml
----------------------------------------------------------------------
[2/6] oodt git commit: OODT-957 add maven dependency check plugin for
potential CVE detection
Posted by ma...@apache.org.
OODT-957 add maven dependency check plugin for potential CVE detection
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/d07f91ad
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/d07f91ad
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/d07f91ad
Branch: refs/heads/master
Commit: d07f91ad496a7e6fab580ab2793521d3142775c4
Parents: 8791031
Author: Tom Barber <to...@analytical-labs.com>
Authored: Tue Sep 12 08:51:29 2017 +0100
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Tue Sep 12 08:51:29 2017 +0100
----------------------------------------------------------------------
CHANGES.txt | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/d07f91ad/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a688c31..6a248e7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,11 @@
Apache OODT Change Log
======================
+Release 1.3 - In Progress
+
+* OODT-957 Add CVE reporting plugin to maven build chain
+
+
+
Release 1.2 - 08/14/2017
* OODT-955 Fix numhits error in Lucene Catalog