Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 7 additions & 14 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
.gitignore
.classpath
.project
.settings
.factorypath
*~
*/target
/target/
# Maven
target/
settings.xml

# IntelliJ
*.iml
*.pyc
.idea
da-config.json
testsuite/random
testsuite/**/arquillian.properties

# auto-generated java code
/common/src/main/java/org/jboss/da/common/Constants.java
nb-configuration.xml
nbactions-*.xml
96 changes: 23 additions & 73 deletions application/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,97 +7,47 @@
</parent>
<artifactId>application</artifactId>
<name>application</name>
<packaging>ear</packaging>
<packaging>jar</packaging>
<description>Quarkus application for Dependency Analyzer</description>

<properties>
<quarkus.package.jar.type>uber-jar</quarkus.package.jar.type>
</properties>

<dependencies>
<!-- Project modules -->
<dependency>
<groupId>org.jboss.da</groupId>
<artifactId>communication</artifactId>
<type>ejb</type>
</dependency>
<dependency>
<groupId>org.jboss.da</groupId>
<artifactId>source-code-manager</artifactId>
<type>ejb</type>
</dependency>
<dependency>
<groupId>org.jboss.da</groupId>
<artifactId>reports-model</artifactId>
<type>ejb</type>
<artifactId>reports-rest</artifactId>
</dependency>

<!-- Quarkus extensions -->
<dependency>
<groupId>org.jboss.da</groupId>
<artifactId>reports-backend</artifactId>
<type>ejb</type>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-config-yaml</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.da</groupId>
<artifactId>reports-rest</artifactId>
<type>war</type>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-jdbc-postgresql</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <groupId>io.quarkus</groupId>-->
<!-- <artifactId>quarkus-smallrye-openapi</artifactId>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>io.quarkus</groupId>-->
<!-- <artifactId>quarkus-oidc</artifactId>-->
<!-- </dependency>-->
</dependencies>

<build>
<resources>
<resource>
<filtering>false</filtering>
<directory>src/main/resources</directory>
</resource>
<resource>
<filtering>false</filtering>
<directory>src/main/java</directory>
<includes>
<include>**</include>
</includes>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</resource>
</resources>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
<version>2.9</version>
<groupId>io.quarkus.platform</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
<configuration>
<filtering>true</filtering>
<version>6</version>
<defaultLibBundleDir>lib</defaultLibBundleDir>
<finalName>dependency-analysis</finalName>
<modules>
<ejbModule>
<groupId>org.jboss.da</groupId>
<artifactId>communication</artifactId>
</ejbModule>
<ejbModule>
<groupId>org.jboss.da</groupId>
<artifactId>reports-model</artifactId>
</ejbModule>
<ejbModule>
<groupId>org.jboss.da</groupId>
<artifactId>reports-backend</artifactId>
</ejbModule>
<webModule>
<groupId>org.jboss.da</groupId>
<artifactId>reports-rest</artifactId>
</webModule>
</modules>
<fileNameMapping>no-version</fileNameMapping>
<outputDirectory>${outDirectory}</outputDirectory>
</configuration>
</plugin>
<plugin>
<groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-maven-plugin</artifactId>
<configuration>
<targetDir>target</targetDir>
<filename>dependency-analysis.ear</filename>
<skip>false</skip>
</configuration>
</plugin>
</plugins>
</build>

</project>
28 changes: 0 additions & 28 deletions application/src/main/application/META-INF/application.xml

This file was deleted.

This file was deleted.

18 changes: 0 additions & 18 deletions application/src/main/application/META-INF/persistence.xml

This file was deleted.

20 changes: 20 additions & 0 deletions application/src/main/java/org/jboss/da/application/Lifecycle.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package org.jboss.da.application;

import io.quarkus.logging.Log;
import io.quarkus.runtime.Shutdown;
import io.quarkus.runtime.Startup;
import jakarta.enterprise.context.ApplicationScoped;

@ApplicationScoped
public class Lifecycle {

@Startup
void init() {
Log.info("DA started");
}

@Shutdown
void shutdown() {
Log.info("DA shutdown");
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
bean-discovery-mode="all">
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd"
bean-discovery-mode="annotated">
</beans>
30 changes: 30 additions & 0 deletions application/src/main/resources/application.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
quarkus:
http:
enable-compression: true
enable-decompression: true
websocket:
dispatch-to-worker: true
hibernate-orm:
log:
sql: false
database:
generation: ${persistence.hibernate.hbm2ddl.auto:update}
# graceful shutdown in case Quarkus is still processing requests
shutdown:
timeout: 30
index-dependency:
pnc-jandex:
group-id: "org.jboss.pnc"
log:
console:
format: "%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c{3.}] (%t) %s%e%n"
json:
~: false
exception-output-type: formatted
category:
"org.jboss.pnc":
level: DEBUG
"com.arjuna.ats.jta":
# Set to WARN if you want to see all the exceptions
level: ERROR
level: INFO
76 changes: 13 additions & 63 deletions common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,98 +7,48 @@
</parent>
<artifactId>common</artifactId>
<name>common</name>
<packaging>ejb</packaging>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.jboss.da</groupId>
<artifactId>reports-model</artifactId>
<type>ejb</type>
</dependency>

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

<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-core</artifactId>
</dependency>

<dependency>
<groupId>org.jboss.pnc</groupId>
<artifactId>constants</artifactId>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.ejb</groupId>
<artifactId>jboss-ejb-api_3.2_spec</artifactId>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.jboss.spec.javax.annotation</groupId>
<artifactId>jboss-annotations-api_1.3_spec</artifactId>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ejb-plugin</artifactId>
<configuration>
<archive>
<manifestEntries combine.children="append">
<Dependencies>
org.apache.httpcomponents export meta-inf
</Dependencies>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</pluginManagement>

<plugins>
<plugin>
<groupId>io.smallrye</groupId>
<artifactId>jandex-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
<version>2.2.0</version>
<executions>
<execution>
<goals>
<goal>revision</goal>
</goals>
</execution>
</executions>

<configuration>
<!--
If you'd like to tell the plugin where your .git directory is,
use this setting, otherwise we'll perform a search trying to
figure out the right directory. It's better to add it explicite IMHO.
-->
<dotGitDirectory>${project.basedir}/.git</dotGitDirectory>

<!-- false is default here, it prints some more information during the build -->
<verbose>true</verbose>

</configuration>
</plugin>

<plugin>
Expand Down
Loading