From d9e1e164c9cecd5a4fc34a398d15a0e53826d792 Mon Sep 17 00:00:00 2001
From: vharseko <vharseko@openam.org.ru>
Date: Tue, 20 Feb 2018 11:55:09 +0000
Subject: [PATCH] package build
---
opendj-doc-generated-ref/src/main/assembly/server-tools-man-page-sources-assembly.xml | 2
opendj-packages/pom.xml | 30 ---------
opendj-packages/opendj-deb/opendj-deb-standard/resources/copyright | 6 +-
opendj-doc-generated-ref/pom.xml | 74 ++++++++++++------------
opendj-packages/opendj-rpm/opendj-rpm-standard/pom.xml | 4
pom.xml | 3
README.md | 9 ++
opendj-packages/opendj-svr4/opendj-svr4-standard/resources/build-svr4.xml | 2
forgerock-parent | 2
/dev/null | 11 ---
.travis.yml | 4 +
opendj-packages/opendj-deb/pom.xml | 12 +---
opendj-doc-generated-ref/src/main/assembly/server-tools-man-pages-assembly.xml | 2
opendj-packages/opendj-rpm/pom.xml | 10 --
14 files changed, 66 insertions(+), 105 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 636ca79..53f1c4e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,8 @@
- git config --local user.email "open-identity-platform-opendj@googlegroups.com"
- git tag "$git_version"
- find opendj-server-legacy/target/package -type f -name "*?.?.?*" -execdir bash -c 'mv "$1" "${1/[[:digit:]].[[:digit:]].[[:digit:]]-SNAPSHOT/$git_version}"' _ {} \;
+ - find opendj-packages/opendj-deb/opendj-deb-standard/target -type f -name "*?.?.?*" -execdir bash -c 'mv "$1" "${1/[[:digit:]].[[:digit:]].[[:digit:]]-SNAPSHOT-[[:digit:]]/$git_version}"' _ {} \;
+ - find opendj-packages/opendj-rpm/opendj-rpm-standard/target/rpm/opendj/RPMS/noarch -type f -name "*?.?.?*" -execdir bash -c 'mv "$1" "${1/[[:digit:]].[[:digit:]].[[:digit:]]_SNAPSHOT-[[:digit:]]/$git_version}"' _ {} \;
deploy:
provider: releases
draft: false
@@ -22,6 +24,8 @@
file_glob: true
file:
- "opendj-server-legacy/target/package/*.zip"
+ - "opendj-packages/opendj-deb/opendj-deb-standard/target/*.deb"
+ - "opendj-packages/opendj-rpm/opendj-rpm-standard/target/rpm/opendj/RPMS/noarch/*.rpm"
on:
repo: OpenIdentityPlatform/OpenDJ
tags: false
diff --git a/README.md b/README.md
index f9c618b..710c225 100644
--- a/README.md
+++ b/README.md
@@ -15,8 +15,13 @@
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:
-## Downloads
-[Latest release OpenDJ](https://github.com/OpenIdentityPlatform/OpenDJ/releases/latest)
+## Downloads
+* [OpenDJ ZIP (All OS)](https://github.com/OpenIdentityPlatform/OpenDJ/releases/latest)
+* [OpenDJ DEB (Debian)](https://github.com/OpenIdentityPlatform/OpenDJ/releases/latest)
+* [OpenDJ RPM (Redhat/Centos)](https://github.com/OpenIdentityPlatform/OpenDJ/releases/latest)
+* [OpenDJ MSI (Windows/Wine)](https://github.com/OpenIdentityPlatform/OpenDJ/releases/latest)
+
+Java 1.8+ required
## How-to build
```bash
diff --git a/forgerock-parent b/forgerock-parent
index 8f31dbc..d618302 160000
--- a/forgerock-parent
+++ b/forgerock-parent
@@ -1 +1 @@
-Subproject commit 8f31dbcdd1ba3b8fdbaebf360cf0ef0b7029ed42
+Subproject commit d6183026f855c8803d2185a9e675269db1f46063
diff --git a/opendj-doc-generated-ref/pom.xml b/opendj-doc-generated-ref/pom.xml
index 20b92e7..cbb9104 100644
--- a/opendj-doc-generated-ref/pom.xml
+++ b/opendj-doc-generated-ref/pom.xml
@@ -358,6 +358,9 @@
<profiles>
<profile>
<id>man-pages</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
<build>
<plugins>
<plugin>
@@ -575,47 +578,46 @@
</plugin>
<!-- Format man pages -->
- <plugin>
- <groupId>org.forgerock.commons</groupId>
- <artifactId>forgerock-doc-maven-plugin</artifactId>
- <version>${forgerock-doc-plugin.version}</version>
- <executions>
- <execution>
- <id>build-man-pages</id>
- <phase>package</phase>
- <goals>
- <goal>process</goal>
- <goal>build</goal>
- </goals>
- <configuration>
- <projectName>OpenDJ</projectName>
- <projectVersion>${project.version}</projectVersion>
- <releaseVersion>${project.version}</releaseVersion>
- <googleAnalyticsId>UA-23412190-8</googleAnalyticsId>
- <formats combine.self="override">
- <format>man</format>
- </formats>
- </configuration>
- </execution>
- </executions>
- </plugin>
+<!-- <plugin> -->
+<!-- <groupId>org.forgerock.commons</groupId> -->
+<!-- <artifactId>forgerock-doc-maven-plugin</artifactId> -->
+<!-- <version>${forgerock-doc-plugin.version}</version> -->
+<!-- <executions> -->
+<!-- <execution> -->
+<!-- <id>build-man-pages</id> -->
+<!-- <phase>package</phase> -->
+<!-- <goals> -->
+<!-- <goal>process</goal> -->
+<!-- <goal>build</goal> -->
+<!-- </goals> -->
+<!-- <configuration> -->
+<!-- <projectName>OpenDJ</projectName> -->
+<!-- <projectVersion>${project.version}</projectVersion> -->
+<!-- <releaseVersion>${project.version}</releaseVersion> -->
+<!-- <formats combine.self="override"> -->
+<!-- <format>man</format> -->
+<!-- </formats> -->
+<!-- </configuration> -->
+<!-- </execution> -->
+<!-- </executions> -->
+<!-- </plugin> -->
<!-- Generate Artifacts -->
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
- <execution>
- <id>sdk-tools-man-pages</id>
- <goals>
- <goal>single</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/sdk-tools-man-pages-assembly.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
+<!-- <execution> -->
+<!-- <id>sdk-tools-man-pages</id> -->
+<!-- <goals> -->
+<!-- <goal>single</goal> -->
+<!-- </goals> -->
+<!-- <phase>package</phase> -->
+<!-- <configuration> -->
+<!-- <descriptors> -->
+<!-- <descriptor>src/main/assembly/sdk-tools-man-pages-assembly.xml</descriptor> -->
+<!-- </descriptors> -->
+<!-- </configuration> -->
+<!-- </execution> -->
<execution>
<id>server-tools-man-pages-sources</id>
diff --git a/opendj-doc-generated-ref/src/main/assembly/server-tools-man-page-sources-assembly.xml b/opendj-doc-generated-ref/src/main/assembly/server-tools-man-page-sources-assembly.xml
index e39ced4..ec9f9b1 100644
--- a/opendj-doc-generated-ref/src/main/assembly/server-tools-man-page-sources-assembly.xml
+++ b/opendj-doc-generated-ref/src/main/assembly/server-tools-man-page-sources-assembly.xml
@@ -27,7 +27,7 @@
<fileSets>
<fileSet>
- <directory>${project.build.directory}/docbkx-sources/man-pages</directory>
+ <directory>${project.build.directory}/../src/main/docbkx/man-pages</directory>
<outputDirectory />
</fileSet>
</fileSets>
diff --git a/opendj-doc-generated-ref/src/main/assembly/server-tools-man-pages-assembly.xml b/opendj-doc-generated-ref/src/main/assembly/server-tools-man-pages-assembly.xml
index bdefcf6..9b06de5 100644
--- a/opendj-doc-generated-ref/src/main/assembly/server-tools-man-pages-assembly.xml
+++ b/opendj-doc-generated-ref/src/main/assembly/server-tools-man-pages-assembly.xml
@@ -27,7 +27,7 @@
<fileSets>
<fileSet>
- <directory>${project.build.directory}/docbkx/manpages/man-pages</directory>
+ <directory>${project.build.directory}/docbkx-sources/man-pages</directory>
<outputDirectory />
</fileSet>
</fileSets>
diff --git a/opendj-packages/README.md b/opendj-packages/README.md
deleted file mode 100644
index a806c49..0000000
--- a/opendj-packages/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-OpenDJ Packages
-
-This Maven project contains OpenDJ packages.
-Available packages list:
-
-* OEM zip
-* Debian package
-* Debian OEM package
-* RPM package
-* RPM OEM package
-* MSI
diff --git a/opendj-packages/opendj-deb/opendj-deb-standard/resources/copyright b/opendj-packages/opendj-deb/opendj-deb-standard/resources/copyright
index 42399db..54defe6 100644
--- a/opendj-packages/opendj-deb/opendj-deb-standard/resources/copyright
+++ b/opendj-packages/opendj-deb/opendj-deb-standard/resources/copyright
@@ -1,9 +1,9 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: opendj
-Upstream-Contact: Forgerock <opendj@forgerock.org>
-Source: http://opendj.forgerock.org/
+Upstream-Contact: Open Identity Platform Community <open-identity-platform-opendj@googlegroups.com>
+Source: https://github.com/OpenIdentityPlatform/OpenDJ
Files: *
-Copyright: 2013-2015 ForgeRock AS.
+Copyright: 2013-2015 ForgeRock AS. 2018- Open Identity Platform Community
License: CDDL
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
diff --git a/opendj-packages/opendj-deb/pom.xml b/opendj-packages/opendj-deb/pom.xml
index 7b354df..1466591 100644
--- a/opendj-packages/opendj-deb/pom.xml
+++ b/opendj-packages/opendj-deb/pom.xml
@@ -28,17 +28,11 @@
<profiles>
<profile>
<id>packages</id>
+ <activation><activeByDefault>true</activeByDefault></activation>
<modules>
<module>opendj-deb-standard</module>
</modules>
</profile>
-
- <profile>
- <id>packages-oem</id>
- <modules>
- <module>opendj-deb-oem</module>
- </modules>
- </profile>
</profiles>
<artifactId>opendj-deb</artifactId>
@@ -52,9 +46,9 @@
<deb.prefix>/opt/${product.name.lowercase}</deb.prefix>
<deb.docprefix>/usr/share/doc/${product.name.lowercase}</deb.docprefix>
<deb.release>1</deb.release>
- <deb.maintainer>opendj@forgerock.org</deb.maintainer>
+ <deb.maintainer>open-identity-platform-opendj@googlegroups.com</deb.maintainer>
<manpage.dir>${project.build.directory}/dependency/man</manpage.dir>
- <deb.doc.homepage.url>http://opendj.forgerock.org/</deb.doc.homepage.url>
+ <deb.doc.homepage.url>https://github.com/OpenIdentityPlatform/OpenDJ</deb.doc.homepage.url>
<deb.product.name />
<deb.product.name.lowercase />
<deb.resources.path />
diff --git a/opendj-packages/opendj-rpm/opendj-rpm-standard/pom.xml b/opendj-packages/opendj-rpm/opendj-rpm-standard/pom.xml
index 0a91a22..3dacc0a 100644
--- a/opendj-packages/opendj-rpm/opendj-rpm-standard/pom.xml
+++ b/opendj-packages/opendj-rpm/opendj-rpm-standard/pom.xml
@@ -36,8 +36,8 @@
<rpm.product.name.lowercase>${product.name.lowercase}</rpm.product.name.lowercase>
<rpm.resources.path>${project.parent.basedir}/resources</rpm.resources.path>
<rpm.description.header>${product.name} LDAP Server</rpm.description.header>
- <rpm.product.summary>This OpenDJ package includes the Berkeley JE Backend and cannot be redistributed without a suitable license</rpm.product.summary>
- <rpm.license>CDDL, Oracle, France Telecom</rpm.license>
+ <rpm.product.summary></rpm.product.summary>
+ <rpm.license>CDDL</rpm.license>
</properties>
<build>
diff --git a/opendj-packages/opendj-rpm/pom.xml b/opendj-packages/opendj-rpm/pom.xml
index 5551a65..16a919d 100644
--- a/opendj-packages/opendj-rpm/pom.xml
+++ b/opendj-packages/opendj-rpm/pom.xml
@@ -31,17 +31,11 @@
<profiles>
<profile>
<id>packages</id>
+ <activation><activeByDefault>true</activeByDefault></activation>
<modules>
<module>opendj-rpm-standard</module>
</modules>
</profile>
-
- <profile>
- <id>packages-oem</id>
- <modules>
- <module>opendj-rpm-oem</module>
- </modules>
- </profile>
</profiles>
<description>
@@ -51,7 +45,7 @@
<properties>
<rpm.prefix>/opt/${product.name.lowercase}</rpm.prefix>
<manpage.dir>${project.build.directory}/dependency/man</manpage.dir>
- <doc.homepage.url>http://opendj.forgerock.org/</doc.homepage.url>
+ <doc.homepage.url>https://github.com/OpenIdentityPlatform/OpenDJ</doc.homepage.url>
<rpm.license />
<rpm.product.name />
<rpm.product.name.lowercase />
diff --git a/opendj-packages/opendj-svr4/opendj-svr4-standard/resources/build-svr4.xml b/opendj-packages/opendj-svr4/opendj-svr4-standard/resources/build-svr4.xml
index d85a834..28f1d62 100644
--- a/opendj-packages/opendj-svr4/opendj-svr4-standard/resources/build-svr4.xml
+++ b/opendj-packages/opendj-svr4/opendj-svr4-standard/resources/build-svr4.xml
@@ -37,7 +37,7 @@
<property name="svr4.fullname" value="${svr4.name}" />
<property name="svr4.arch" value="all" />
<property name="svr4.desc" value="${product}, Open Source LDAP Directory Server" />
- <property name="svr4.vendor" value="ForgeRock AS." />
+ <property name="svr4.vendor" value="Open Identity Platform Community" />
<property name="svr4.basedir" value="/usr" />
<property name="svr4.type" value="usr" />
<property name="svr4.prefix" value="${product.name.lowercase}" />
diff --git a/opendj-packages/pom.xml b/opendj-packages/pom.xml
index 79b417e..f3dde30 100644
--- a/opendj-packages/pom.xml
+++ b/opendj-packages/pom.xml
@@ -39,46 +39,18 @@
</properties>
<modules>
- <module>opendj-zip</module>
</modules>
<profiles>
<profile>
<id>opendj-deb</id>
<activation>
- <os><family>Linux</family></os>
+ <activeByDefault>true</activeByDefault>
</activation>
<modules>
<module>opendj-deb</module>
- </modules>
- </profile>
-
- <profile>
- <id>opendj-rpm</id>
- <activation>
- <file><exists>/bin/rpm</exists></file>
- </activation>
- <modules>
<module>opendj-rpm</module>
- </modules>
- </profile>
-
- <profile>
- <id>opendj-svr4</id>
- <activation>
- <os><family>SunOS</family></os>
- </activation>
- <modules>
<module>opendj-svr4</module>
- </modules>
- </profile>
-
- <profile>
- <id>opendj-msi</id>
- <activation>
- <os><family>Windows</family></os>
- </activation>
- <modules>
<module>opendj-msi</module>
</modules>
</profile>
diff --git a/pom.xml b/pom.xml
index f474a74..823266f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
</site.distribution.url>
<forgerock-build-tools.version>1.0.3</forgerock-build-tools.version>
- <forgerock-doc-plugin.version>3.2.2-SNAPSHOT</forgerock-doc-plugin.version>
+ <forgerock-doc-plugin.version>21.0.0-SNAPSHOT</forgerock-doc-plugin.version>
<freemarker.version>2.3.24-incubating</freemarker.version>
<grizzly-framework.version>2.3.28</grizzly-framework.version>
<metrics-core.version>3.1.2</metrics-core.version>
@@ -237,6 +237,7 @@
<module>opendj-embedded-server-examples</module>
<module>opendj-openidm-account-change-notification-handler</module>
<module>opendj-doc-generated-ref</module>
+ <module>opendj-packages</module>
</modules>
<build>
--
Gitblit v1.10.0