Skip to content

Commit

Permalink
Merge pull request #45 from orchitech/project-cleanup
Browse files Browse the repository at this point in the history 
Cleanup project structure and change groupId
  • Loading branch information
@karelmaxa
karelmaxa authored Nov 22, 2022
2 parents 466a707 34eb4a5 commit 9a48ad0
Show file tree
Hide file tree
Showing 35 changed files with 249 additions and 375 deletions.
1 change: 0 additions & 1 deletion .wren-deploy.rc
View file

This file was deleted.

16 changes: 6 additions & 10 deletions opendj-bom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 13,7 @@
information: "Portions Copyright [year] [name of copyright owner]".
Copyright 2011-2016 ForgeRock AS.
Portions Copyright 2017-2021 Wren Security.
Portions Copyright 2017-2022 Wren Security.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
Expand All @@ -25,10 25,9 @@
<relativePath />
</parent>

<groupId>org.forgerock.opendj</groupId>
<groupId>org.wrensecurity.wrends</groupId>
<artifactId>opendj-bom</artifactId>
<version>4.0.0-M4-SNAPSHOT</version>

<packaging>pom</packaging>

<name>Wren:DS BOM</name>
Expand All @@ -37,7 36,6 @@
</description>

<repositories>
<!-- Needed to retrieve parent POM -->
<repository>
<id>wrensecurity-releases</id>
<name>Wren Security Release Repository</name>
Expand All @@ -52,7 50,6 @@
</releases>
</repository>

<!-- Needed to retrieve parent POM -->
<repository>
<id>wrensecurity-snapshots</id>
<name>Wren Security Snapshot Repository</name>
Expand All @@ -70,7 67,6 @@

<properties>
<wrensec-commons.version>22.3.0</wrensec-commons.version>
<pgpWhitelistArtifact>org.wrensecurity:wrensec-pgp-whitelist:1.6.0</pgpWhitelistArtifact>
</properties>

<dependencyManagement>
Expand All @@ -93,25 89,25 @@

<!-- Wren:DS SDK -->
<dependency>
<groupId>org.forgerock.opendj</groupId>
<groupId>org.wrensecurity.wrends</groupId>
<artifactId>opendj-core</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.forgerock.opendj</groupId>
<groupId>org.wrensecurity.wrends</groupId>
<artifactId>opendj-cli</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.forgerock.opendj</groupId>
<groupId>org.wrensecurity.wrends</groupId>
<artifactId>opendj-grizzly</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.forgerock.opendj</groupId>
<groupId>org.wrensecurity.wrends</groupId>
<artifactId>opendj-rest2ldap</artifactId>
<version>${project.version}</version>
</dependency>
Expand Down
24 changes: 7 additions & 17 deletions opendj-cli/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 13,14 @@
information: "Portions Copyright [year] [name of copyright owner]".
Copyright 2014-2016 ForgeRock AS.
Portions Copyright 2018-2021 Wren Security.
Portions Copyright 2018-2022 Wren Security.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-parent</artifactId>
<groupId>org.wrensecurity.wrends</groupId>
<artifactId>opendj-project</artifactId>
<version>4.0.0-M4-SNAPSHOT</version>
</parent>

Expand All @@ -32,12 32,12 @@

<dependencies>
<dependency>
<groupId>org.forgerock.opendj</groupId>
<groupId>org.wrensecurity.wrends</groupId>
<artifactId>opendj-core</artifactId>
</dependency>

<dependency>
<groupId>org.forgerock.opendj</groupId>
<groupId>org.wrensecurity.wrends</groupId>
<artifactId>opendj-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
Expand Down Expand Up @@ -96,8 96,8 @@
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>

