Skip to content

Commit

Permalink
fixed maven shade plugin config
Browse files Browse the repository at this point in the history
  • Loading branch information
@albogdano
albogdano committed May 16, 2024
1 parent ae2d62d commit e1914f3
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 66 deletions.
68 changes: 20 additions & 48 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<dependency>
<groupId>com.erudika</groupId>
<artifactId>para-core</artifactId>
<version>1.50.0-SNAPSHOT</version>
<version>1.50.0</version>
<scope>provided</scope>
</dependency>

Expand All @@ -89,38 +89,38 @@
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
<version>3.45.2.0</version>
<version>3.45.3.0</version>
</dependency>

<!-- TESTING -->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.24.0</version>
<version>5.11.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.10.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.10.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>32.1.1-jre</version>
<version>33.2.0-jre</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.4.0-b180830.0359</version>
<version>1.3.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -130,7 +130,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.5.2</version>
<version>3.5.3</version>
<executions>
<execution>
<phase>package</phase>
Expand All @@ -139,8 +139,8 @@
</goals>
<configuration>
<minimizeJar>false</minimizeJar>
<createDependencyReducedPom>false</createDependencyReducedPom>
<shadedArtifactAttached>true</shadedArtifactAttached>
<createDependencyReducedPom>false</createDependencyReducedPom>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
</transformers>
Expand Down Expand Up @@ -195,7 +195,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>9.2</version>
<version>10.16.0</version>
</dependency>
</dependencies>
<executions>
Expand Down Expand Up @@ -247,13 +247,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.1.1</version>
<version>3.1.2</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.3.0</version>
<version>3.4.1</version>
<configuration>
<archive>
<manifestEntries>
Expand Down Expand Up @@ -314,7 +314,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.2.2</version>
<version>3.2.4</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand All @@ -330,32 +330,4 @@
</profile>
</profiles>

<distributionManagement>
<snapshotRepository>
<id>oss.sonatype.org</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>oss.sonatype.org</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>

<repositories>
<repository>
<id>sonatype-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>oss.sonatype.org</id>
<url>https://oss.sonatype.org/content/repositories/releases/</url>
</repository>
</repositories>

</project>
17 changes: 11 additions & 6 deletions src/test/java/com/erudika/para/server/persistence/DAOTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,21 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Map;
import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.mockito.Mockito.*;

/**
*
* @author Alex Bogdanovski [alex@erudika.com]
*/
@Ignore
@Disabled
public abstract class DAOTest {

private final DAO dao;
Expand Down Expand Up @@ -70,7 +75,7 @@ private static Tag t() {
return t;
}

@Before
@BeforeEach
public void setUp() {
CoreUtils.getInstance().setDao(dao);
CoreUtils.getInstance().setSearch(mock(Search.class));
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/com/erudika/para/server/persistence/H2DAOIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
package com.erudika.para.server.persistence;

import com.erudika.para.core.utils.Para;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;

/**
*
Expand All @@ -33,7 +33,7 @@ public H2DAOIT() {
super(new H2DAO());
}

@BeforeClass
@BeforeAll
public static void setUpClass() throws InterruptedException {
System.setProperty("para.app_name", ROOT_APP_NAME);
H2Utils.createTable(Para.getConfig().getRootAppIdentifier());
Expand All @@ -42,7 +42,7 @@ public static void setUpClass() throws InterruptedException {
H2Utils.createTable(appid3);
}

@AfterClass
@AfterAll
public static void tearDownClass() {
// H2Utils.deleteTable(Para.getConfig().getRootAppIdentifier());
H2Utils.deleteTable(appid1);
Expand Down
15 changes: 7 additions & 8 deletions src/test/java/com/erudika/para/server/persistence/SqlDAOIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,17 @@
package com.erudika.para.server.persistence;

import org.apache.commons.lang3.StringUtils;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;

import org.junit.AfterClass;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.jupiter.api.AfterAll;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

/**
* Perform an integration test of the generic SQL DAO using a specific mode.
* @author Jeremy Wiesner [jswiesner@gmail.com]
*/
@Ignore
@Disabled
public abstract class SqlDAOIT extends DAOTest {

private static final String ROOT_APP_NAME = "para-test";
Expand All @@ -51,7 +50,7 @@ private void initialize() {
SqlUtils.createTable(appid3);
}

@AfterClass
@AfterAll
public static void destroy() {
SqlUtils.deleteTable(ROOT_APP_NAME);
SqlUtils.deleteTable(appid1);
Expand Down

0 comments on commit e1914f3

Please sign in to comment.