From 598e0c3db87ce5494924eaaac459371dd54a5857 Mon Sep 17 00:00:00 2001
From: vharseko <vharseko@openam.org.ru>
Date: Sun, 15 Oct 2017 17:36:19 +0000
Subject: [PATCH] fix build from clear local repo
---
forgerock-parent | 1
.gitignore | 2
opendj-server-legacy/pom.xml | 18 ++-
.gitmodules | 3
opendj-bom/pom.xml | 38 +++---
.travis.yml | 24 ++++
opendj-rest2ldap/pom.xml | 7 +
pom.xml | 7
README.md | 214 +---------------------------------
9 files changed, 82 insertions(+), 232 deletions(-)
diff --git a/.gitignore b/.gitignore
index 2fdae1d..8b1ea62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -100,4 +100,4 @@
/opendj-server-legacy/src/admin/generated/
/opendj-server-legacy/src/messages/generated/
/opendj-server-legacy/maven-eclipse.xml
-
+.DS_Store
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..f4f124c
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "forgerock-parent"]
+ path = forgerock-parent
+ url = https://github.com/OpenIdentityPlatform/forgerock-parent.git
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..c2b5070
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,24 @@
+language: java
+matrix:
+ include:
+ - os: linux
+ jdk: oraclejdk8
+ - os: linux
+ jdk: openjdk8
+ - os: osx
+ osx_image: xcode9.1
+before_install:
+ - date -u
+ - uname -a
+ - env | sort
+branches:
+ only:
+ - master
+notifications:
+ email:
+ - support@openam.org.ru
+cache:
+ directories:
+ - $HOME/.m2
+script:
+ - mvn -q clean install
diff --git a/README.md b/README.md
index 9e75abd..3ba374d 100644
--- a/README.md
+++ b/README.md
@@ -1,214 +1,22 @@
-<!--
- The contents of this file are subject to the terms of the Common Development and
- Distribution License (the License). You may not use this file except in compliance with the
- License.
-
- You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
- specific language governing permission and limitations under the License.
-
- When distributing Covered Software, include this CDDL Header Notice in each file and include
- the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
- Header, with the fields enclosed by brackets [] replaced by your own identifying
- information: "Portions copyright [year] [name of copyright owner]".
-
- Copyright 2016 ForgeRock AS.
- -->
-
# OpenDJ Server
+[](https://travis-ci.org/OpenIdentityPlatform/OpenDJ)
+## How-to build
+
+```bash
+git clone --recursive https://github.com/OpenIdentityPlatform/OpenDJ.git
+mvn clean install -f OpenDJ
+```
+
+About
+==========
OpenDJ is an [LDAPv3](http://tools.ietf.org/html/rfc4510) compliant directory service, which has been developed
for the Java platform, providing a high performance, highly available, and secure store for the identities managed
by your organization. Its easy installation process, combined with the power of the Java platform makes OpenDJ
the simplest, fastest directory to deploy and manage.
-The project is led by ForgeRock who integrate the [OpenAM][openam_project_page], [OpenIDM][project_page],
-[OpenDJ][opendj_project_page], [OpenICF][openicf_project_page], and [OpenIG][openig_project_page] open source projects
-to provide a quality-assured [ForgeRock Identity Platform][identity_platform]. Support, professional services, and
-training are available for the Identity Platform, providing stability and safety for the management of your digital
-identities.
-
-To find out more about the services ForgeRock provides, visit [www.forgerock.com][commercial_site].
-
-To view the OpenDJ project page, which also contains all of the documentation, visit
- [https://forgerock.org/opendj/][project_page].
-
-For a great place to start, take a look at the [OpenDJ Install Guide][install_guide].
-
-For further help and discussion, visit the [community forums][community_forum].
-
-# Getting the OpenDJ Directory Server
-
-You can obtain the OpenDJ software in one of two ways;
-
-## Download It
-
-The easiest way to try OpenDJ is to download the binary file and follow the [Installation Guide][install_guide].
-
-You can download either:
-
-1. An [enterprise release build][enterprise_builds].
-2. The [nightly build][nightly_builds] which contains the latest features and bug fixes, but may also contain
-_in progress_ unstable features.
-
-## Build The Source Code
-
-In order to build the project from the command line follow these steps:
-
-### Prepare your Environment
-To build OpenDJ you will need the following installed on the machine you're going to build on:
-
-Software | Required Version
----------------------- | ----------------
-Java JDK Version | 7 and above (see below)
-Git | 1.7.6 and above
-Maven | 3.0.4 and above
-
-ForgeRock does not support the use of Java 9 for running OpenDJ in production.
-
-You should also set the following environment variables for the majority of versions;
-
-JAVA_HOME - set to the directory in which your SDK is installed
-MAVEN_OPTS - When building with Java 7 set this to '-Xmx1g -XX:MaxPermSize=512m'. Java 8 and above does not support
-MaxPermSize so set this to '-Xmx1g'.
-
-### Getting the Code
-
-The central project repository lives on the ForgeRock Bitbucket Server at
-[https://stash.forgerock.org/projects/OPENDJ][central_repo].
-
-Mirrors exist elsewhere (for example GitHub) but all contributions to the project are managed by using pull requests
-to the central repository.
-
-There are two ways to get the code - if you want to run the code unmodified you can clone the central repo (or a
-reputable mirror):
-
-```
-git clone https://stash.forgerock.org/scm/opendj/opendj.git
-```
-
-If, however, you are considering contributing bug fixes, enhancements, or modifying the code you should fork the project
- and then clone your private fork, as described below:
-
-1. Create an account on [BackStage][backstage] - You can use these credentials to create pull requests, report bugs,
- and download the enterprise release builds.
-2. Log in to the Bitbucket Server using your BackStage account credentials.
-3. Fork the `opendj` project. This will create a fork for you in your own area of Bitbucket Server. Click on your
- profile icon then select 'view profile' to see all your forks.
-4. Clone your fork to your machine.
-
-Obtaining the code this way will allow you to create pull requests later.
-
-### Building the Code
-
-The OpenDJ build process and dependencies are managed by Maven. The first time you build the project, Maven will pull
-down all the dependencies and Maven plugins required by the build, which can take a significant amount of time.
-Subsequent builds will be much faster!
-
-```
-$ cd $REPO_HOME/opendj
-$ mvn clean install
-```
-
-The OpenDJ Directory Server binaries will be built in `opendj-server-legacy/target/package`
-
-## Getting Started With OpenDJ
-
-ForgeRock provide a comprehensive set of documents for OpenDJ, including a
-[installation guide][install_guide].
-
-- [Documentation for enterprise builds][enterprise_docs].
-- [Draft docs for nightly builds and self built code][nightly_docs]
-
-
-## Contributing
-
-There are many ways to contribute to the OpenDJ project. You can contribute to the [OpenDJ Docs Project][docs_project],
-report or [submit bug fixes][issue_tracking], or [contribute extensions][contribute] such as custom authentication
-modules, authentication scripts, policy scripts, dev ops scripts, and more.
-
-## Versioning
-
-ForgeRock produce an enterprise point release build. These builds use the versioning format X.0.0 (for example 3.0.0 or
-4.0.0 would be enterprise releases) and are produced yearly. These builds are free to use for trials, proof of concept
-projects and so on. A license is required to use these builds in production.
-
-Users with support contracts have access to sustaining releases that contain bug and security fixes. These builds use
-the versioning format 3.0.x. 3.0.1 and 3.5.1 for example, would both be sustaining releases. Users with support
-contracts also get access to quality-assured interim releases, such as the forthcoming OpenDJ 3.5.0.
-
-## Authors
-
-See the list of [contributors][contributors] who participated in this project.
-
## License
This project is licensed under the Common Development and Distribution License (CDDL). The following text applies to
-both this file, and should also be included in all files in the project:
-
-> The contents of this file are subject to the terms of the Common Development and Distribution License (the License).
-> You may not use this file except in compliance with the License.
->
-> You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the specific language governing
-> permission and limitations under the License.
->
-> When distributing Covered Software, include this CDDL Header Notice in each file and include the License file at
-> legal/CDDLv1.0.txt. If applicable, add the following below the CDDL Header, with the fields enclosed by brackets []
-> replaced by your own identifying information: "Portions copyright [year] [name of copyright owner]".
->
-> Copyright 2016 ForgeRock AS.
-
-
-## All the Links!
-To save you sifting through the readme looking for 'that link'...
-
-- [ForgeRock's commercial website][commercial_site]
-- [ForgeRock's community website][community_site]
-- [ForgeRock's BackStage server][backstage]
-- [ForgeRock Identity Platform][identity_platform]
-- [OpenAM Project Page][openam_project_page]
-- [OpenDJ Project Page][opendj_project_page]
-- [OpenIDM Project Page][project_page]
-- [OpenICF Project Page][openicf_project_page]
-- [OpenIG Project Page][openig_project_page]
-- [Community Forums][community_forum]
-- [Install Guide][install_guide]
-- [Enterprise Build Downloads][enterprise_builds]
-- [Enterprise Documentation][enterprise_docs]
-- [Nightly Build Downloads][nightly_builds]
-- [Nightly Documentation][nightly_docs]
-- [Central Project Repository][central_repo]
-- [Issue Tracking][issue_tracking]
-- [Contributors][contributors]
-- [Coding Standards][coding_standards]
-- [Contributions][contribute]
-- [How to Buy][how_to_buy]
-
-[commercial_site]: https://www.forgerock.com
-[community_site]: https://www.forgerock.org
-[backstage]: https://backstage.forgerock.com
-[identity_platform]: https://www.forgerock.com/platform/
-[openam_project_page]: https://forgerock.org/openam/
-[opendj_project_page]: https://forgerock.org/opendj/
-[openig_project_page]: https://forgerock.org/openig/
-[project_page]: https://forgerock.org/opendj/
-[openicf_project_page]: https://forgerock.org/openicf/
-[community_forum]: https://forgerock.org/forum/fr-projects/opendj/
-[install_guide]: https://forgerock.org/opendj/doc/bootstrap/install-guide/index.html
-[enterprise_builds]: https://backstage.forgerock.com/#!/downloads/OpenDJ/OpenDJ%20Enterprise#browse
-[enterprise_docs]: https://backstage.forgerock.com/#!/docs/opendj
-[nightly_builds]: https://forgerock.org/downloads/opendj-builds/
-[nightly_docs]: https://forgerock.org/documentation/opendj/
-[central_repo]: https://stash.forgerock.org/projects/OPENDJ/repos/opendj/browse
-[issue_tracking]: https://bugster.forgerock.org/jira/browse/OPENDJ/?selectedTab=com.atlassian.jira.jira-projects-plugin:summary-panel
-[docs_project]: https://stash.forgerock.org/projects/OPENDJ/repos/opendj-docs/browse
-[contributors]: https://stash.forgerock.org/plugins/servlet/graphs?graph=contributors&projectKey=OPENDJ&repoSlug=opendj&refId=all-branches&type=c&group=weeks
-[coding_standards]: https://wikis.forgerock.org/confluence/display/devcom/Coding+Style+and+Guidelines
-[how_to_buy]: https://www.forgerock.com/platform/how-buy/
-[contribute]: https://forgerock.org/projects/contribute/
-
-## Acknowledgments
-
-* Sun Microsystems.
-* The founders of ForgeRock.
-* The good things in life.
+both this file, and should also be included in all files in the project:
\ No newline at end of file
diff --git a/forgerock-parent b/forgerock-parent
new file mode 160000
index 0000000..4c2fbfd
--- /dev/null
+++ b/forgerock-parent
@@ -0,0 +1 @@
+Subproject commit 4c2fbfd72f9f081785ea8af08863aef090956507
diff --git a/opendj-bom/pom.xml b/opendj-bom/pom.xml
index 19656dc..b7b07d8 100644
--- a/opendj-bom/pom.xml
+++ b/opendj-bom/pom.xml
@@ -20,8 +20,8 @@
<parent>
<groupId>org.forgerock</groupId>
<artifactId>forgerock-parent</artifactId>
- <version>2.0.10</version>
- <relativePath />
+ <version>2.0.6</version>
+ <relativePath>../forgerock-parent</relativePath>
</parent>
<groupId>org.forgerock.opendj</groupId>
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.forgerock.commons</groupId>
<artifactId>commons-bom</artifactId>
- <version>21.0.0-alpha-17</version>
+ <version>21.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>
@@ -99,22 +99,22 @@
</dependencyManagement>
<repositories>
- <repository>
- <id>forgerock-staging-repository</id>
- <name>ForgeRock Release Repository</name>
- <url>http://maven.forgerock.org/repo/releases</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>forgerock-snapshots-repository</id>
- <name>ForgeRock Snapshot Repository</name>
- <url>http://maven.forgerock.org/repo/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
+<!-- <repository> -->
+<!-- <id>forgerock-staging-repository</id> -->
+<!-- <name>ForgeRock Release Repository</name> -->
+<!-- <url>http://maven.forgerock.org/repo/releases</url> -->
+<!-- <snapshots> -->
+<!-- <enabled>false</enabled> -->
+<!-- </snapshots> -->
+<!-- </repository> -->
+<!-- <repository> -->
+<!-- <id>forgerock-snapshots-repository</id> -->
+<!-- <name>ForgeRock Snapshot Repository</name> -->
+<!-- <url>http://maven.forgerock.org/repo/snapshots</url> -->
+<!-- <releases> -->
+<!-- <enabled>false</enabled> -->
+<!-- </releases> -->
+<!-- </repository> -->
<repository>
<id>jvnet-nexus-snapshots</id>
<url>https://maven.java.net/content/repositories/snapshots</url>
diff --git a/opendj-rest2ldap/pom.xml b/opendj-rest2ldap/pom.xml
index 988ffcb..906c0f0 100644
--- a/opendj-rest2ldap/pom.xml
+++ b/opendj-rest2ldap/pom.xml
@@ -66,6 +66,7 @@
<dependency>
<groupId>org.forgerock.http</groupId>
<artifactId>chf-oauth2</artifactId>
+ <version>21.0.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -78,6 +79,12 @@
<artifactId>forgerock-build-tools</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.forgerock.commons</groupId>
+ <artifactId>api-descriptor</artifactId>
+ <version>21.0.0-SNAPSHOT</version>
+ <type>jar</type>
+ </dependency>
</dependencies>
diff --git a/opendj-server-legacy/pom.xml b/opendj-server-legacy/pom.xml
index 187b618..37e913f 100644
--- a/opendj-server-legacy/pom.xml
+++ b/opendj-server-legacy/pom.xml
@@ -156,6 +156,7 @@
<dependency>
<groupId>org.forgerock.commons</groupId>
<artifactId>forgerock-audit-handler-json</artifactId>
+ <version>21.0.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -163,10 +164,10 @@
<artifactId>forgerock-audit-handler-elasticsearch</artifactId>
</dependency>
- <dependency>
- <groupId>org.forgerock.commons</groupId>
- <artifactId>forgerock-audit-handler-splunk</artifactId>
- </dependency>
+<!-- <dependency> -->
+<!-- <groupId>org.forgerock.commons</groupId> -->
+<!-- <artifactId>forgerock-audit-handler-splunk</artifactId> -->
+<!-- </dependency> -->
<dependency>
<groupId>org.forgerock.commons</groupId>
@@ -231,9 +232,14 @@
<dependency>
<groupId>org.forgerock.commons</groupId>
<artifactId>forgerock-persistit-core</artifactId>
- <version>4.3.2-SNAPSHOT</version>
+ <version>4.3.1</version>
</dependency>
-
+<!-- <dependency> -->
+<!-- <groupId>com.akiban</groupId> -->
+<!-- <artifactId>akiban-persistit</artifactId> -->
+<!-- <version>3.3.0</version> -->
+<!-- </dependency> -->
+
<dependency>
<groupId>com.github.stephenc.jcip</groupId>
<artifactId>jcip-annotations</artifactId>
diff --git a/pom.xml b/pom.xml
index dc869f9..98ae566 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
scp://community.internal.forgerock.com/var/www/vhosts/opendj.forgerock.org/httpdocs
</site.distribution.url>
- <forgerock-build-tools.version>1.0.2</forgerock-build-tools.version>
+ <forgerock-build-tools.version>1.0.3</forgerock-build-tools.version>
<forgerock-doc-plugin.version>3.2.2-SNAPSHOT</forgerock-doc-plugin.version>
<freemarker.version>2.3.24-incubating</freemarker.version>
<grizzly-framework.version>2.3.28</grizzly-framework.version>
@@ -64,7 +64,7 @@
<opendj-copyright-maven-plugin.version>1.0.1</opendj-copyright-maven-plugin.version>
<!-- ForgeRock build tools and Checkstyle versions (to avoid many checkstyle errors with ForgeRock Parent 2.0.10) -->
- <forgerockBuildToolsVersion>1.0.2</forgerockBuildToolsVersion>
+ <forgerockBuildToolsVersion>1.0.3</forgerockBuildToolsVersion>
<checkstylePluginVersion>2.9.1</checkstylePluginVersion>
<checkstyleVersion>5.5</checkstyleVersion>
</properties>
@@ -217,6 +217,7 @@
</dependencies>
<modules>
+ <module>forgerock-parent</module>
<module>opendj-bom</module>
<module>opendj-core</module>
@@ -242,7 +243,7 @@
<build>
<plugins>
- <plugin>
+ <plugin>
<groupId>org.forgerock.maven.plugins</groupId>
<artifactId>javadoc-updater-maven-plugin</artifactId>
<version>1.0.0</version>
--
Gitblit v1.10.0