<!-- Creates opendj-cli bundle -->
Expand Down Expand Up @@ -131,16 131,6 @@
</reportSet>
</reportSets>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<links>
<link>http://commons.forgerock.org/i18n-framework/i18n-core/apidocs</link>
</links>
</configuration>
</plugin>
</plugins>
</reporting>
</project>
29 changes: 9 additions & 20 deletions opendj-config/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 13,13 @@
information: "Portions Copyright [year] [name of copyright owner]".
Copyright 2013-2016 ForgeRock AS.
Portions Copyright 2017-2021 Wren Security.
Portions Copyright 2017-2022 Wren Security.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-parent</artifactId>
<groupId>org.wrensecurity.wrends</groupId>
<artifactId>opendj-project</artifactId>
<version>4.0.0-M4-SNAPSHOT</version>
</parent>
<artifactId>opendj-config</artifactId>
Expand All @@ -46,17 46,17 @@
<artifactId>wrensec-build-tools</artifactId>
</dependency>
<dependency>
<groupId>org.forgerock.opendj</groupId>
<groupId>org.wrensecurity.wrends</groupId>
<artifactId>opendj-core</artifactId>
</dependency>
<dependency>
<groupId>org.forgerock.opendj</groupId>
<groupId>org.wrensecurity.wrends</groupId>
<artifactId>opendj-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.forgerock.opendj</groupId>
<groupId>org.wrensecurity.wrends</groupId>
<artifactId>opendj-cli</artifactId>
</dependency>
</dependencies>
Expand Down Expand Up @@ -140,7 140,7 @@
</plugin>
<!-- Validate core components XML definition files and generate the components. -->
<plugin>
<groupId>org.forgerock.opendj</groupId>
<groupId>org.wrensecurity.wrends</groupId>
<artifactId>opendj-maven-plugin</artifactId>
<executions>
<execution>
Expand Down Expand Up @@ -169,17 169,15 @@
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<configuration>
<instrumentation>
<excludes>
<exclude>**/*Messages.class</exclude>
<exclude>**/config/client/*CfgClient*.class</exclude>
<exclude>**/config/server/*Cfg*.class</exclude>
<exclude>**/config/meta/*.class</exclude>
</excludes>
</instrumentation>
</configuration>
</plugin>
</plugins>
Expand All @@ -201,15 199,6 @@
</reportSet>
</reportSets>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<links>
<link>http://commons.forgerock.org/i18n-framework/i18n-core/apidocs</link>
</links>
</configuration>
</plugin>
</plugins>
</reporting>
</project>
18 changes: 4 additions & 14 deletions opendj-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 13,14 @@
information: "Portions Copyright [year] [name of copyright owner]".
Copyright 2011-2016 ForgeRock AS.
Portions Copyright 2018-2021 Wren Security.
Portions Copyright 2018-2022 Wren Security.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>opendj-parent</artifactId>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-project</artifactId>
<groupId>org.wrensecurity.wrends</groupId>
<version>4.0.0-M4-SNAPSHOT</version>
</parent>

Expand Down Expand Up @@ -269,7 269,7 @@
<includeDependencySources>true</includeDependencySources>
<includeTransitiveDependencySources>true</includeTransitiveDependencySources>
<dependencySourceIncludes>
<dependencySourceInclude>org.forgerock.*:*</dependencySourceInclude>
<dependencySourceInclude>org.wrensecurity.*:*</dependencySourceInclude>
</dependencySourceIncludes>
<excludePackageNames>com.*:*.internal</excludePackageNames>
<groups>
Expand Down Expand Up @@ -314,16 314,6 @@
</reportSet>
</reportSets>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<links>
<link>http://commons.forgerock.org/i18n-framework/i18n-core/apidocs</link>
</links>
</configuration>
</plugin>
</plugins>
</reporting>
</project>
22 changes: 11 additions & 11 deletions opendj-doc-generated-ref/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 13,14 @@
~ information: "Portions Copyright [year] [name of copyright owner]".
~
~ Copyright 2016 ForgeRock AS.
~ Portions Copyright 2018-2021 Wren Security.
~ Portions Copyright 2018-2022 Wren Security.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>opendj-parent</artifactId>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-project</artifactId>
<groupId>org.wrensecurity.wrends</groupId>
<version>4.0.0-M4-SNAPSHOT</version>
</parent>

Expand Down Expand Up @@ -50,14 50,14 @@
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.forgerock.opendj</groupId>
<groupId>org.wrensecurity.wrends</groupId>
<artifactId>opendj-core</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</artifactItem>

<artifactItem>
<groupId>org.forgerock.opendj</groupId>
<groupId>org.wrensecurity.wrends</groupId>
<artifactId>opendj-server-legacy</artifactId>
<version>${project.version}</version>
<type>zip</type>
Expand All @@ -66,7 66,7 @@
</artifactItem>

<artifactItem>
<groupId>org.forgerock.opendj</groupId>
<groupId>org.wrensecurity.wrends</groupId>
<artifactId>opendj-ldap-toolkit</artifactId>
<version>${project.version}</version>
<type>zip</type>
Expand Down Expand Up @@ -97,7 97,7 @@
</plugin>

<plugin>
<groupId>org.forgerock.opendj</groupId>
<groupId>org.wrensecurity.wrends</groupId>
<artifactId>opendj-doc-maven-plugin</artifactId>

<executions>
Expand Down Expand Up @@ -366,7 366,7 @@
<build>
<plugins>
<plugin>
<groupId>org.forgerock.opendj</groupId>
<groupId>org.wrensecurity.wrends</groupId>
<artifactId>opendj-doc-maven-plugin</artifactId>

<executions>
Expand All @@ -377,7 377,7 @@
</goals>
<phase>generate-sources</phase>
<configuration>
<archiveDir>${project.build.directory}/opendj</archiveDir>
<archiveDir>${project.build.directory}/wrends</archiveDir>
<mode>SERVER</mode>
<extendedClasspath>
${project.build.directory}/dependency/freemarker-${freemarker.version}.jar
Expand Down Expand Up @@ -581,9 581,9 @@

<!-- Format man pages -->
<plugin>
<groupId>org.forgerock.commons</groupId>
<groupId>org.wrensecurity.commons</groupId>
<artifactId>forgerock-doc-maven-plugin</artifactId>
<version>${forgerock-doc-plugin.version}</version>
<version>22.4.0-SNAPSHOT</version>
<executions>
<execution>
<id>build-man-pages</id>
Expand Down
8 changes: 4 additions & 4 deletions opendj-doc-maven-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 13,14 @@
information: "Portions Copyright [year] [name of copyright owner]".
Copyright 2015-2016 ForgeRock AS.
Portions Copyright 2018 Wren Security.
Portions Copyright 2018-2022 Wren Security.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>opendj-parent</artifactId>
<groupId>org.forgerock.opendj</groupId>
<artifactId>opendj-project</artifactId>
<groupId>org.wrensecurity.wrends</groupId>
<version>4.0.0-M4-SNAPSHOT</version>
</parent>

Expand All @@ -36,7 36,7 @@

<dependencies>
<dependency>
<groupId>org.forgerock.opendj</groupId>
<groupId>org.wrensecurity.wrends</groupId>
<artifactId>opendj-core</artifactId>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion ...doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateRefEntriesMojo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 64,7 @@ public enum Mode {
private MavenProject project;

/** Archive directory of the artifact (server or toolkit) to use to generate documentation. */
@Parameter(property = "docArchiveDir", defaultValue = "${project.build.directory}/opendj", required = true)
@Parameter(property = "docArchiveDir", defaultValue = "${project.build.directory}/wrends", required = true)
private String archiveDir;

/** Whether the plugin should use the server or the toolkit classpath. */
Expand Down
Loading

0 comments on commit 9a48ad0

Please sign in to comment.