From 61922153c6164c00b40b638d6477e1039125352a Mon Sep 17 00:00:00 2001 From: Karel Maxa Date: Thu, 10 Nov 2022 10:16:43 +0100 Subject: [PATCH] Perform project cleanup. --- .github/workflows/build.yml | 25 ++++ .gitignore | 93 +++++++++++++- .wren-deploy.rc | 14 --- all/pom.xml | 21 ++-- annotations/pom.xml | 29 +++-- base/pom.xml | 35 +++--- cache/pom.xml | 51 ++++---- collect/pom.xml | 47 ++++--- concurrent/pom.xml | 51 ++++---- escape/pom.xml | 39 +++--- eventbus/pom.xml | 55 +++++---- hash/pom.xml | 47 ++++--- html/pom.xml | 39 +++--- io/pom.xml | 51 ++++---- math/pom.xml | 39 +++--- net/pom.xml | 61 +++++---- pom.xml | 158 ++++++++++++++---------- primitives/pom.xml | 39 +++--- reflect/pom.xml | 47 ++++--- src/main/resources/META-INF/MANIFEST.MF | 74 +++++------ xml/pom.xml | 43 ++++--- 21 files changed, 647 insertions(+), 411 deletions(-) create mode 100644 .github/workflows/build.yml delete mode 100644 .wren-deploy.rc 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 index ca37d98..1621bf5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,93 @@ -dependency-reduced-pom.xml +#--- 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/.wren-deploy.rc b/.wren-deploy.rc deleted file mode 100644 index 88df883..0000000 --- a/.wren-deploy.rc +++ /dev/null @@ -1,14 +0,0 @@ -export MAVEN_PACKAGE="forgerock-guava" -export BINTRAY_PACKAGE="wrensec-guava" -export JFROG_PACKAGE="org/forgerock/guava" - -package_accept_release_tag() { - local tag_name="${1}" - - if [[ "${tag_name}" == "18.0" ]]; then - echo "Skipping ${tag_name} since we only want to build 18.0.1 through 18.0.4 right now." - return -1 - else - return 0 - fi -} diff --git a/all/pom.xml b/all/pom.xml index 6a16b08..ed809fd 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -13,19 +13,24 @@ information: "Portions Copyrighted [year] [name of copyright owner]". Copyright 2014-2015 ForgeRock AS. - Copyright 2017 Wren Security. + Portions Copyright 2017-2022 Wren Security. --> 4.0.0 + - org.forgerock.commons.guava - forgerock-guava - 18.0.4 + org.wrensecurity.commons.guava + wrensec-guava + 18.0.5-SNAPSHOT + + wrensec-guava-all jar - forgerock-guava-all + Wren Security Guava - Full Google Guava Package + Provides the entire Google Guava package. Other packages repackage the contents of this package to avoid dependency collisions. + com.google.guava @@ -33,6 +38,7 @@ 18.0 + @@ -40,6 +46,7 @@ true + org.codehaus.mojo @@ -62,7 +69,7 @@ com.google - org.forgerock.guava + org.wrensecurity.guava @@ -78,7 +85,7 @@ ${parsedVersion.osgiVersion} javax.annotation;resolution:=optional,sun.misc;resolution:=optional - org.forgerock.guava.common.annotations;version="${parsedVersion.osgiVersion}",org.forgerock.guava.common.base;version="${parsedVersion.osgiVersion}",org.forgerock.guava.common.cache;version="${parsedVersion.osgiVersion}",org.forgerock.guava.common.collect;version="${parsedVersion.osgiVersion}",org.forgerock.guava.common.concurrent;version="${parsedVersion.osgiVersion}",org.forgerock.guava.common.escape;version="${parsedVersion.osgiVersion}",org.forgerock.guava.common.eventbus;version="${parsedVersion.osgiVersion}",org.forgerock.guava.common.hash;version="${parsedVersion.osgiVersion}",org.forgerock.guava.common.html;version="${parsedVersion.osgiVersion}",org.forgerock.guava.common.io;version="${parsedVersion.osgiVersion}",org.forgerock.guava.common.math;version="${parsedVersion.osgiVersion}",org.forgerock.guava.common.net;version="${parsedVersion.osgiVersion}",org.forgerock.guava.common.primitives;version="${parsedVersion.osgiVersion}",org.forgerock.guava.common.reflect;version="${parsedVersion.osgiVersion}" + org.wrensecurity.guava.common.annotations;version="${parsedVersion.osgiVersion}",org.wrensecurity.guava.common.base;version="${parsedVersion.osgiVersion}",org.wrensecurity.guava.common.cache;version="${parsedVersion.osgiVersion}",org.wrensecurity.guava.common.collect;version="${parsedVersion.osgiVersion}",org.wrensecurity.guava.common.concurrent;version="${parsedVersion.osgiVersion}",org.wrensecurity.guava.common.escape;version="${parsedVersion.osgiVersion}",org.wrensecurity.guava.common.eventbus;version="${parsedVersion.osgiVersion}",org.wrensecurity.guava.common.hash;version="${parsedVersion.osgiVersion}",org.wrensecurity.guava.common.html;version="${parsedVersion.osgiVersion}",org.wrensecurity.guava.common.io;version="${parsedVersion.osgiVersion}",org.wrensecurity.guava.common.math;version="${parsedVersion.osgiVersion}",org.wrensecurity.guava.common.net;version="${parsedVersion.osgiVersion}",org.wrensecurity.guava.common.primitives;version="${parsedVersion.osgiVersion}",org.wrensecurity.guava.common.reflect;version="${parsedVersion.osgiVersion}" diff --git a/annotations/pom.xml b/annotations/pom.xml index 8f97862..3594701 100644 --- a/annotations/pom.xml +++ b/annotations/pom.xml @@ -13,25 +13,31 @@ information: "Portions Copyrighted [year] [name of copyright owner]". Copyright 2014-2015 ForgeRock AS. - Copyright 2017 Wren Security. + Portions Copyright 2017-2022 Wren Security. --> 4.0.0 + - org.forgerock.commons.guava - forgerock-guava - 18.0.4 + org.wrensecurity.commons.guava + wrensec-guava + 18.0.5-SNAPSHOT + + wrensec-guava-annotations jar - forgerock-guava-annotations + Wren Security Guava - Annotations + Provides common annotation types. Repackaged to avoid dependency collisions. + - org.forgerock.commons.guava - forgerock-guava-all + org.wrensecurity.commons.guava + wrensec-guava-all + @@ -39,6 +45,7 @@ true + org.codehaus.mojo @@ -58,14 +65,14 @@ - org.forgerock.commons.guava:forgerock-guava-all + org.wrensecurity.commons.guava:wrensec-guava-all - org.forgerock.commons.guava:forgerock-guava-all + org.wrensecurity.commons.guava:wrensec-guava-all - org/forgerock/guava/common/annotations/** + org/wrensecurity/guava/common/annotations/** @@ -73,7 +80,7 @@ ${parsedVersion.osgiVersion} - org.forgerock.guava.common.annotations;version="${parsedVersion.osgiVersion}" + org.wrensecurity.guava.common.annotations;version="${parsedVersion.osgiVersion}" diff --git a/base/pom.xml b/base/pom.xml index 4cc23e8..cfd5939 100644 --- a/base/pom.xml +++ b/base/pom.xml @@ -13,29 +13,35 @@ information: "Portions Copyrighted [year] [name of copyright owner]". Copyright 2014-2015 ForgeRock AS. - Copyright 2017 Wren Security. + Portions Copyright 2017-2022 Wren Security. --> 4.0.0 + - org.forgerock.commons.guava - forgerock-guava - 18.0.4 + org.wrensecurity.commons.guava + wrensec-guava + 18.0.5-SNAPSHOT + + wrensec-guava-base jar - forgerock-guava-base + Wren Security Guava - Base + Provides basic utility libraries and interfaces. Repackaged to avoid dependency collisions. + - org.forgerock.commons.guava - forgerock-guava-all + org.wrensecurity.commons.guava + wrensec-guava-all - org.forgerock.commons.guava - forgerock-guava-annotations + org.wrensecurity.commons.guava + wrensec-guava-annotations + @@ -43,6 +49,7 @@ true + org.codehaus.mojo @@ -62,15 +69,15 @@ - org.forgerock.commons.guava:forgerock-guava-all + org.wrensecurity.commons.guava:wrensec-guava-all - org.forgerock.commons.guava:forgerock-guava-all + org.wrensecurity.commons.guava:wrensec-guava-all - org/forgerock/guava/common/base/** - org/forgerock/guava/common/base/internal/** + org/wrensecurity/guava/common/base/** + org/wrensecurity/guava/common/base/internal/** @@ -79,7 +86,7 @@ ${parsedVersion.osgiVersion} javax.annotation;resolution:=optional - org.forgerock.guava.common.base;uses:="javax.annotation";version="${parsedVersion.osgiVersion}" + org.wrensecurity.guava.common.base;uses:="javax.annotation";version="${parsedVersion.osgiVersion}" diff --git a/cache/pom.xml b/cache/pom.xml index 3b482c4..cedfb15 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -13,45 +13,51 @@ information: "Portions Copyrighted [year] [name of copyright owner]". Copyright 2014-2015 ForgeRock AS. - Copyright 2017 Wren Security. + Portions Copyright 2017-2022 Wren Security. --> 4.0.0 + - org.forgerock.commons.guava - forgerock-guava - 18.0.4 + org.wrensecurity.commons.guava + wrensec-guava + 18.0.5-SNAPSHOT + + wrensec-guava-cache jar - forgerock-guava-cache + Wren Security Guava - Cache + Provides utilities for in-memory and loadable caching. Repackaged to avoid dependency collisions. + - org.forgerock.commons.guava - forgerock-guava-all + org.wrensecurity.commons.guava + wrensec-guava-all - org.forgerock.commons.guava - forgerock-guava-annotations + org.wrensecurity.commons.guava + wrensec-guava-annotations - org.forgerock.commons.guava - forgerock-guava-base + org.wrensecurity.commons.guava + wrensec-guava-base - org.forgerock.commons.guava - forgerock-guava-collect + org.wrensecurity.commons.guava + wrensec-guava-collect - org.forgerock.commons.guava - forgerock-guava-primitives + org.wrensecurity.commons.guava + wrensec-guava-primitives - org.forgerock.commons.guava - forgerock-guava-concurrent + org.wrensecurity.commons.guava + wrensec-guava-concurrent + @@ -59,6 +65,7 @@ true + org.codehaus.mojo @@ -78,14 +85,14 @@ - org.forgerock.commons.guava:forgerock-guava-all + org.wrensecurity.commons.guava:wrensec-guava-all - org.forgerock.commons.guava:forgerock-guava-all + org.wrensecurity.commons.guava:wrensec-guava-all - org/forgerock/guava/common/cache/** + org/wrensecurity/guava/common/cache/** @@ -93,8 +100,8 @@ ${parsedVersion.osgiVersion} - javax.annotation;resolution:=optional,sun.misc;resolution:=optional,org.forgerock.guava.common.collect;version="${parsedVersion.osgiVersion}",org.forgerock.guava.common.util.concurrent;version="${parsedVersion.osgiVersion}",org.forgerock.guava.common.base;version="${parsedVersion.osgiVersion}",org.forgerock.guava.common.primitives;version="${parsedVersion.osgiVersion}" - org.forgerock.guava.common.cache;version="${parsedVersion.osgiVersion}" + javax.annotation;resolution:=optional,sun.misc;resolution:=optional,org.wrensecurity.guava.common.collect;version="${parsedVersion.osgiVersion}",org.wrensecurity.guava.common.util.concurrent;version="${parsedVersion.osgiVersion}",org.wrensecurity.guava.common.base;version="${parsedVersion.osgiVersion}",org.wrensecurity.guava.common.primitives;version="${parsedVersion.osgiVersion}" + org.wrensecurity.guava.common.cache;version="${parsedVersion.osgiVersion}" diff --git a/collect/pom.xml b/collect/pom.xml index ebb2e39..d55b96d 100644 --- a/collect/pom.xml +++ b/collect/pom.xml @@ -13,41 +13,47 @@ information: "Portions Copyrighted [year] [name of copyright owner]". Copyright 2014-2015 ForgeRock AS. - Copyright 2017 Wren Security. + Portions Copyright 2017-2022 Wren Security. --> 4.0.0 + - org.forgerock.commons.guava - forgerock-guava - 18.0.4 + org.wrensecurity.commons.guava + wrensec-guava + 18.0.5-SNAPSHOT + + wrensec-guava-collect jar - forgerock-guava-collect + Wren Security Guava - Collections + Provides generic collection interfaces and implementations, and other utilities for working with collections. Repackaged to avoid dependency collisions. + - org.forgerock.commons.guava - forgerock-guava-all + org.wrensecurity.commons.guava + wrensec-guava-all - org.forgerock.commons.guava - forgerock-guava-annotations + org.wrensecurity.commons.guava + wrensec-guava-annotations - org.forgerock.commons.guava - forgerock-guava-base + org.wrensecurity.commons.guava + wrensec-guava-base - org.forgerock.commons.guava - forgerock-guava-math + org.wrensecurity.commons.guava + wrensec-guava-math - org.forgerock.commons.guava - forgerock-guava-primitives + org.wrensecurity.commons.guava + wrensec-guava-primitives + @@ -55,6 +61,7 @@ true + org.codehaus.mojo @@ -74,14 +81,14 @@ - org.forgerock.commons.guava:forgerock-guava-all + org.wrensecurity.commons.guava:wrensec-guava-all - org.forgerock.commons.guava:forgerock-guava-all + org.wrensecurity.commons.guava:wrensec-guava-all - org/forgerock/guava/common/collect/** + org/wrensecurity/guava/common/collect/** @@ -89,8 +96,8 @@ ${parsedVersion.osgiVersion} - javax.annotation;resolution:=optional,org.forgerock.guava.common.base;version="${parsedVersion.osgiVersion}",org.forgerock.guava.common.primitives;version="${parsedVersion.osgiVersion}",org.forgerock.guava.common.math;version="${parsedVersion.osgiVersion}" - org.forgerock.guava.common.collect;version="${parsedVersion.osgiVersion}" + javax.annotation;resolution:=optional,org.wrensecurity.guava.common.base;version="${parsedVersion.osgiVersion}",org.wrensecurity.guava.common.primitives;version="${parsedVersion.osgiVersion}",org.wrensecurity.guava.common.math;version="${parsedVersion.osgiVersion}" + org.wrensecurity.guava.common.collect;version="${parsedVersion.osgiVersion}" diff --git a/concurrent/pom.xml b/concurrent/pom.xml index dd278c4..510139c 100644 --- a/concurrent/pom.xml +++ b/concurrent/pom.xml @@ -13,45 +13,51 @@ information: "Portions Copyrighted [year] [name of copyright owner]". Copyright 2014-2015 ForgeRock AS. - Copyright 2017 Wren Security. + Portions Copyright 2017-2022 Wren Security. --> 4.0.0 + - org.forgerock.commons.guava - forgerock-guava - 18.0.4 + org.wrensecurity.commons.guava + wrensec-guava + 18.0.5-SNAPSHOT + jar - forgerock-guava-concurrent + wrensec-guava-concurrent + Wren Security Guava - Concurrency + Provides utilities for working with concurrency, including threads, Executors, and Futures. Repackaged to avoid dependency collisions. + - org.forgerock.commons.guava - forgerock-guava-all + org.wrensecurity.commons.guava + wrensec-guava-all - org.forgerock.commons.guava - forgerock-guava-annotations + org.wrensecurity.commons.guava + wrensec-guava-annotations - org.forgerock.commons.guava - forgerock-guava-base + org.wrensecurity.commons.guava + wrensec-guava-base - org.forgerock.commons.guava - forgerock-guava-collect + org.wrensecurity.commons.guava + wrensec-guava-collect - org.forgerock.commons.guava - forgerock-guava-math + org.wrensecurity.commons.guava + wrensec-guava-math - org.forgerock.commons.guava - forgerock-guava-primitives + org.wrensecurity.commons.guava + wrensec-guava-primitives + @@ -59,6 +65,7 @@ true + org.codehaus.mojo @@ -78,14 +85,14 @@ - org.forgerock.commons.guava:forgerock-guava-all + org.wrensecurity.commons.guava:wrensec-guava-all - org.forgerock.commons.guava:forgerock-guava-all + org.wrensecurity.commons.guava:wrensec-guava-all - org/forgerock/guava/common/util/concurrent/** + org/wrensecurity/guava/common/util/concurrent/** @@ -95,8 +102,8 @@ ${project.groupId}.${project.artifactId} ${project.name} ${parsedVersion.osgiVersion} - javax.annotation;resolution:=optional,org.forgerock.guava.common.base;version="${parsedVersion.osgiVersion}",org.forgerock.guava.common.collect;version="${parsedVersion.osgiVersion}",org.forgerock.guava.common.primitives;version="${parsedVersion.osgiVersion}",org.forgerock.guava.common.math;version="${parsedVersion.osgiVersion}" - org.forgerock.guava.common.util.concurrent;version="${parsedVersion.osgiVersion}" + javax.annotation;resolution:=optional,org.wrensecurity.guava.common.base;version="${parsedVersion.osgiVersion}",org.wrensecurity.guava.common.collect;version="${parsedVersion.osgiVersion}",org.wrensecurity.guava.common.primitives;version="${parsedVersion.osgiVersion}",org.wrensecurity.guava.common.math;version="${parsedVersion.osgiVersion}" + org.wrensecurity.guava.common.util.concurrent;version="${parsedVersion.osgiVersion}" diff --git a/escape/pom.xml b/escape/pom.xml index eef0531..fb31f95 100644 --- a/escape/pom.xml +++ b/escape/pom.xml @@ -13,33 +13,39 @@ information: "Portions Copyrighted [year] [name of copyright owner]". Copyright 2014-2015 ForgeRock AS. - Copyright 2017 Wren Security. + Portions Copyright 2017-2022 Wren Security. --> 4.0.0 + - org.forgerock.commons.guava - forgerock-guava - 18.0.4 + org.wrensecurity.commons.guava + wrensec-guava + 18.0.5-SNAPSHOT + + wrensec-guava-escape jar - forgerock-guava-escape + Wren Security Guava - Escape + Provides interfaces, utilities, and simple implementations of escapers and encoders. Repackaged to avoid dependency collisions. + - org.forgerock.commons.guava - forgerock-guava-all + org.wrensecurity.commons.guava + wrensec-guava-all - org.forgerock.commons.guava - forgerock-guava-annotations + org.wrensecurity.commons.guava + wrensec-guava-annotations - org.forgerock.commons.guava - forgerock-guava-base + org.wrensecurity.commons.guava + wrensec-guava-base + @@ -47,6 +53,7 @@ true + org.codehaus.mojo @@ -66,14 +73,14 @@ - org.forgerock.commons.guava:forgerock-guava-all + org.wrensecurity.commons.guava:wrensec-guava-all - org.forgerock.commons.guava:forgerock-guava-all + org.wrensecurity.commons.guava:wrensec-guava-all - org/forgerock/guava/common/escape/** + org/wrensecurity/guava/common/escape/** @@ -81,8 +88,8 @@ ${parsedVersion.osgiVersion} - javax.annotation;resolution:=optional,org.forgerock.guava.common.base;version="${parsedVersion.osgiVersion}" - org.forgerock.guava.common.escape;version="${parsedVersion.osgiVersion}" + javax.annotation;resolution:=optional,org.wrensecurity.guava.common.base;version="${parsedVersion.osgiVersion}" + org.wrensecurity.guava.common.escape;version="${parsedVersion.osgiVersion}" diff --git a/eventbus/pom.xml b/eventbus/pom.xml index 57f27d4..26b4c9b 100644 --- a/eventbus/pom.xml +++ b/eventbus/pom.xml @@ -13,49 +13,55 @@ information: "Portions Copyrighted [year] [name of copyright owner]". Copyright 2014-2015 ForgeRock AS. - Portions Copyright 2017 Wren Security. + Portions Copyright 2017-2022 Wren Security. --> 4.0.0 + - org.forgerock.commons.guava - forgerock-guava - 18.0.4 + org.wrensecurity.commons.guava + wrensec-guava + 18.0.5-SNAPSHOT + + wrensec-guava-eventbus jar - forgerock-guava-eventbus + Wren Security Guava - Event Bus + Allows publish-subscribe-style communication between components without requiring the components to explicitly register with one another Repackaged to avoid dependency collisions. + - org.forgerock.commons.guava - forgerock-guava-all + org.wrensecurity.commons.guava + wrensec-guava-all - org.forgerock.commons.guava - forgerock-guava-annotations + org.wrensecurity.commons.guava + wrensec-guava-annotations - org.forgerock.commons.guava - forgerock-guava-base + org.wrensecurity.commons.guava + wrensec-guava-base - org.forgerock.commons.guava - forgerock-guava-cache + org.wrensecurity.commons.guava + wrensec-guava-cache - org.forgerock.commons.guava - forgerock-guava-collect + org.wrensecurity.commons.guava + wrensec-guava-collect - org.forgerock.commons.guava - forgerock-guava-reflect + org.wrensecurity.commons.guava + wrensec-guava-reflect - org.forgerock.commons.guava - forgerock-guava-concurrent + org.wrensecurity.commons.guava + wrensec-guava-concurrent + @@ -63,6 +69,7 @@ true + org.codehaus.mojo @@ -82,14 +89,14 @@ - org.forgerock.commons.guava:forgerock-guava-all + org.wrensecurity.commons.guava:wrensec-guava-all - org.forgerock.commons.guava:forgerock-guava-all + org.wrensecurity.commons.guava:wrensec-guava-all - org/forgerock/guava/common/eventbus/** + org/wrensecurity/guava/common/eventbus/** @@ -97,8 +104,8 @@ ${parsedVersion.osgiVersion} - javax.annotation;resolution:=optional,org.forgerock.guava.common.collect;version="${parsedVersion.osgiVersion}",org.forgerock.guava.common.cache;version="${parsedVersion.osgiVersion}",org.forgerock.guava.common.base;version="${parsedVersion.osgiVersion}",org.forgerock.guava.common.util.concurrent;version="${parsedVersion.osgiVersion}",org.forgerock.guava.common.reflect;version="${parsedVersion.osgiVersion}" - org.forgerock.guava.common.eventbus;version="${parsedVersion.osgiVersion}" + javax.annotation;resolution:=optional,org.wrensecurity.guava.common.collect;version="${parsedVersion.osgiVersion}",org.wrensecurity.guava.common.cache;version="${parsedVersion.osgiVersion}",org.wrensecurity.guava.common.base;version="${parsedVersion.osgiVersion}",org.wrensecurity.guava.common.util.concurrent;version="${parsedVersion.osgiVersion}",org.wrensecurity.guava.common.reflect;version="${parsedVersion.osgiVersion}" + org.wrensecurity.guava.common.eventbus;version="${parsedVersion.osgiVersion}" diff --git a/hash/pom.xml b/hash/pom.xml index 9c3b0ad..2d91f86 100644 --- a/hash/pom.xml +++ b/hash/pom.xml @@ -13,41 +13,47 @@ information: "Portions Copyrighted [year] [name of copyright owner]". Copyright 2014-2015 ForgeRock AS. - Portions Copyright 2017 Wren Security. + Portions Copyright 2017-2022 Wren Security. --> 4.0.0 + - org.forgerock.commons.guava - forgerock-guava - 18.0.4 + org.wrensecurity.commons.guava + wrensec-guava + 18.0.5-SNAPSHOT + + wrensec-guava-hash jar - forgerock-guava-hash + Wren Security Guava - Hash + Provides hash functions and related structures. Repackaged to avoid dependency collisions. + - org.forgerock.commons.guava - forgerock-guava-all + org.wrensecurity.commons.guava + wrensec-guava-all - org.forgerock.commons.guava - forgerock-guava-annotations + org.wrensecurity.commons.guava + wrensec-guava-annotations - org.forgerock.commons.guava - forgerock-guava-base + org.wrensecurity.commons.guava + wrensec-guava-base - org.forgerock.commons.guava - forgerock-guava-math + org.wrensecurity.commons.guava + wrensec-guava-math - org.forgerock.commons.guava - forgerock-guava-primitives + org.wrensecurity.commons.guava + wrensec-guava-primitives + @@ -55,6 +61,7 @@ true + org.codehaus.mojo @@ -74,14 +81,14 @@ - org.forgerock.commons.guava:forgerock-guava-all + org.wrensecurity.commons.guava:wrensec-guava-all - org.forgerock.commons.guava:forgerock-guava-all + org.wrensecurity.commons.guava:wrensec-guava-all - org/forgerock/guava/common/hash/** + org/wrensecurity/guava/common/hash/** @@ -89,8 +96,8 @@ ${parsedVersion.osgiVersion} - javax.annotation;resolution:=optional,org.forgerock.guava.common.primitives;version="${parsedVersion.osgiVersion}",org.forgerock.guava.common.base;version="${parsedVersion.osgiVersion}",org.forgerock.guava.common.math;version="${parsedVersion.osgiVersion}" - org.forgerock.guava.common.hash;version="${parsedVersion.osgiVersion}" + javax.annotation;resolution:=optional,org.wrensecurity.guava.common.primitives;version="${parsedVersion.osgiVersion}",org.wrensecurity.guava.common.base;version="${parsedVersion.osgiVersion}",org.wrensecurity.guava.common.math;version="${parsedVersion.osgiVersion}" + org.wrensecurity.guava.common.hash;version="${parsedVersion.osgiVersion}" diff --git a/html/pom.xml b/html/pom.xml index 18b4e47..273e3e7 100644 --- a/html/pom.xml +++ b/html/pom.xml @@ -13,33 +13,39 @@ information: "Portions Copyrighted [year] [name of copyright owner]". Copyright 2014-2015 ForgeRock AS. - Portions Copyright 2017 Wren Security. + Portions Copyright 2017-2022 Wren Security. --> 4.0.0 + - org.forgerock.commons.guava - forgerock-guava - 18.0.4 + org.wrensecurity.commons.guava + wrensec-guava + 18.0.5-SNAPSHOT + + wrensec-guava-html jar - forgerock-guava-html + Wren Security Guava - HTML + Escapers for HTML. Repackaged to avoid dependency collisions. + - org.forgerock.commons.guava - forgerock-guava-all + org.wrensecurity.commons.guava + wrensec-guava-all - org.forgerock.commons.guava - forgerock-guava-annotations + org.wrensecurity.commons.guava + wrensec-guava-annotations - org.forgerock.commons.guava - forgerock-guava-escape + org.wrensecurity.commons.guava + wrensec-guava-escape + @@ -47,6 +53,7 @@ true + org.codehaus.mojo @@ -66,14 +73,14 @@ - org.forgerock.commons.guava:forgerock-guava-all + org.wrensecurity.commons.guava:wrensec-guava-all - org.forgerock.commons.guava:forgerock-guava-all + org.wrensecurity.commons.guava:wrensec-guava-all - org/forgerock/guava/common/html/** + org/wrensecurity/guava/common/html/** @@ -81,8 +88,8 @@ ${parsedVersion.osgiVersion} - javax.annotation;resolution:=optional,org.forgerock.guava.common.escape;version="${parsedVersion.osgiVersion}" - org.forgerock.guava.common.html;version="${parsedVersion.osgiVersion}" + javax.annotation;resolution:=optional,org.wrensecurity.guava.common.escape;version="${parsedVersion.osgiVersion}" + org.wrensecurity.guava.common.html;version="${parsedVersion.osgiVersion}" diff --git a/io/pom.xml b/io/pom.xml index 3b450ff..09cee27 100644 --- a/io/pom.xml +++ b/io/pom.xml @@ -13,45 +13,51 @@ information: "Portions Copyrighted [year] [name of copyright owner]". Copyright 2014-2015 ForgeRock AS. - Portions Copyright 2017 Wren Security. + Portions Copyright 2017-2022 Wren Security. --> 4.0.0 + - org.forgerock.commons.guava - forgerock-guava - 18.0.4 + org.wrensecurity.commons.guava + wrensec-guava + 18.0.5-SNAPSHOT + + wrensec-guava-io jar - forgerock-guava-io + Wren Security Guava - IO + Provides utility methods and classes for working with Java I/O; for example input streams, output streams, readers, writers, and files. Repackaged to avoid dependency collisions. + - org.forgerock.commons.guava - forgerock-guava-all + org.wrensecurity.commons.guava + wrensec-guava-all - org.forgerock.commons.guava - forgerock-guava-annotations + org.wrensecurity.commons.guava + wrensec-guava-annotations - org.forgerock.commons.guava - forgerock-guava-base + org.wrensecurity.commons.guava + wrensec-guava-base - org.forgerock.commons.guava - forgerock-guava-collect + org.wrensecurity.commons.guava + wrensec-guava-collect - org.forgerock.commons.guava - forgerock-guava-hash + org.wrensecurity.commons.guava + wrensec-guava-hash - org.forgerock.commons.guava - forgerock-guava-primitives + org.wrensecurity.commons.guava + wrensec-guava-primitives + @@ -59,6 +65,7 @@ true + org.codehaus.mojo @@ -78,14 +85,14 @@ - org.forgerock.commons.guava:forgerock-guava-all + org.wrensecurity.commons.guava:wrensec-guava-all - org.forgerock.commons.guava:forgerock-guava-all + org.wrensecurity.commons.guava:wrensec-guava-all - org/forgerock/guava/common/io/** + org/wrensecurity/guava/common/io/** @@ -93,8 +100,8 @@ ${parsedVersion.osgiVersion} - javax.annotation;resolution:=optional,org.forgerock.guava.common.base;version="${parsedVersion.osgiVersion}",org.forgerock.guava.common.math;version="${parsedVersion.osgiVersion}",org.forgerock.guava.common.hash;version="${parsedVersion.osgiVersion}",org.forgerock.guava.common.collect;version="${parsedVersion.osgiVersion}",org.forgerock.guava.common.primitives;version="${parsedVersion.osgiVersion}" - org.forgerock.guava.common.io;version="${parsedVersion.osgiVersion}" + javax.annotation;resolution:=optional,org.wrensecurity.guava.common.base;version="${parsedVersion.osgiVersion}",org.wrensecurity.guava.common.math;version="${parsedVersion.osgiVersion}",org.wrensecurity.guava.common.hash;version="${parsedVersion.osgiVersion}",org.wrensecurity.guava.common.collect;version="${parsedVersion.osgiVersion}",org.wrensecurity.guava.common.primitives;version="${parsedVersion.osgiVersion}" + org.wrensecurity.guava.common.io;version="${parsedVersion.osgiVersion}" diff --git a/math/pom.xml b/math/pom.xml index 943552d..a3f78ce 100644 --- a/math/pom.xml +++ b/math/pom.xml @@ -13,33 +13,39 @@ information: "Portions Copyrighted [year] [name of copyright owner]". Copyright 2014-2015 ForgeRock AS. - Portions Copyright 2017 Wren Security. + Portions Copyright 2017-2022 Wren Security. --> 4.0.0 + - org.forgerock.commons.guava - forgerock-guava - 18.0.4 + org.wrensecurity.commons.guava + wrensec-guava + 18.0.5-SNAPSHOT + + wrensec-guava-math jar - forgerock-guava-math + Wren Security Guava - Math + Provides arithmetic functions operating on primitive values and BigInteger instances. Repackaged to avoid dependency collisions. + - org.forgerock.commons.guava - forgerock-guava-all + org.wrensecurity.commons.guava + wrensec-guava-all - org.forgerock.commons.guava - forgerock-guava-annotations + org.wrensecurity.commons.guava + wrensec-guava-annotations - org.forgerock.commons.guava - forgerock-guava-primitives + org.wrensecurity.commons.guava + wrensec-guava-primitives + @@ -47,6 +53,7 @@ true + org.codehaus.mojo @@ -66,14 +73,14 @@ - org.forgerock.commons.guava:forgerock-guava-all + org.wrensecurity.commons.guava:wrensec-guava-all - org.forgerock.commons.guava:forgerock-guava-all + org.wrensecurity.commons.guava:wrensec-guava-all - org/forgerock/guava/common/math/** + org/wrensecurity/guava/common/math/** @@ -81,8 +88,8 @@ ${parsedVersion.osgiVersion} - javax.annotation;resolution:=optional,org.forgerock.guava.common.base;version="${parsedVersion.osgiVersion}",org.forgerock.guava.common.primitives;version="${parsedVersion.osgiVersion}" - org.forgerock.guava.common.math;version="${parsedVersion.osgiVersion}" + javax.annotation;resolution:=optional,org.wrensecurity.guava.common.base;version="${parsedVersion.osgiVersion}",org.wrensecurity.guava.common.primitives;version="${parsedVersion.osgiVersion}" + org.wrensecurity.guava.common.math;version="${parsedVersion.osgiVersion}" diff --git a/net/pom.xml b/net/pom.xml index c106afa..10c2597 100644 --- a/net/pom.xml +++ b/net/pom.xml @@ -13,53 +13,59 @@ information: "Portions Copyrighted [year] [name of copyright owner]". Copyright 2014-2015 ForgeRock AS. - Portions Copyright 2017 Wren Security. + Portions Copyright 2017-2022 Wren Security. --> 4.0.0 + - org.forgerock.commons.guava - forgerock-guava - 18.0.4 + org.wrensecurity.commons.guava + wrensec-guava + 18.0.5-SNAPSHOT + + wrensec-guava-net jar - forgerock-guava-net + Wren Security Guava - Net + Provides utility methods and classes for working with net addresses (numeric IP and domain names). Repackaged to avoid dependency collisions. + - org.forgerock.commons.guava - forgerock-guava-all + org.wrensecurity.commons.guava + wrensec-guava-all - org.forgerock.commons.guava - forgerock-guava-annotations + org.wrensecurity.commons.guava + wrensec-guava-annotations - org.forgerock.commons.guava - forgerock-guava-base + org.wrensecurity.commons.guava + wrensec-guava-base - org.forgerock.commons.guava - forgerock-guava-collect + org.wrensecurity.commons.guava + wrensec-guava-collect - org.forgerock.commons.guava - forgerock-guava-escape + org.wrensecurity.commons.guava + wrensec-guava-escape - org.forgerock.commons.guava - forgerock-guava-hash + org.wrensecurity.commons.guava + wrensec-guava-hash - org.forgerock.commons.guava - forgerock-guava-io + org.wrensecurity.commons.guava + wrensec-guava-io - org.forgerock.commons.guava - forgerock-guava-primitives + org.wrensecurity.commons.guava + wrensec-guava-primitives + @@ -67,6 +73,7 @@ true + org.codehaus.mojo @@ -86,15 +93,15 @@ - org.forgerock.commons.guava:forgerock-guava-all + org.wrensecurity.commons.guava:wrensec-guava-all - org.forgerock.commons.guava:forgerock-guava-all + org.wrensecurity.commons.guava:wrensec-guava-all - org/forgerock/guava/common/net/** - org/forgerock/guava/thirdparty/publicsuffix/** + org/wrensecurity/guava/common/net/** + org/wrensecurity/guava/thirdparty/publicsuffix/** @@ -102,8 +109,8 @@ ${parsedVersion.osgiVersion} - javax.annotation;resolution:=optional,org.forgerock.guava.common.base;version="${parsedVersion.osgiVersion}",org.forgerock.guava.common.hash;version="${parsedVersion.osgiVersion}",org.forgerock.guava.common.io;version="${parsedVersion.osgiVersion}",org.forgerock.guava.common.primitives;version="${parsedVersion.osgiVersion}",org.forgerock.guava.common.collect;version="${parsedVersion.osgiVersion}",org.forgerock.guava.common.escape;version="${parsedVersion.osgiVersion}" - org.forgerock.guava.common.net;version="${parsedVersion.osgiVersion}" + javax.annotation;resolution:=optional,org.wrensecurity.guava.common.base;version="${parsedVersion.osgiVersion}",org.wrensecurity.guava.common.hash;version="${parsedVersion.osgiVersion}",org.wrensecurity.guava.common.io;version="${parsedVersion.osgiVersion}",org.wrensecurity.guava.common.primitives;version="${parsedVersion.osgiVersion}",org.wrensecurity.guava.common.collect;version="${parsedVersion.osgiVersion}",org.wrensecurity.guava.common.escape;version="${parsedVersion.osgiVersion}" + org.wrensecurity.guava.common.net;version="${parsedVersion.osgiVersion}" diff --git a/pom.xml b/pom.xml index 24938e9..9d27773 100644 --- a/pom.xml +++ b/pom.xml @@ -3,31 +3,77 @@ 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 Copyrighted [year] [name of copyright owner]". - + Copyright 2014-2015 ForgeRock AS. - Portions Copyright 2017 Wren Security. + Portions Copyright 2017-2022 Wren Security. --> 4.0.0 + - org.forgerock - forgerock-parent - 2.0.4 + org.wrensecurity + wrensec-parent + 3.3.0 + + org.wrensecurity.commons.guava + wrensec-guava + 18.0.5-SNAPSHOT pom - org.forgerock.commons.guava - forgerock-guava - 18.0.4 + Wren Security Guava - Parent + Repackaged version of Guava to avoid dependency collisions. + + + https://github.com/WrenSecurity/wrensec-guava + scm:git:git://github.com/WrenSecurity/wrensec-guava.git + scm:git:git@github.com:WrenSecurity/wrensec-guava.git + HEAD + + + + + 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 + + + + + + ../src/main/resources + + all annotations @@ -46,9 +92,7 @@ reflect xml - - ../src/main/resources - + com.google.code.findbugs @@ -56,95 +100,96 @@ 1.3.9 true provided - + - org.forgerock.commons.guava - forgerock-guava-all + org.wrensecurity.commons.guava + wrensec-guava-all ${project.version} - org.forgerock.commons.guava - forgerock-guava-annotations + org.wrensecurity.commons.guava + wrensec-guava-annotations ${project.version} - org.forgerock.commons.guava - forgerock-guava-base + org.wrensecurity.commons.guava + wrensec-guava-base ${project.version} - org.forgerock.commons.guava - forgerock-guava-cache + org.wrensecurity.commons.guava + wrensec-guava-cache ${project.version} - org.forgerock.commons.guava - forgerock-guava-collect + org.wrensecurity.commons.guava + wrensec-guava-collect ${project.version} - org.forgerock.commons.guava - forgerock-guava-concurrent + org.wrensecurity.commons.guava + wrensec-guava-concurrent ${project.version} - org.forgerock.commons.guava - forgerock-guava-escape + org.wrensecurity.commons.guava + wrensec-guava-escape ${project.version} - org.forgerock.commons.guava - forgerock-guava-eventbus + org.wrensecurity.commons.guava + wrensec-guava-eventbus ${project.version} - org.forgerock.commons.guava - forgerock-guava-hash + org.wrensecurity.commons.guava + wrensec-guava-hash ${project.version} - org.forgerock.commons.guava - forgerock-guava-io + org.wrensecurity.commons.guava + wrensec-guava-io ${project.version} - org.forgerock.commons.guava - forgerock-guava-math + org.wrensecurity.commons.guava + wrensec-guava-math ${project.version} - org.forgerock.commons.guava - forgerock-guava-net + org.wrensecurity.commons.guava + wrensec-guava-net ${project.version} - org.forgerock.commons.guava - forgerock-guava-primitives + org.wrensecurity.commons.guava + wrensec-guava-primitives ${project.version} - org.forgerock.commons.guava - forgerock-guava-reflect + org.wrensecurity.commons.guava + wrensec-guava-reflect ${project.version} - org.forgerock.commons.guava - forgerock-guava-xml + org.wrensecurity.commons.guava + wrensec-guava-xml ${project.version} + org.codehaus.mojo build-helper-maven-plugin - 1.10 + 3.3.0 parse-version @@ -157,7 +202,6 @@ org.apache.maven.plugins maven-shade-plugin - 2.3 package @@ -183,26 +227,4 @@ - - - - - wrensecurity-releases - Wren Security Release Repository - https://wrensecurity.jfrog.io/wrensecurity/releases - - - false - - - - true - - - - - https://github.com/WrenSecurity/wrensec-guava - scm:git:git://github.com/WrenSecurity/wrensec-guava.git - scm:git:git@github.com:WrenSecurity/wrensec-guava.git - diff --git a/primitives/pom.xml b/primitives/pom.xml index ba6c3ca..3f29d54 100644 --- a/primitives/pom.xml +++ b/primitives/pom.xml @@ -13,33 +13,39 @@ information: "Portions Copyrighted [year] [name of copyright owner]". Copyright 2014-2015 ForgeRock AS. - Portions Copyright 2017 Wren Security. + Portions Copyright 2017-2022 Wren Security. --> 4.0.0 + - org.forgerock.commons.guava - forgerock-guava - 18.0.4 + org.wrensecurity.commons.guava + wrensec-guava + 18.0.5-SNAPSHOT + + wrensec-guava-primitives jar - forgerock-guava-primitives + Wren Security Guava - Primitives + Provides static utilities for working with the eight primitive types and "void", and value types for treating them as unsigned. Repackaged to avoid dependency collisions. + - org.forgerock.commons.guava - forgerock-guava-all + org.wrensecurity.commons.guava + wrensec-guava-all - org.forgerock.commons.guava - forgerock-guava-annotations + org.wrensecurity.commons.guava + wrensec-guava-annotations - org.forgerock.commons.guava - forgerock-guava-base + org.wrensecurity.commons.guava + wrensec-guava-base + @@ -47,6 +53,7 @@ true + org.codehaus.mojo @@ -66,14 +73,14 @@ - org.forgerock.commons.guava:forgerock-guava-all + org.wrensecurity.commons.guava:wrensec-guava-all - org.forgerock.commons.guava:forgerock-guava-all + org.wrensecurity.commons.guava:wrensec-guava-all - org/forgerock/guava/common/primitives/** + org/wrensecurity/guava/common/primitives/** @@ -81,8 +88,8 @@ ${parsedVersion.osgiVersion} - javax.annotation;resolution:=optional,sun.misc;resolution:=optional,org.forgerock.guava.common.base;version="${parsedVersion.osgiVersion}" - org.forgerock.guava.common.primitives;version="${parsedVersion.osgiVersion}" + javax.annotation;resolution:=optional,sun.misc;resolution:=optional,org.wrensecurity.guava.common.base;version="${parsedVersion.osgiVersion}" + org.wrensecurity.guava.common.primitives;version="${parsedVersion.osgiVersion}" diff --git a/reflect/pom.xml b/reflect/pom.xml index acab9d3..b2bd1ba 100644 --- a/reflect/pom.xml +++ b/reflect/pom.xml @@ -13,41 +13,47 @@ information: "Portions Copyrighted [year] [name of copyright owner]". Copyright 2014-2015 ForgeRock AS. - Portions Copyright 2017 Wren Security. + Portions Copyright 2017-2022 Wren Security. --> 4.0.0 + - org.forgerock.commons.guava - forgerock-guava - 18.0.4 + org.wrensecurity.commons.guava + wrensec-guava + 18.0.5-SNAPSHOT + + wrensec-guava-reflect jar - forgerock-guava-reflect + Wren Security Guava - Reflection + Provides utilities to work with Java reflection. Repackaged to avoid dependency collisions. + - org.forgerock.commons.guava - forgerock-guava-all + org.wrensecurity.commons.guava + wrensec-guava-all - org.forgerock.commons.guava - forgerock-guava-annotations + org.wrensecurity.commons.guava + wrensec-guava-annotations - org.forgerock.commons.guava - forgerock-guava-base + org.wrensecurity.commons.guava + wrensec-guava-base - org.forgerock.commons.guava - forgerock-guava-collect + org.wrensecurity.commons.guava + wrensec-guava-collect - org.forgerock.commons.guava - forgerock-guava-primitives + org.wrensecurity.commons.guava + wrensec-guava-primitives + @@ -55,6 +61,7 @@ true + org.codehaus.mojo @@ -74,14 +81,14 @@ - org.forgerock.commons.guava:forgerock-guava-all + org.wrensecurity.commons.guava:wrensec-guava-all - org.forgerock.commons.guava:forgerock-guava-all + org.wrensecurity.commons.guava:wrensec-guava-all - org/forgerock/guava/common/reflect/** + org/wrensecurity/guava/common/reflect/** @@ -89,8 +96,8 @@ ${parsedVersion.osgiVersion} - javax.annotation;resolution:=optional,org.forgerock.guava.common.base;version="${parsedVersion.osgiVersion}",org.forgerock.guava.common.collect;version="${parsedVersion.osgiVersion}",org.forgerock.guava.common.primitives;version="${parsedVersion.osgiVersion}" - org.forgerock.guava.common.reflect;version="${parsedVersion.osgiVersion}" + javax.annotation;resolution:=optional,org.wrensecurity.guava.common.base;version="${parsedVersion.osgiVersion}",org.wrensecurity.guava.common.collect;version="${parsedVersion.osgiVersion}",org.wrensecurity.guava.common.primitives;version="${parsedVersion.osgiVersion}" + org.wrensecurity.guava.common.reflect;version="${parsedVersion.osgiVersion}" diff --git a/src/main/resources/META-INF/MANIFEST.MF b/src/main/resources/META-INF/MANIFEST.MF index 6dd7860..bb4c745 100644 --- a/src/main/resources/META-INF/MANIFEST.MF +++ b/src/main/resources/META-INF/MANIFEST.MF @@ -4,43 +4,43 @@ Bundle-Version: ${project.version} Bundle-Description: Guava is a suite of core and expanded libraries that include utility classes, google's collections, io classes, and much mu ch more. Guava has only one code dependency - javax.annotation, per th - e JSR-305 spec. This bundle is repackaged under org.forgerock.guava + e JSR-305 spec. This bundle is repackaged under org.wrensecurity.guava Bundle-DocURL: https://guava-libraries.googlecode.com/ Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt Bundle-ManifestVersion: 2 -Export-Package: org.forgerock.guava.common.net;uses:="javax.annotation,o - rg.forgerock.guava.common.base,org.forgerock.guava.common.hash,org.forg - erock.guava.common.io,org.forgerock.guava.common.primitives,org.forgero - ck.guava.common.collect,org.forgerock.guava.common.escape";version="18. - 0.0",org.forgerock.guava.common.html;uses:="org.forgerock.guava.common. - escape,javax.annotation";version="18.0.0",org.forgerock.guava.common.co - llect;uses:="org.forgerock.guava.common.base,javax.annotation,org.forge - rock.guava.common.primitives,org.forgerock.guava.common.math";version=" - 18.0.0",org.forgerock.guava.common.primitives;uses:="org.forgerock.guav - a.common.base,javax.annotation,sun.misc";version="18.0.0",org.forgerock - .guava.common.base;uses:="javax.annotation";version="18.0.0",org.forger - ock.guava.common.escape;uses:="org.forgerock.guava.common.base,javax.an - notation";version="18.0.0",org.forgerock.guava.common.cache;uses:="org. - forgerock.guava.common.collect,org.forgerock.guava.common.util.concurre - nt,javax.annotation,org.forgerock.guava.common.base,org.forgerock.guava - .common.primitives,sun.misc";version="18.0.0",org.forgerock.guava.commo - n.eventbus;uses:="org.forgerock.guava.common.collect,org.forgerock.guav - a.common.cache,javax.annotation,org.forgerock.guava.common.base,org.for - gerock.guava.common.util.concurrent,org.forgerock.guava.common.reflect" - ;version="18.0.0",org.forgerock.guava.common.util.concurrent;uses:="org - .forgerock.guava.common.base,javax.annotation,org.forgerock.guava.commo - n.collect,org.forgerock.guava.common.primitives,org.forgerock.guava.com - mon.math";version="18.0.0",org.forgerock.guava.common.hash;uses:="org.f - orgerock.guava.common.primitives,org.forgerock.guava.common.base,javax. - annotation,org.forgerock.guava.common.math";version="18.0.0",org.forger - ock.guava.common.io;uses:="javax.annotation,org.forgerock.guava.common. - base,org.forgerock.guava.common.math,org.forgerock.guava.common.hash,or - g.forgerock.guava.common.collect,org.forgerock.guava.common.primitives" - ;version="18.0.0",org.forgerock.guava.common.xml;uses:="org.forgerock.g - uava.common.escape,javax.annotation";version="18.0.0",org.forgerock.gua - va.common.reflect;uses:="javax.annotation,org.forgerock.guava.common.ba - se,org.forgerock.guava.common.collect,org.forgerock.guava.common.primit - ives";version="18.0.0",org.forgerock.guava.common.math;uses:="org.forge - rock.guava.common.base,org.forgerock.guava.common.primitives,javax.anno - tation";version="18.0.0",org.forgerock.guava.common.annotations;version - ="18.0.0" +Export-Package: org.wrensecurity.guava.common.net;uses:="javax.annotation,o + rg.wrensecurity.guava.common.base,org.wrensecurity.guava.common.hash,org.w + rensecurity.guava.common.io,org.wrensecurity.guava.common.primitives,org.w + rensecurity.guava.common.collect,org.wrensecurity.guava.common.escape";ver + sion="18.0.0",org.wrensecurity.guava.common.html;uses:="org.wrensecurity.g + uava.common.escape,javax.annotation";version="18.0.0",org.wrensecurity.gua + va.common.collect;uses:="org.wrensecurity.guava.common.base,javax.annotati + on,org.wrensecurity.guava.common.primitives,org.wrensecurity.guava.common. + math";version="18.0.0",org.wrensecurity.guava.common.primitives;uses:="org + .wrensecurity.guava.common.base,javax.annotation,sun.misc";version="18.0.0 + ",org.wrensecurity.guava.common.base;uses:="javax.annotation";version="18. + 0.0",org.wrensecurity.guava.common.escape;uses:="org.wrensecurity.guava.co + mmon.base,javax.annotation";version="18.0.0",org.wrensecurity.guava.common + .cache;uses:="org.wrensecurity.guava.common.collect,org.wrensecurity.guava + .common.util.concurrent,javax.annotation,org.wrensecurity.guava.common.bas + e,org.wrensecurity.guava.common.primitives,sun.misc";version="18.0.0",org. + wrensecurity.guava.common.eventbus;uses:="org.wrensecurity.guava.common.co + llect,org.wrensecurity.guava.common.cache,javax.annotation,org.wrensecurit + y.guava.common.base,org.wrensecurity.guava.common.util.concurrent,org.wren + security.guava.common.reflect";version="18.0.0",org.wrensecurity.guava.com + mon.util.concurrent;uses:="org.wrensecurity.guava.common.base,javax.annota + tion,org.wrensecurity.guava.common.collect,org.wrensecurity.guava.common.p + rimitives,org.wrensecurity.guava.common.math";version="18.0.0",org.wrensec + urity.guava.common.hash;uses:="org.wrensecurity.guava.common.primitives,or + g.wrensecurity.guava.common.base,javax.annotation,org.wrensecurity.guava.c + ommon.math";version="18.0.0",org.wrensecurity.guava.common.io;uses:="javax + .annotation,org.wrensecurity.guava.common.base,org.wrensecurity.guava.comm + on.math,org.wrensecurity.guava.common.hash,org.wrensecurity.guava.common.c + ollect,org.wrensecurity.guava.common.primitives";version="18.0.0",org.wren + security.guava.common.xml;uses:="org.wrensecurity.guava.common.escape,java + x.annotation";version="18.0.0",org.wrensecurity.guava.common.reflect;uses: + ="javax.annotation,org.wrensecurity.guava.common.base,org.wrensecurity.gua + va.common.collect,org.wrensecurity.guava.common.primitives";version="18.0. + 0",org.wrensecurity.guava.common.math;uses:="org.wrensecurity.guava.common + .base,org.wrensecurity.guava.common.primitives,javax.annotation";version=" + 18.0.0",org.wrensecurity.guava.common.annotations;version="18.0.0" diff --git a/xml/pom.xml b/xml/pom.xml index 160099a..2235a79 100644 --- a/xml/pom.xml +++ b/xml/pom.xml @@ -13,33 +13,39 @@ information: "Portions Copyrighted [year] [name of copyright owner]". Copyright 2014-2015 ForgeRock AS. - Portions Copyright 2017 Wren Security. + Portions Copyright 2017-2022 Wren Security. --> - - 4.0.0 + + 4.0.0 + - org.forgerock.commons.guava - forgerock-guava - 18.0.4 + org.wrensecurity.commons.guava + wrensec-guava + 18.0.5-SNAPSHOT + + wrensec-guava-xml jar - forgerock-guava-xml + Wren Security Guava - XML + Escapers for XML. Repackaged to avoid dependency collisions. + - org.forgerock.commons.guava - forgerock-guava-all + org.wrensecurity.commons.guava + wrensec-guava-all - org.forgerock.commons.guava - forgerock-guava-annotations + org.wrensecurity.commons.guava + wrensec-guava-annotations - org.forgerock.commons.guava - forgerock-guava-escape + org.wrensecurity.commons.guava + wrensec-guava-escape + @@ -47,6 +53,7 @@ true + org.codehaus.mojo @@ -66,22 +73,22 @@ - org.forgerock.commons.guava:forgerock-guava-all + org.wrensecurity.commons.guava:wrensec-guava-all - org.forgerock.commons.guava:forgerock-guava-all + org.wrensecurity.commons.guava:wrensec-guava-all - org/forgerock/guava/common/xml/** + org/wrensecurity/guava/common/xml/** - javax.annotation;resolution:=optional,org.forgerock.guava.common.escape;version="${parsedVersion.osgiVersion}" - org.forgerock.guava.common.xml;version="${parsedVersion.osgiVersion}" + javax.annotation;resolution:=optional,org.wrensecurity.guava.common.escape;version="${parsedVersion.osgiVersion}" + org.wrensecurity.guava.common.xml;version="${parsedVersion.osgiVersion}"