diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..f9f355d --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,25 @@ +name: Build + +on: [push, pull_request] + +jobs: + build: + runs-on: ubuntu-latest + strategy: + matrix: + java: [11, 17] + name: "Java ${{ matrix.java }} build" + steps: + - uses: actions/checkout@v2 + - name: Set up JDK + uses: actions/setup-java@v1 + with: + java-version: ${{ matrix.java }} + - name: Cache Maven packages + uses: actions/cache@v2 + with: + path: ~/.m2 + key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} + restore-keys: ${{ runner.os }}-m2 + - name: Run the Maven verify phase + run: mvn -B verify --file pom.xml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1621bf5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,93 @@ +#--- Java ignores --- +*.class + +# Package Files # +*.jar +*.war +*.ear + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + + +#--- Maven ignores --- +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties + + +#--- IntelliJ ignores --- +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio + +*.iml + +## Directory-based project format: +.idea/ + +## File-based project format: +*.ipr +*.iws + +## Plugin-specific files: + +# IntelliJ +/out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties + + +#--- Eclipse ignores --- +*.pydevproject +.metadata +.gradle +bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +.settings/ +.loadpath + +# Eclipse Core +.project + +# External tool builders +.externalToolBuilders/ + +# Locally stored "Eclipse launch configurations" +*.launch + +# CDT-specific +.cproject + +# JDT-specific (Eclipse Java Development Tools) +.classpath + +# Java annotation processor (APT) +.factorypath + +# PDT-specific +.buildpath + +# sbteclipse plugin +.target + +# TeXlipse plugin +.texlipse diff --git a/README.md b/README.md new file mode 100644 index 0000000..73507e8 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# Wren Security i18n Framework + +Common framework for embedding localizable messages in applications. diff --git a/i18n-core/pom.xml b/i18n-core/pom.xml index 71bbf58..f344ab7 100644 --- a/i18n-core/pom.xml +++ b/i18n-core/pom.xml @@ -1,79 +1,76 @@ - + + 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 2011 ForgeRock AS. + Portions Copyright 2017-2022 Wren Security. +--> - 4.0.0 - - org.forgerock.commons - i18n-framework - 1.4.4-SNAPSHOT - - i18n-core - Wren Security I18N Core - - This module provides core Java APIs for embedding and using - localizable messages in applications. - - bundle - - - - src/main/resources - true - - - - - org.forgerock.commons - i18n-maven-plugin - ${project.version} - - - generate-test-sources - - generate-test-messages - - - - org/forgerock/i18n/my_test.properties - - - - - - - org.apache.felix - maven-bundle-plugin - true - - - org.forgerock.i18n.* - - - - - + 4.0.0 + + + org.wrensecurity.commons + i18n-framework + 1.5.0-SNAPSHOT + ../pom.xml + + + i18n-core + bundle + + Wren Security I18N Core + + + This module provides core Java APIs for embedding and using + localizable messages in applications. + + + + + + src/main/resources + true + + + + + org.wrensecurity.commons + i18n-maven-plugin + ${project.version} + + + generate-test-sources + + generate-test-messages + + + + org/forgerock/i18n/my_test.properties + + + + + + + org.apache.felix + maven-bundle-plugin + true + + + org.forgerock.i18n.* + + + + + diff --git a/i18n-core/src/main/javadoc/overview.html b/i18n-core/src/main/javadoc/overview.html new file mode 100644 index 0000000..6b788ac --- /dev/null +++ b/i18n-core/src/main/javadoc/overview.html @@ -0,0 +1,136 @@ + + + + The Wren Security I18N Framework for Java provides an easy to use type safe + API for obtaining localizable messages. +
+

Getting started

+ In order to get started using this framework you should first define some + localized messages in property files and locate these in your resource + directory. For example, consider the following simple properties files: + + Once you have your property files defined you can use the + i18n-maven-plugin to generate the messages. To do this, add the + following lines to your pom.xml: + 
  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.wrensecurity.commons</groupId>
