Skip to content

Commit

Permalink
Merge pull request #3 from GuicedEE/v2.0.0
Browse files Browse the repository at this point in the history 
V2.0.0
  • Loading branch information
@GedMarc
GedMarc authored Apr 26, 2024
2 parents ad4c26b + d84e8da commit 5bb7d7b
Show file tree
Hide file tree
Showing 108 changed files with 1,739 additions and 6,469 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/maven-publish.yml
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
name: Maven Package (BOM)
name: Maven Package
on:
workflow_dispatch:
push:
jobs:
GuicedInjection:
uses: GuicedEE/Workflows/.github/workflows/bom.yml@master
uses: GuicedEE/Workflows/.github/workflows/projects.yml@master
with:
baseDir: '/'
baseDir: ''
name: 'Guiced Injection'
secrets:
USERNAME: ${{secrets.USERNAME}}
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ Thumbs.db
flatter.pom**/*.classpath
/.idea/
/.flattened-pom.xml
/dependency-reduced-pom.xml
171 changes: 92 additions & 79 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,16 @@
https://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>com.guicedee</groupId>
<artifactId>dev-kit</artifactId>
<version>0.0.0_0-SNAPSHOT</version>
<relativePath>../../../</relativePath>
<artifactId>parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<groupId>com.guicedee</groupId>
<artifactId>guice-injection</artifactId>

<artifactId>guiced-injection</artifactId>
<packaging>jar</packaging>
<version>0.0.0_0-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
<name>Guiced Injector</name>
<description>Guice Injection allows you to access multiple Guice Binders and Modules across separate archives.
Allowing you to configure your applications with injection from multiple dependancies. Servlets, EJB's, and
Expand All @@ -25,9 +24,9 @@
<properties>
<ignore.moditect>true</ignore.moditect>
<flatten.pom>false</flatten.pom>
<project.scm.nameUrl>/GuicedEE/GuicedInjection</project.scm.nameUrl>
</properties>


<dependencyManagement>
<dependencies>
<dependency>
Expand All @@ -44,15 +43,56 @@
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>com.guicedee</groupId>
<artifactId>jakarta-bom</artifactId>
<version>${guicedee.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>com.guicedee</groupId>
<artifactId>google-bom</artifactId>
<version>${guicedee.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>com.guicedee</groupId>
<artifactId>apache-bom</artifactId>
<version>${guicedee.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>com.guicedee</groupId>
<artifactId>tests-bom</artifactId>
<version>${guicedee.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>

<dependency>
<groupId>com.guicedee</groupId>
<artifactId>guiced-log-master</artifactId>
<artifactId>guice-inject-client</artifactId>
</dependency>

<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>

<!-- <dependency>
<groupId>com.guicedee</groupId>
<artifactId>guiced-log-master</artifactId>
</dependency>
-->

<dependency>
<groupId>io.github.classgraph</groupId>
<artifactId>classgraph</artifactId>
Expand All @@ -64,23 +104,18 @@
</dependency>

<dependency>
<groupId>com.guicedee.services</groupId>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>

<dependency>
<groupId>com.guicedee.services</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>

<dependency>
<groupId>com.guicedee.services</groupId>
<artifactId>slf4j</artifactId>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>

<dependency>
Expand All @@ -93,101 +128,79 @@
<artifactId>jackson-datatype-jsr310</artifactId>
</dependency>

<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
</dependency>

<dependency>
<groupId>com.guicedee.services</groupId>
<artifactId>json</artifactId>
<optional>true</optional>
<artifactId>aopalliance-core</artifactId>
</dependency>

<dependency>
<groupId>com.guicedee.services</groupId>
<artifactId>apache-poi-ooxml</artifactId>
<optional>true</optional>
<artifactId>guava</artifactId>
</dependency>

<dependency>
<groupId>com.guicedee.services</groupId>
<artifactId>javax.inject</artifactId>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.guicedee.services</groupId>
<artifactId>aopalliance-core</artifactId>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.guicedee.services</groupId>
<artifactId>guava</artifactId>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>

</dependencies>

<scm>
<url>https://github.com/GedMarc?tab=repositories</url>
</scm>

<issueManagement>
<system>Github</system>
<url>https://github.com/GedMarc/GuiceInjection/issues</url>
</issueManagement>

<ciManagement>
<system>TeamCity</system>
<url>http://jwebmp.com/teamcity</url>
</ciManagement>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>

<configuration>
<flattenMode>ossrh</flattenMode>
<flattenDependencyMode>direct</flattenDependencyMode>
<detail>true</detail>
<updatePomFile>true</updatePomFile>
<flattenedPomFilename>flatter.pom</flattenedPomFilename>
</configuration>
<executions>
<!-- enable flattening -->
<execution>
<id>flatten</id>
<phase>verify</phase>
<goals>
<goal>flatten</goal>
</goals>
</execution>
<!-- ensure proper cleanup -->
<execution>
<id>flatten.clean</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>com.coderplus.maven.plugins</groupId>
<artifactId>copy-rename-maven-plugin</artifactId>
<version>1.0</version>
<executions>
<execution>
<id>copy-file</id>
<phase>verify</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<sourceFile>flatter.pom</sourceFile>
<destinationFile>dependency-reduced-pom.xml</destinationFile>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<inherited>true</inherited>
<configuration>
<annotationProcessorPaths>
<annotationProcessorPath>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
</annotationProcessorPath>
</annotationProcessorPaths>
<annotationProcessors>
<annotationProcessor>lombok.launch.AnnotationProcessorHider$AnnotationProcessor
</annotationProcessor>
</annotationProcessors>
<failOnError>true</failOnError>
</configuration>
</plugin>

</plugins>

</build>
</project>
14 changes: 14 additions & 0 deletions src/jre11/java/com/guicedee/guicedinjection/ExecutorServiceSupplier.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package com.guicedee.guicedinjection;

import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.function.Supplier;

public class ExecutorServiceSupplier implements Supplier<ExecutorService>
{
@Override
public ExecutorService get()
{
return Executors.newCachedThreadPool();
}
}
14 changes: 14 additions & 0 deletions src/jre21/java/com/guicedee/guicedinjection/ExecutorServiceSupplier.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package com.guicedee.guicedinjection;

import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.function.Supplier;

public class ExecutorServiceSupplier implements Supplier<ExecutorService>
{
@Override
public ExecutorService get()
{
return Executors.newVirtualThreadPerTaskExecutor();
}
}
20 changes: 0 additions & 20 deletions src/jre8/java/.gitignore
View file

This file was deleted.

20 changes: 0 additions & 20 deletions src/jre8/resources/.gitignore
View file

This file was deleted.

Loading

0 comments on commit 5bb7d7b

Please sign in to comment.