Merge pull request #2 from karelmaxa/cleanup

Perform project cleanup.
WrenSecurity · Nov 14, 2022 · 73f3e3c · 73f3e3c
2 parents b6fadf6 + 6192215
commit 73f3e3c
Show file tree

Hide file tree

Showing 21 changed files with 647 additions and 411 deletions.
diff --git a/.github/workflows/build.yml 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
@@ -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
diff --git a/all/pom.xml b/all/pom.xml
@@ -13,33 +13,40 @@
   information: "Portions Copyrighted [year] [name of copyright owner]".
 
   Copyright 2014-2015 ForgeRock AS.
-  Copyright 2017 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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
-        <groupId>org.forgerock.commons.guava</groupId>
-        <artifactId>forgerock-guava</artifactId>
-        <version>18.0.4</version>
+        <groupId>org.wrensecurity.commons.guava</groupId>
+        <artifactId>wrensec-guava</artifactId>
+        <version>18.0.5-SNAPSHOT</version>
     </parent>
+
+    <artifactId>wrensec-guava-all</artifactId>
     <packaging>jar</packaging>
-    <artifactId>forgerock-guava-all</artifactId>
+
     <name>Wren Security Guava - Full Google Guava Package</name>
+
     <description>Provides the entire Google Guava package. Other packages repackage the contents of this package to avoid dependency collisions.</description>
+
     <dependencies>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
             <version>18.0</version>
         </dependency>
     </dependencies>
+
     <build>
         <resources>
             <resource>
                 <directory>${manifestSourceLocation}</directory>
                 <filtering>true</filtering>
             </resource>
         </resources>
+
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
@@ -62,7 +69,7 @@
                     <relocations>
                         <relocation>
                             <pattern>com.google</pattern>
-                            <shadedPattern>org.forgerock.guava</shadedPattern>
+                            <shadedPattern>org.wrensecurity.guava</shadedPattern>
                         </relocation>
                     </relocations>
                     <filters>
@@ -78,7 +85,7 @@
                             <manifestEntries>
                                 <Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version>
                                 <Import-Package>javax.annotation;resolution:=optional,sun.misc;resolution:=optional</Import-Package>
-                                <Export-Package>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}"</Export-Package>
+                                <Export-Package>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}"</Export-Package>
                             </manifestEntries>
                         </transformer>
                     </transformers>

diff --git a/annotations/pom.xml b/annotations/pom.xml
@@ -13,32 +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.
 -->
 <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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
-        <groupId>org.forgerock.commons.guava</groupId>
-        <artifactId>forgerock-guava</artifactId>
-        <version>18.0.4</version>
+        <groupId>org.wrensecurity.commons.guava</groupId>
+        <artifactId>wrensec-guava</artifactId>
+        <version>18.0.5-SNAPSHOT</version>
     </parent>
+
+    <artifactId>wrensec-guava-annotations</artifactId>
     <packaging>jar</packaging>
-    <artifactId>forgerock-guava-annotations</artifactId>
+
     <name>Wren Security Guava - Annotations</name>
+
     <description>Provides common annotation types. Repackaged to avoid dependency collisions.</description>
+
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.commons.guava</groupId>
-            <artifactId>forgerock-guava-all</artifactId>
+            <groupId>org.wrensecurity.commons.guava</groupId>
+            <artifactId>wrensec-guava-all</artifactId>
         </dependency>
     </dependencies>
+
     <build>
         <resources>
             <resource>
                 <directory>${manifestSourceLocation}</directory>
                 <filtering>true</filtering>
             </resource>
         </resources>
+
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
@@ -58,22 +65,22 @@
                 <configuration>
                     <artifactSet>
                         <includes>
-                            <include>org.forgerock.commons.guava:forgerock-guava-all</include>
+                            <include>org.wrensecurity.commons.guava:wrensec-guava-all</include>
                         </includes>
                     </artifactSet>
                     <filters>
                         <filter>