+        <artifactId>i18n-maven-plugin</artifactId>
+        <version>${project.version}</version>
+        <executions>
+          <execution>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>generate-messages</goal>
+            </goals>
+            <configuration>
+              <messageFiles>
+                <messageFile>com/example/myapp/core.properties</messageFile>
+              </messageFiles>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+ This will generate a Java file in + target/generated-sources/messages/com/example/myapp/CoreMessages.java + containing {@link org.forgerock.i18n.LocalizableMessageDescriptor}s for each + message contained in the property file. For example: + 
  public final class CoreMessages {
+    ...
+
+    /**
+    * Message with no args
+    */
+    public static final LocalizableMessageDescriptor.Arg0 MESSAGE_WITH_NO_ARGS =
+            new LocalizableMessageDescriptor.Arg0(CoreMessages.class,RESOURCE,"MESSAGE_WITH_NO_ARGS",-1);
+
+    /**
+    * Arg1=%s
+    */
+    public static final LocalizableMessageDescriptor.Arg1<CharSequence> MESSAGE_WITH_STRING =
+            new LocalizableMessageDescriptor.Arg1<CharSequence>(CoreMessages.class,RESOURCE,"MESSAGE_WITH_STRING",-1);
+
+    /**
+    * Arg1=%s Arg2=%d
+    */
+    public static final LocalizableMessageDescriptor.Arg2<CharSequence,Number> MESSAGE_WITH_STRING_AND_NUMBER =
+            new LocalizableMessageDescriptor.Arg2<CharSequence,Number>(CoreMessages.class,RESOURCE,"MESSAGE_WITH_STRING_AND_NUMBER",-1);
+
+  }
+
+ To use the generated messages you'll need the following dependency: + 
+  <groupId>org.wrensecurity.commons</groupId>
+  <artifactId>i18n-core</artifactId>
+  <version>${project.version}</version>
+  <scope>compile</scope>
+
+ Messages can then be instantiated in a type safe manner which is enforced at + compile time (unlike CAL10N) as well as avoiding runtime errors due to + missing properties (CAL10N has this too): + 
+  LocalizableMessage m = MESSAGE_WITH_STRING_AND_NUMBER.get("a string", 123);
+  String s1 = m.toString(); // Default locale.
+  String s2 = m.toString(Locale.FRENCH);
+
+  // Using SLF4J support: using logger "com.example.mayapp.core" and default locale.
+  LocalizedLogger logger = LocalizedLoggerFactory.getInstance(CoreMessages.resourceName());
+  logger.error(MESSAGE_WITH_STRING_AND_NUMBER, "a string", 123);
+
+ Note that it is also possible to associated an ordinal with each message by + appending a number to the end of the property name. For example, the following + message will have the ordinal 389: + + The ordinal can be retrieved by calling the method + {@link org.forgerock.i18n.LocalizableMessage#ordinal()}. This allows each + message to be uniquely identified by its ordinal and its resource name + (e.g. "com.example.mayapp.core"), the latter being obtained by calling the + method {@link org.forgerock.i18n.LocalizableMessage#resourceName()} which is + also available in each generated message file. The ability to uniquely identify + log messages is useful when diagnosing log messages which have been output in a + locale that you don't understand. + + diff --git a/i18n-core/src/main/resources/javadoc/overview.html b/i18n-core/src/main/resources/javadoc/overview.html deleted file mode 100644 index 049a230..0000000 --- a/i18n-core/src/main/resources/javadoc/overview.html +++ /dev/null @@ -1,134 +0,0 @@ - - -The ForgeRock I18N Framework for Java provides an easy to use type safe -API for obtaining localizable messages. -
-

Getting started

-In order to get started using this framework you should first define some -localized messages in property files and locate these in your resource -directory. For example, consider the following simple properties files: - -Once you have your property files defined you can use the -i18n-maven-plugin to generate the messages. To do this, add the -following lines to your pom.xml: -
  <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>
-  </repositories>
-  
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>i18n-maven-plugin</artifactId>
-        <version>${project.version}</version>
-        <executions>
-          <execution>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>generate-messages</goal>
-            </goals>
-            <configuration>
-              <messageFiles>
-                <messageFile>com/example/myapp/core.properties</messageFile>
-              </messageFiles>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-  </build>
-This will generate a Java file in -target/generated-sources/messages/com/example/myapp/CoreMessages.java -containing {@link org.forgerock.i18n.LocalizableMessageDescriptor}s for each -message contained in the property file. For example: -
  public final class CoreMessages
-  {
-    ...
-  
-    /**
-     * Message with no args
-     */
-    public static final LocalizableMessageDescriptor.Arg0 MESSAGE_WITH_NO_ARGS =
-            new LocalizableMessageDescriptor.Arg0(CoreMessages.class,RESOURCE,"MESSAGE_WITH_NO_ARGS",-1);
-
-    /**
-     * Arg1=%s
-     */
-    public static final LocalizableMessageDescriptor.Arg1<CharSequence> MESSAGE_WITH_STRING =
-            new LocalizableMessageDescriptor.Arg1<CharSequence>(CoreMessages.class,RESOURCE,"MESSAGE_WITH_STRING",-1);
-
-    /**
-     * Arg1=%s Arg2=%d
-     */
-    public static final LocalizableMessageDescriptor.Arg2<CharSequence,Number> MESSAGE_WITH_STRING_AND_NUMBER =
-            new LocalizableMessageDescriptor.Arg2<CharSequence,Number>(CoreMessages.class,RESOURCE,"MESSAGE_WITH_STRING_AND_NUMBER",-1);
-
-  }
-To use the generated messages you'll need the following dependency: -
  <groupId>${project.groupId}</groupId>
-  <artifactId>i18n-core</artifactId>
-  <version>${project.version}</version>
-  <scope>compile</scope>
-Messages can then be instantiated in a type safe manner which is enforced at -compile time (unlike CAL10N) as well as avoiding runtime errors due to -missing properties (CAL10N has this too): -
  LocalizableMessage m = MESSAGE_WITH_STRING_AND_NUMBER.get("a string", 123);
-  String s1 = m.toString(); // Default locale.
-  String s2 = m.toString(Locale.FRENCH);
-
-  // Using SLF4J support: using logger "com.example.mayapp.core" and default locale.
-  LocalizedLogger logger = LocalizedLoggerFactory.getInstance(CoreMessages.resourceName());
-  logger.error(MESSAGE_WITH_STRING_AND_NUMBER, "a string", 123);
-Note that it is also possible to associated an ordinal with each message by -appending a number to the end of the property name. For example, the following -message will have the ordinal 389: - -The ordinal can be retrieved by calling the method -{@link org.forgerock.i18n.LocalizableMessage#ordinal()}. This allows each -message to be uniquely identified by its ordinal and its resource name -(e.g. "com.example.mayapp.core"), the latter being obtained by calling the -method {@link org.forgerock.i18n.LocalizableMessage#resourceName()} which is -also available in each generated message file. The ability to uniquely identify -log messages is useful when diagnosing log messages which have been output in a -locale that you don't understand. - - diff --git a/i18n-core/src/site/site.xml b/i18n-core/src/site/site.xml deleted file mode 100644 index 3f1dec9..0000000 --- a/i18n-core/src/site/site.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/i18n-core/src/site/xdoc/index.xml b/i18n-core/src/site/xdoc/index.xml deleted file mode 100644 index 7b436b4..0000000 --- a/i18n-core/src/site/xdoc/index.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - About I18N Core - ForgeRock AS - - -
-

- This module provides core Java APIs for embedding and using - localizable messages in applications. -

-
-
-

- General instructions on how to use the I18N Framework, including the - core API can be found on the main page. -

-
- - diff --git a/i18n-core/src/test/java/org/forgerock/i18n/LocalizableMessageTest.java b/i18n-core/src/test/java/org/forgerock/i18n/LocalizableMessageTest.java index a592ba6..1262df2 100644 --- a/i18n-core/src/test/java/org/forgerock/i18n/LocalizableMessageTest.java +++ b/i18n-core/src/test/java/org/forgerock/i18n/LocalizableMessageTest.java @@ -16,7 +16,7 @@ package org.forgerock.i18n; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import java.util.Locale; diff --git a/i18n-jul/pom.xml b/i18n-jul/pom.xml index 605fb50..988f575 100644 --- a/i18n-jul/pom.xml +++ b/i18n-jul/pom.xml @@ -1,78 +1,78 @@ - + - - 4.0.0 - - i18n-framework - org.forgerock.commons - 1.4.4-SNAPSHOT - - i18n-jul - Wren Security I18N Java Logging Support - This module provides an interface for efficiently writing localized messages out to a java.util.logging.Logger - bundle - - - org.forgerock.commons - i18n-core - ${project.version} - compile - - - - - - org.forgerock.commons - i18n-maven-plugin - ${project.version} - - - generate-test-sources - - generate-test-messages - - - - org/forgerock/i18n/jul/my_test.properties - - - - - - - org.apache.felix - maven-bundle-plugin - true - - - org.forgerock.i18n.jul.* - - - - - + 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 2011 ForgeRock AS. + Portions Copyright 2017-2022 Wren Security. +--> + + 4.0.0 + + + org.wrensecurity.commons + i18n-framework + 1.5.0-SNAPSHOT + ../pom.xml + + + i18n-jul + bundle + + Wren Security I18N Java Logging Support + + + This module provides an interface for efficiently writing + localized messages out to a java.util.logging.Logger + + + + + org.wrensecurity.commons + i18n-core + ${project.version} + + + + + + + org.wrensecurity.commons + i18n-maven-plugin + ${project.version} + + + generate-test-sources + + generate-test-messages + + + + org/forgerock/i18n/jul/my_test.properties + + + + + + + org.apache.felix + maven-bundle-plugin + true + + + org.forgerock.i18n.jul.* + + + + + diff --git a/i18n-jul/src/site/site.xml b/i18n-jul/src/site/site.xml deleted file mode 100644 index 6a9a834..0000000 --- a/i18n-jul/src/site/site.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/i18n-jul/src/site/xdoc/index.xml b/i18n-jul/src/site/xdoc/index.xml deleted file mode 100644 index acfb046..0000000 --- a/i18n-jul/src/site/xdoc/index.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - About I18N Java Logging - ForgeRock AS - - -
-

- This module provides an interface for efficiently writing localized - messages out to a Java Logger. -

-
-
-

- General instructions on how to use the I18N Framework, including the - Java Logger integration can be found on the main page. -

-
- - diff --git a/i18n-jul/src/test/java/org/forgerock/i18n/jul/LocalizedLoggerTest.java b/i18n-jul/src/test/java/org/forgerock/i18n/jul/LocalizedLoggerTest.java index 7c0eda9..69e0027 100644 --- a/i18n-jul/src/test/java/org/forgerock/i18n/jul/LocalizedLoggerTest.java +++ b/i18n-jul/src/test/java/org/forgerock/i18n/jul/LocalizedLoggerTest.java @@ -19,7 +19,7 @@ import static org.forgerock.i18n.jul.MyTestMessages.MESSAGE_WITH_NO_ARGS; import static org.forgerock.i18n.jul.MyTestMessages.MESSAGE_WITH_STRING; import static org.forgerock.i18n.jul.MyTestMessages.MESSAGE_WITH_STRING_AND_NUMBER; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; diff --git a/i18n-maven-plugin/pom.xml b/i18n-maven-plugin/pom.xml index de9d671..4b79181 100644 --- a/i18n-maven-plugin/pom.xml +++ b/i18n-maven-plugin/pom.xml @@ -1,110 +1,96 @@ - + - - 4.0.0 - - org.forgerock.commons - i18n-framework - 1.4.4-SNAPSHOT - - i18n-maven-plugin - maven-plugin - Wren Security I18N Maven Plugin - A Maven plugin which generates I18N messages from property files - - - org.apache.maven - maven-plugin-api - 2.0 - - - org.apache.maven - maven-project - 2.0 - - - - - - org.apache.maven.plugins - maven-plugin-plugin - 2.8 - - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - - Checkstyle - - X - - - goal - - X - - - parameter - - X - - - phase - - X - - - readonly - - X - - - required - - X - - - threadSafe - - X - - - - - - - + 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 2011 ForgeRock AS. + Portions Copyright 2017-2022 Wren Security. +--> + + 4.0.0 + + + org.wrensecurity.commons + i18n-framework + 1.5.0-SNAPSHOT + ../pom.xml + + + i18n-maven-plugin + maven-plugin + + Wren Security I18N Maven Plugin + + A Maven plugin which generates I18N messages from property files + + + + org.apache.maven + maven-plugin-api + 3.8.6 + + + org.apache.maven + maven-core + 3.8.6 + + + + + + + org.apache.maven.plugins + maven-plugin-plugin + + + org.apache.maven.plugins + maven-javadoc-plugin + + + + Checkstyle\\:ignoreFor + X + + + Checkstyle\\:ignore + X + + + goal + X + + + parameter + X + + + phase + X + + + readonly + X + + + required + X + + + threadSafe + X + + + + + + diff --git a/i18n-maven-plugin/src/site/site.xml b/i18n-maven-plugin/src/site/site.xml deleted file mode 100644 index 32e2ffb..0000000 --- a/i18n-maven-plugin/src/site/site.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/i18n-maven-plugin/src/site/xdoc/index.xml b/i18n-maven-plugin/src/site/xdoc/index.xml deleted file mode 100644 index 718eef3..0000000 --- a/i18n-maven-plugin/src/site/xdoc/index.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - I18N Maven Plugin - ForgeRock AS - - -
-

- A Maven plugin which generates I18N messages from property files. -

-
-
-

- This plugin has two goals: -

-
    -
  • - i18n:generate-messages - : Goal which generates message source files from a one or more - property files. -
    • - -
  • - i18n:clean-messages - : Goal which cleans unused messages files from a property file. -
    • -
-
-
-

- General instructions on how to use the I18N Framework, including this - framework can be found on the main page. -

-
- - diff --git a/i18n-maven-plugin/src/test/java/org/forgerock/i18n/maven/CleanMessagesMojoTest.java b/i18n-maven-plugin/src/test/java/org/forgerock/i18n/maven/CleanMessagesMojoTest.java index aa20742..a7d0db6 100644 --- a/i18n-maven-plugin/src/test/java/org/forgerock/i18n/maven/CleanMessagesMojoTest.java +++ b/i18n-maven-plugin/src/test/java/org/forgerock/i18n/maven/CleanMessagesMojoTest.java @@ -15,7 +15,7 @@ */ package org.forgerock.i18n.maven; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; diff --git a/i18n-maven-plugin/src/test/java/org/forgerock/i18n/maven/MessageFileTest.java b/i18n-maven-plugin/src/test/java/org/forgerock/i18n/maven/MessageFileTest.java index f21d3bd..c45240e 100644 --- a/i18n-maven-plugin/src/test/java/org/forgerock/i18n/maven/MessageFileTest.java +++ b/i18n-maven-plugin/src/test/java/org/forgerock/i18n/maven/MessageFileTest.java @@ -15,7 +15,7 @@ */ package org.forgerock.i18n.maven; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import org.forgerock.i18n.maven.AbstractGenerateMessagesMojo.MessageFile; import org.testng.annotations.DataProvider; diff --git a/i18n-maven-plugin/src/test/java/org/forgerock/i18n/maven/MessagePropertyKeyTest.java b/i18n-maven-plugin/src/test/java/org/forgerock/i18n/maven/MessagePropertyKeyTest.java index 223f887..cefc35e 100644 --- a/i18n-maven-plugin/src/test/java/org/forgerock/i18n/maven/MessagePropertyKeyTest.java +++ b/i18n-maven-plugin/src/test/java/org/forgerock/i18n/maven/MessagePropertyKeyTest.java @@ -15,7 +15,7 @@ */ package org.forgerock.i18n.maven; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; diff --git a/i18n-slf4j/pom.xml b/i18n-slf4j/pom.xml index a1b86c3..1cff59b 100644 --- a/i18n-slf4j/pom.xml +++ b/i18n-slf4j/pom.xml @@ -1,105 +1,96 @@ - + + 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 2011 ForgeRock AS. + Portions Copyright 2017-2022 Wren Security. +--> - 4.0.0 - - i18n-framework - org.forgerock.commons - 1.4.4-SNAPSHOT - - i18n-slf4j - Wren Security I18N SLF4J Support - This module provides an interface for efficiently writing localized messages out to a SLF4J Logger - bundle - - - org.forgerock.commons - i18n-core - ${project.version} - compile - - - org.slf4j - slf4j-api - 1.6.1 - jar - compile - - - - - - org.forgerock.commons - i18n-maven-plugin - ${project.version} - - - generate-test-sources - - generate-test-messages - - - - org/forgerock/i18n/slf4j/my_test.properties - - - - - - - org.apache.felix - maven-bundle-plugin - true - - - org.forgerock.i18n.slf4j.* - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - http://www.slf4j.org/apidocs - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - http://www.slf4j.org/apidocs - - - - - + 4.0.0 + + + org.wrensecurity.commons + i18n-framework + 1.5.0-SNAPSHOT + ../pom.xml + + + i18n-slf4j + bundle + + Wren Security I18N SLF4J Support + + + This module provides an interface for efficiently writing localized messages out to a SLF4J Logger + + + + + org.wrensecurity.commons + i18n-core + ${project.version} + + + org.slf4j + slf4j-api + 1.6.1 + jar + + + + + + + org.wrensecurity.commons + i18n-maven-plugin + ${project.version} + + + generate-test-sources + + generate-test-messages + + + + org/forgerock/i18n/slf4j/my_test.properties + + + + + + + org.apache.felix + maven-bundle-plugin + true + + + org.forgerock.i18n.slf4j.* + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + diff --git a/i18n-slf4j/src/site/site.xml b/i18n-slf4j/src/site/site.xml deleted file mode 100644 index fe57c03..0000000 --- a/i18n-slf4j/src/site/site.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/i18n-slf4j/src/site/xdoc/index.xml b/i18n-slf4j/src/site/xdoc/index.xml deleted file mode 100644 index 948ca03..0000000 --- a/i18n-slf4j/src/site/xdoc/index.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - About I18N SLF4J - ForgeRock AS - - -
-

- This module provides an interface for efficiently writing localized - messages out to a SLF4J Logger. -

-
-
-

- General instructions on how to use the I18N Framework, including the - SLF4J integration can be found on the main page. -

-
- - diff --git a/i18n-slf4j/src/test/java/org/forgerock/i18n/slf4j/LocalizedLoggerTest.java b/i18n-slf4j/src/test/java/org/forgerock/i18n/slf4j/LocalizedLoggerTest.java index b6f2f3c..5a3a2bc 100644 --- a/i18n-slf4j/src/test/java/org/forgerock/i18n/slf4j/LocalizedLoggerTest.java +++ b/i18n-slf4j/src/test/java/org/forgerock/i18n/slf4j/LocalizedLoggerTest.java @@ -16,7 +16,7 @@ package org.forgerock.i18n.slf4j; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.assertThat; import static org.forgerock.i18n.slf4j.MyTestMessages.*; import static org.mockito.Mockito.*; diff --git a/pom.xml b/pom.xml index 79ef5fb..c9ad6dd 100644 --- a/pom.xml +++ b/pom.xml @@ -1,133 +1,136 @@ - 4.0.0 - - org.forgerock - forgerock-parent - 1.2.1 - - org.forgerock.commons - i18n-framework - 1.4.4-SNAPSHOT - Wren Security I18N Framework - A fork of ForgeRock's common framework for embedding localizable messages in - applications - http://wrensecurity.org - pom - - GitHub Issues - https://github.com/WrenSecurity/wrensec-i18n-framework/issues - - - https://github.com/WrenSecurity/wrensec-i18n-framework - scm:git:git://github.com/WrenSecurity/wrensec-i18n-framework.git - scm:git:git@github.com:WrenSecurity/wrensec-i18n-framework.git - - - - wrensecurity-snapshots - Wren Security Snapshot Repository - ${forgerockDistMgmtSnapshotsUrl} - - - - wrensecurity-releases - Wren Security Release Repository - ${forgerockDistMgmtReleasesUrl} - - - - i18n-maven-plugin - i18n-core - i18n-jul - i18n-slf4j - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.4 - - - - mailing-list - issue-tracking - license - scm - cim - distribution-management - - - - - - - - 1.6 - 1.6 - - - - org.easytesting - fest-assert - 1.4 - test - - - org.testng - testng - 6.0.1 - test - - - org.mockito - mockito-all - 1.8.5 - test - - - - - - wrensecurity-releases - Wren Security Release Repository - https://wrensecurity.jfrog.io/wrensecurity/releases - - - false - - - - true - - - + 4.0.0 + + + org.wrensecurity + wrensec-parent + 3.3.0 + + + org.wrensecurity.commons + i18n-framework + 1.5.0-SNAPSHOT + pom + + Wren Security I18N Framework + + + Common framework for embedding localizable messages in applications. + + + + https://github.com/WrenSecurity/wrensec-i18n-framework + scm:git:git://github.com/WrenSecurity/wrensec-i18n-framework.git + scm:git:git@github.com:WrenSecurity/wrensec-i18n-framework.git + + + + + wrensecurity-releases + Wren Security Release Repository + https://wrensecurity.jfrog.io/wrensecurity/releases + + + false + + + + true + + + + + wrensecurity-snapshots + Wren Security Snapshot Repository + https://wrensecurity.jfrog.io/wrensecurity/snapshots + + + true + + + + false + + + + + + GitHub Issues + https://github.com/WrenSecurity/wrensec-i18n-framework/issues + + + + 1.6.2 + 7.3.0 + 4.4.0 + 3.23.1 + + + + i18n-maven-plugin + i18n-core + i18n-jul + i18n-slf4j + + + + + org.assertj + assertj-core + ${assertj.version} + test + + + org.testng + testng + ${testng.version} + test + + + org.mockito + mockito-core + ${mockito.version} + test + + + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + + + + + mailing-lists + issue-management + licenses + scm + ci-management + distribution-management + + + + + + + diff --git a/src/site/site.xml b/src/site/site.xml index b04046a..b7feac3 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -1,59 +1,23 @@ - - - org.forgerock.commons - forgerock-community-skin - 1.0.0-SNAPSHOT - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + +