Skip to content

Commit f1527d3

Browse files
authored
fix cyclic dependency caused by moving GoldenSignalsFilter (#1495)
* fix cyclic dependency caused by moving GoldenSignalsFilter * Adding beans.xml to allow CDI injection properly
1 parent 1a8b882 commit f1527d3

File tree

14 files changed

+58
-309
lines changed

14 files changed

+58
-309
lines changed

addons/httprox/common/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
</dependency>
3838
<dependency>
3939
<groupId>org.commonjava.indy</groupId>
40-
<artifactId>indy-sli-jaxrs</artifactId>
40+
<artifactId>indy-sli</artifactId>
4141
</dependency>
4242
<dependency>
4343
<groupId>org.commonjava.indy</groupId>

addons/sli/jaxrs/pom.xml

-74
This file was deleted.

addons/sli/jaxrs/src/main/java/org/commonjava/indy/sli/jaxrs/GoldenSignalsFilterMapper.java

-60
This file was deleted.

addons/sli/jaxrs/src/test/java/org/commonjava/indy/sli/jaxrs/GoldenSignalsFilterTest.java

-162
This file was deleted.

addons/sli/pom.xml

+36-5
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,42 @@
2424
<version>1.9.9-SNAPSHOT</version>
2525
</parent>
2626
<artifactId>indy-sli</artifactId>
27-
<name>Indy :: Add-Ons :: Service Level Indicators Reporting :: Parent</name>
28-
<packaging>pom</packaging>
27+
<name>Indy :: Add-Ons :: Service Level Indicators Reporting :: JAX-RS</name>
2928

30-
<modules>
31-
<module>jaxrs</module>
32-
</modules>
29+
<dependencies>
30+
<dependency>
31+
<groupId>org.commonjava.indy</groupId>
32+
<artifactId>indy-subsys-metrics-core</artifactId>
33+
</dependency>
34+
<dependency>
35+
<groupId>org.commonjava.indy</groupId>
36+
<artifactId>indy-api</artifactId>
37+
</dependency>
38+
<dependency>
39+
<groupId>org.commonjava.indy</groupId>
40+
<artifactId>indy-core</artifactId>
41+
</dependency>
42+
<dependency>
43+
<groupId>org.commonjava.indy</groupId>
44+
<artifactId>indy-model-core-java</artifactId>
45+
</dependency>
46+
<dependency>
47+
<groupId>org.commonjava.indy</groupId>
48+
<artifactId>indy-db-memory</artifactId>
49+
<scope>test</scope>
50+
</dependency>
51+
<dependency>
52+
<groupId>org.commonjava.maven.galley</groupId>
53+
<artifactId>galley-test-harness-maven</artifactId>
54+
</dependency>
55+
<dependency>
56+
<groupId>org.commonjava.atlas</groupId>
57+
<artifactId>atlas-identities</artifactId>
58+
</dependency>
59+
<dependency>
60+
<groupId>org.jboss.spec.javax.servlet</groupId>
61+
<artifactId>jboss-servlet-api_3.0_spec</artifactId>
62+
</dependency>
63+
</dependencies>
3364

3465
</project>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Copyright (c) 2014 Red Hat, Inc..
4+
All rights reserved. This program and the accompanying materials
5+
are made available under the terms of the GNU Public License v3.0
6+
which accompanies this distribution, and is available at
7+
http://www.gnu.org/licenses/gpl.html
8+
9+
Contributors:
10+
Red Hat, Inc. - initial API and implementation
11+
-->
12+
<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
13+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
14+
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
15+
version="1.1" bean-discovery-mode="all">
16+
</beans>

embedder/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
</dependency>
138138
<dependency>
139139
<groupId>org.commonjava.indy</groupId>
140-
<artifactId>indy-sli-jaxrs</artifactId>
140+
<artifactId>indy-sli</artifactId>
141141
</dependency>
142142

143143
<dependency>

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -755,7 +755,7 @@
755755

756756
<dependency>
757757
<groupId>org.commonjava.indy</groupId>
758-
<artifactId>indy-sli-jaxrs</artifactId>
758+
<artifactId>indy-sli</artifactId>
759759
<version>1.9.9-SNAPSHOT</version>
760760
</dependency>
761761

subsys/jaxrs/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
</dependency>
104104
<dependency>
105105
<groupId>org.commonjava.indy</groupId>
106-
<artifactId>indy-sli-jaxrs</artifactId>
106+
<artifactId>indy-sli</artifactId>
107107
</dependency>
108108
<dependency>
109109
<groupId>io.swagger</groupId>

0 commit comments

Comments
 (0)