mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git
opendj-maven-plugin/src/main/java/org/forgerock/opendj/maven/GenerateManifestClassPathMojo.java
@@ -82,6 +82,12 @@ private List<String> includes; /** * List of additional JARs to include in the classpath. Each item must be of format "file.jar". */ @Parameter private List<String> additionalJars; /** * Name of product jar, e.g. "OpenDJ". */ @Parameter @@ -158,6 +164,11 @@ } classpathItems.add(0, productJarName + ".jar"); } // add additional JARs if (additionalJars != null) { classpathItems.addAll(additionalJars); } return classpathItems; }
@@ -94,17 +94,6 @@ </dependency> <dependency> <groupId>org.forgerock.opendj</groupId> <artifactId>opendj-slf4j-adapter</artifactId> <version>${project.version}</version> <exclusions> <exclusion> <groupId>org.forgerock.opendj</groupId> <artifactId>opendj3-server-dev</artifactId> </exclusion> </exclusions> </dependency> <dependency> <groupId>org.forgerock.opendj</groupId> <artifactId>opendj-config</artifactId> <version>${project.version}</version> </dependency> @@ -376,6 +365,9 @@ <excludes> <exclude>org.slf4j:slf4j-jdk14</exclude> </excludes> <additionalJars> <additionalJar>opendj-slf4j-adapter.jar</additionalJar> </additionalJars> </configuration> </execution> <execution> @@ -387,9 +379,6 @@ <classPathProperty>classpath.bootstrap-client</classPathProperty> <productJarName>${shortProductName}</productJarName> <supportedLocales>${locales}</supportedLocales> <excludes> <exclude>org.forgerock.opendj:opendj-slf4j-adapter</exclude> </excludes> </configuration> </execution> @@ -661,6 +650,22 @@ </includes> </configuration> </execution> <!-- Package OpenDJ SL4J Logger Adapter jar --> <execution> <id>build-opendj-slf4j-adapter-jar</id> <phase>prepare-package</phase> <goals> <goal>jar</goal> </goals> <configuration> <outputDirectory>${jars.dir}</outputDirectory> <finalName>opendj-slf4j-adapter</finalName> <includes> <include>**/org/slf4j/**</include> <include>**/org/opends/server/loggers/OpenDJLogger*</include> </includes> </configuration> </execution> <!-- Build localized jars (one per supported locale) --> <!-- (is there a way to avoid all these repeated executions ?) --> <execution> @@ -852,6 +857,8 @@ <exclude>**/*_pl.properties</exclude> <exclude>**/*_zh_CN.properties</exclude> <exclude>**/*_zh_TW.properties</exclude> <exclude>org/slf4j/**</exclude> <exclude>org/opends/server/loggers/OpenDJLogger*</exclude> </excludes> <archive> <addMavenDescriptor>false</addMavenDescriptor> opendj-server-legacy/src/main/assembly/opendj-archive-component.xml
@@ -250,16 +250,9 @@ <fileSet> <directory>${jars.dir}</directory> <outputDirectory>lib</outputDirectory> <includes> <include>${shortProductName}_*.jar</include> </includes> </fileSet> <fileSet> <directory>${jars.dir}</directory> <outputDirectory>lib</outputDirectory> <includes> <include>bootstrap*.jar</include> </includes> <excludes> <exclude>build-tools.jar</exclude> </excludes> </fileSet> <fileSet> <directory>.</directory> @@ -275,16 +268,6 @@ <source>${basedir}/resource/images/opendj_logo.png</source> <outputDirectory></outputDirectory> </file> <!-- Main jar (OpenDJ) --> <file> <source>${jars.dir}/${shortProductName}.jar</source> <outputDirectory>lib</outputDirectory> </file> <!-- quicksetup jar --> <file> <source>${jars.dir}/quicksetup.jar</source> <outputDirectory>lib</outputDirectory> </file> <!-- Adds buildinfo to configuration template/config --> <file> <source>${project.build.outputDirectory}/META-INF/product/buildinfo</source> opendj-server-legacy/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
File was renamed from opendj-slf4j-adapter/src/main/java/org/slf4j/impl/StaticLoggerBinder.java @@ -27,11 +27,10 @@ import org.opends.server.loggers.OpenDJLoggerFactory; import org.slf4j.ILoggerFactory; import org.slf4j.LoggerFactory; import org.slf4j.spi.LoggerFactoryBinder; /** * Binds {@link LoggerFactory} class with an instance of {@link ILoggerFactory}. * Binds {@link org.slf4j.LoggerFactory} class with an instance of {@link ILoggerFactory}. */ //@Checkstyle:off public class StaticLoggerBinder implements LoggerFactoryBinder { opendj-server-legacy/src/main/java/org/slf4j/impl/StaticMDCBinder.java
File was renamed from opendj-slf4j-adapter/src/main/java/org/slf4j/impl/StaticMDCBinder.java @@ -25,13 +25,11 @@ */ package org.slf4j.impl; import org.slf4j.IMarkerFactory; import org.slf4j.MarkerFactory; import org.slf4j.helpers.BasicMDCAdapter; import org.slf4j.spi.MDCAdapter; /** * Binds {@link MarkerFactory} class with an instance of {@link IMarkerFactory}. * Binds {@link org.slf4j.MarkerFactory} class with an instance of {@link org.slf4j.IMarkerFactory}. */ //@Checkstyle:off public class StaticMDCBinder { opendj-server-legacy/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
File was renamed from opendj-slf4j-adapter/src/main/java/org/slf4j/impl/StaticMarkerBinder.java @@ -26,12 +26,11 @@ package org.slf4j.impl; import org.slf4j.IMarkerFactory; import org.slf4j.MarkerFactory; import org.slf4j.helpers.BasicMarkerFactory; import org.slf4j.spi.MarkerFactoryBinder; /** * Binds {@link MarkerFactory} class with an instance of {@link IMarkerFactory}. * Binds {@link org.slf4j.MarkerFactory} class with an instance of {@link IMarkerFactory}. */ //@Checkstyle:off public class StaticMarkerBinder implements MarkerFactoryBinder { opendj-server-legacy/src/main/java/org/slf4j/impl/package-info.java
opendj-slf4j-adapter/pom.xml
File was deleted opendj-slf4j-adapter/src/main/java/org/opends/server/loggers/OpenDJLoggerAdapter.java
File was deleted opendj-slf4j-adapter/src/main/java/org/opends/server/loggers/OpenDJLoggerFactory.java
File was deleted opendj-slf4j-adapter/src/main/java/org/opends/server/loggers/package-info.java
File was deleted pom.xml
@@ -102,7 +102,6 @@ <module>opendj-rest2ldap-servlet</module> <module>opendj-server</module> <module>opendj-server-example-plugin</module> <module>opendj-slf4j-adapter</module> <module>opendj-legacy</module> <module>opendj-server-legacy</module> </modules>