-                            <artifact>org.forgerock.commons.guava:forgerock-guava-all</artifact>
+                            <artifact>org.wrensecurity.commons.guava:wrensec-guava-all</artifact>
                             <includes>
-                                <include>org/forgerock/guava/common/annotations/**</include>
+                                <include>org/wrensecurity/guava/common/annotations/**</include>
                             </includes>
                         </filter>
                     </filters>
                     <transformers>
                         <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                             <manifestEntries>
                                 <Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version>
-                                <Export-Package>org.forgerock.guava.common.annotations;version="${parsedVersion.osgiVersion}"</Export-Package>
+                                <Export-Package>org.wrensecurity.guava.common.annotations;version="${parsedVersion.osgiVersion}"</Export-Package>
                             </manifestEntries>
                         </transformer>
                     </transformers>

diff --git a/base/pom.xml b/base/pom.xml
@@ -13,36 +13,43 @@
   information: "Portions Copyrighted [year] [name of copyright owner]".
 
   Copyright 2014-2015 ForgeRock AS.
-  Copyright 2017 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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
-        <groupId>org.forgerock.commons.guava</groupId>
-        <artifactId>forgerock-guava</artifactId>
-        <version>18.0.4</version>
+        <groupId>org.wrensecurity.commons.guava</groupId>
+        <artifactId>wrensec-guava</artifactId>
+        <version>18.0.5-SNAPSHOT</version>
     </parent>
+
+    <artifactId>wrensec-guava-base</artifactId>
     <packaging>jar</packaging>
-    <artifactId>forgerock-guava-base</artifactId>
+
     <name>Wren Security Guava - Base</name>
+
     <description>Provides basic utility libraries and interfaces. Repackaged to avoid dependency collisions.</description>
+
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.commons.guava</groupId>
-            <artifactId>forgerock-guava-all</artifactId>
+            <groupId>org.wrensecurity.commons.guava</groupId>
+            <artifactId>wrensec-guava-all</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.commons.guava</groupId>
-            <artifactId>forgerock-guava-annotations</artifactId>
+            <groupId>org.wrensecurity.commons.guava</groupId>
+            <artifactId>wrensec-guava-annotations</artifactId>
         </dependency>
     </dependencies>
+
     <build>
         <resources>
             <resource>
                 <directory>${manifestSourceLocation}</directory>
                 <filtering>true</filtering>
             </resource>
         </resources>
+
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
@@ -62,15 +69,15 @@
                 <configuration>
                     <artifactSet>
                         <includes>
-                            <include>org.forgerock.commons.guava:forgerock-guava-all</include>
+                            <include>org.wrensecurity.commons.guava:wrensec-guava-all</include>
                         </includes>
                     </artifactSet>
                     <filters>
                         <filter>
-                            <artifact>org.forgerock.commons.guava:forgerock-guava-all</artifact>
+                            <artifact>org.wrensecurity.commons.guava:wrensec-guava-all</artifact>
                             <includes>
-                                <include>org/forgerock/guava/common/base/**</include>
-                                <include>org/forgerock/guava/common/base/internal/**</include>
+                                <include>org/wrensecurity/guava/common/base/**</include>
+                                <include>org/wrensecurity/guava/common/base/internal/**</include>
                             </includes>
                         </filter>
                     </filters>
@@ -79,7 +86,7 @@
                             <manifestEntries>
                                 <Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version>
                                 <Import-Package>javax.annotation;resolution:=optional</Import-Package>
-                                <Export-Package>org.forgerock.guava.common.base;uses:="javax.annotation";version="${parsedVersion.osgiVersion}"</Export-Package>
+                                <Export-Package>org.wrensecurity.guava.common.base;uses:="javax.annotation";version="${parsedVersion.osgiVersion}"</Export-Package>
                             </manifestEntries>
                         </transformer>
                     </transformers>