Skip to content

Commit

Permalink
Merge pull request #59
Browse files Browse the repository at this point in the history 
dev/v2.0.2
  • Loading branch information
@benchdoos
benchdoos authored Oct 29, 2023
2 parents cd5def2 + 31f28c6 commit 275e997
Show file tree
Hide file tree
Showing 2 changed files with 99 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
run: |
cd weblocopenercore
ls -a
mvn -B clean install -P hide-ultimate-mode
mvn -B clean install -P hide-ultimate-mode,check-dependencies
- name: Get commit hash for WeblocOpenerCore
id: weblocopenercore_hash
Expand All @@ -62,7 +62,7 @@ jobs:
echo WeblocOpenerCore hash: $WEBLOCOPENER_HASH
- name: Build WeblocOpener
run: mvn -B clean package -P build-setup,build-deb,build-exe --file pom.xml
run: mvn -B clean package -P build-setup,build-deb,build-exe,check-dependencies --file pom.xml

- name: Get commit hash for WeblocOpener
id: weblocopener_hash
Expand Down
106 changes: 97 additions & 9 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<weblocopener.core.version>2.0.2</weblocopener.core.version>
<copyright>Copyright © 2016-2023 Eugene Zrazhevsky</copyright>
<org.mapstruct.version>1.5.3.Final</org.mapstruct.version>
<lombok.version>1.18.26</lombok.version>
<lombok.version>1.18.30</lombok.version>

<disable.dev_mode>true</disable.dev_mode>
<ultimate_build>false</ultimate_build>
Expand All @@ -58,6 +58,15 @@
<junit-jupiter.version>5.9.2</junit-jupiter.version>
<easy-random.version>5.0.0</easy-random.version>
<assertj-core.version>3.24.2</assertj-core.version>
<jackson-databind.version>2.15.3</jackson-databind.version>
<commons-lang3.version>3.13.0</commons-lang3.version>
<j2html.version>1.6.0</j2html.version>
<commons-collections4.version>4.4</commons-collections4.version>
<commons-validator.version>1.7</commons-validator.version>
<annotations.version>23.0.0</annotations.version>
<bridj.version>0.7.0</bridj.version>
<forms_rt.version>7.0.3</forms_rt.version>
<jdom2.version>2.0.6.1</jdom2.version>
</properties>

<scm>
Expand Down Expand Up @@ -135,6 +144,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.6.1</version>
<executions>
<execution>
<id>copy-dependencies</id>
Expand Down Expand Up @@ -425,26 +435,75 @@
</plugins>
</build>
</profile>
<profile>
<id>check-dependencies</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.4.1</version>
<executions>
<execution>
<id>enforce</id>
<configuration>
<rules>
<requireUpperBoundDeps>
<!-- 'uniqueVersions' (default:false) can be set to true if you want to compare the timestamped SNAPSHOTs -->
<!-- <uniqueVersions>true</uniqueVersions> -->
<!-- If you wish to ignore certain cases:
<excludes>
<exclude>com.google.guava:guava</exclude>
</excludes>
-->
<!-- If you include specific cases only these will be checked: (when omitted everything is included)
<includes>
<include>com.google.guava:guava</include>
</includes>
-->
<!-- only artifacts with provided scope will be excluded
<excludedScopes>
<excludedScope>provided</excludedScopes>
</excludedScopes>
-->
</requireUpperBoundDeps>
</rules>
</configuration>
<goals>
<goal>enforce</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<dependencies>
<dependency>
<groupId>com.github.benchdoos</groupId>
<artifactId>WeblocOpenerCore</artifactId>
<version>${weblocopener.core.version}</version>
<exclusions>
<exclusion>
<artifactId>httpclient</artifactId>
<groupId>org.apache.httpcomponents</groupId>
</exclusion>
</exclusions>
</dependency>

<!--Intellij Forms-->

<dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom2</artifactId>
<version>2.0.6.1</version>
<version>${jdom2.version}</version>
</dependency>
<dependency>
<groupId>com.intellij</groupId>
<artifactId>forms_rt</artifactId>
<version>7.0.3</version>
<version>${forms_rt.version}</version>
<exclusions>
<exclusion>
<groupId>jdom</groupId>
Expand All @@ -471,31 +530,31 @@
<dependency>
<groupId>com.nativelibs4java</groupId>
<artifactId>bridj</artifactId>
<version>0.7.0</version>
<version>${bridj.version}</version>
</dependency>

<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>23.0.0</version>
<version>${annotations.version}</version>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.24</version>
<version>${lombok.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
<version>4.4</version>
<version>${commons-collections4.version}</version>
</dependency>
<dependency>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
<version>1.7</version>
<version>${commons-validator.version}</version>
<exclusions>
<exclusion>
<groupId>commons-collections</groupId>
Expand All @@ -507,7 +566,20 @@
<dependency>
<groupId>com.j2html</groupId>
<artifactId>j2html</artifactId>
<version>1.6.0</version>
<version>${j2html.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson-databind.version}</version>
<scope>compile</scope>
</dependency>

<!--Tests-->
Expand All @@ -521,12 +593,28 @@
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<version>${mockito-junit-jupiter.version}</version>
<exclusions>
<exclusion>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
</exclusion>
</exclusions>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock</artifactId>
<version>${wiremock.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
</exclusions>
<scope>test</scope>
</dependency>
<dependency>
Expand Down

0 comments on commit 275e997

Please sign in to comment.