Skip to content

Commit

Permalink
Merge pull request #374 from JarvisCraft/enhanced-bom-support
Browse files Browse the repository at this point in the history
  • Loading branch information
@JarvisCraft
JarvisCraft authored Jul 1, 2022
2 parents 8a86880 + 96a5db9 commit b9cef42
Show file tree
Hide file tree
Showing 6 changed files with 101 additions and 83 deletions.
6 changes: 3 additions & 3 deletions SECURITY.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
## Supported Versions

| Version | Supported |
| ------------ | ------------------ |
| [1.0.0-rc.8] | :heavy_check_mark: |
| < 1.0.0-rc.8 | :x: |
|--------------| ------------------ |
| [1.0.0-rc.9] | :heavy_check_mark: |
| < 1.0.0-rc.9 | :x: |

## Reporting a Vulnerability

Expand Down
5 changes: 4 additions & 1 deletion java-commons/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>ru.progrm-jarvis</groupId>
<artifactId>padla</artifactId>
<artifactId>padla-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../padla-parent</relativePath>
</parent>
<artifactId>java-commons</artifactId>

Expand Down Expand Up @@ -61,10 +62,12 @@
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
77 changes: 77 additions & 0 deletions padla-parent/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>ru.progrm-jarvis</groupId>
<artifactId>padla</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>padla-parent</artifactId>
<packaging>pom</packaging>

<name>PADLA parent</name>
<description>Parent module of PADLA components, this is not intended for use as a dependency</description>

<modules>
<module>../java-commons</module>
<module>../reflector</module>
<module>../ultimate-messenger</module>
</modules>

<dependencyManagement>
<dependencies>
<!-- Own dependencies -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>java-commons</artifactId>
<version>${project.version}</version>
</dependency>

<!-- Annotations -->

<!-- Code generation -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.24</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>

<!-- Documenting -->
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>23.0.0</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>

<!-- Testing -->

<!-- BOMs -->
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.8.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-bom</artifactId>
<version>4.6.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
<version>1.3</version>
</dependency>
</dependencies>
</dependencyManagement>
</project>
90 changes: 13 additions & 77 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,18 @@
<artifactId>padla</artifactId>
<version>1.0.0-SNAPSHOT</version>
<modules>
<module>java-commons</module>
<module>reflector</module>
<module>ultimate-messenger</module>
<module>padla-bom</module>
<module>padla-parent</module>
</modules>
<packaging>pom</packaging>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version.minimal>8</java.version.minimal>
<!-- Duplicated dependency versions -->
<version.mockito>4.6.1</version.mockito>
</properties>

<name>PADLA for Java</name>
<description>Pack of Java utilities for various needs</description>
<description>Pack of Java utilities for various needs, this is not intended for use as a dependency</description>
<url>https://padla.progrm-jarvis.ru/</url>

<inceptionYear>2019</inceptionYear>
Expand Down Expand Up @@ -72,7 +68,12 @@
</developers>

<build>
<defaultGoal>verify install</defaultGoal>
<defaultGoal>
<!-- required due to use of MultiReleaseJar and Jigsaw modules -->
package
<!-- snapshots should end up in local Maven repository by default -->
install
</defaultGoal>

<pluginManagement>
<plugins>
Expand Down Expand Up @@ -236,37 +237,17 @@
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration>
<dependencies>
<!-- Manual fix of Plugin crash on latest Java versions -->
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.4.17</version>
</dependency>
<dependency>
<groupId>org.ogce</groupId>
<artifactId>xpp3</artifactId>
<version>1.1.6</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</pluginManagement>
</build>

<dependencyManagement>
<dependencies>
<!-- Own dependencies -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>java-commons</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>reflector</artifactId>
<version>${project.version}</version>
</dependency>
<!--
Optional dependencies: this should be present both in modules and the BOM
so that BOM users default to supported library versions
-->

<!-- BOMs -->
<dependency>
Expand All @@ -275,16 +256,9 @@
<version>9.3</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.8.2</version>
<type>pom</type>
<scope>import</scope>
<optional>true</optional>
</dependency>

<!-- Libraries -->
<!-- Caching -->
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
Expand All @@ -301,44 +275,6 @@
<scope>provided</scope>
<optional>true</optional>
</dependency>

<!-- Code generation -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.24</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>

<!-- Documenting -->
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>23.0.0</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>

<!-- Testing -->
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
<version>1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${version.mockito}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<version>${version.mockito}</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
3 changes: 2 additions & 1 deletion reflector/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>ru.progrm-jarvis</groupId>
<artifactId>padla</artifactId>
<artifactId>padla-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../padla-parent</relativePath>
</parent>
<artifactId>reflector</artifactId>

Expand Down
3 changes: 2 additions & 1 deletion ultimate-messenger/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>ru.progrm-jarvis</groupId>
<artifactId>padla</artifactId>
<artifactId>padla-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../padla-parent</relativePath>
</parent>
<artifactId>ultimate-messenger</artifactId>

Expand Down

0 comments on commit b9cef42

Please sign in to comment.