Skip to content

Commit 22b1e15

Browse files
author
HaoZhang
committed
update clues and add UT
1 parent c6022ac commit 22b1e15

File tree

50 files changed

+2701
-7
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+2701
-7
lines changed

‎pkg/apis/enricher/framework/java/jboss_eap_detector.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,11 @@ func (o JBossEAPDetector) DoFrameworkDetection(language *model.Language, config
4444
ArtifactId string
4545
}{
4646
{"org.jboss.eap.plugins", "eap-maven-plugin"},
47-
{"org.jboss.eap", "jboss-eap-bom"},
4847
{"org.jboss.bom", "eap-runtime-artifacts"},
49-
{"org.jboss.bom", "jboss-eap-parent"},
5048
{"org.jboss.bom", "jboss-eap-jakartaee8"},
5149
{"org.jboss.bom", "jboss-eap-javaee8"},
5250
{"org.jboss.bom", "jboss-eap-javaee7"},
51+
{"org.jboss.bom.eap", "jboss-javaee-6.0"},
5352
}
5453

5554
for _, clue := range jbossEapClues {

resources/projects/jboss-eap/pom.xml renamed to resources/projects/jboss-eap-by-eap-maven-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<version>1.0.0.redhat-00001</version>
2929
<relativePath/>
3030
</parent>
31-
<artifactId>jboss-eap</artifactId>
31+
<artifactId>jboss-eap-by-eap-maven-plugin</artifactId>
3232
<version>8.0.0.Beta</version>
3333
<packaging>war</packaging>
3434
<name>jboss-eap</name>

resources/projects/jboss-eap/src/main/java/org/jboss/as/quickstarts/helloworld/HelloService.java renamed to resources/projects/jboss-eap-by-eap-maven-plugin/src/main/java/org/jboss/as/quickstarts/helloworld/HelloService.java

File renamed without changes.

resources/projects/jboss-eap/src/main/java/org/jboss/as/quickstarts/helloworld/HelloWorldServlet.java renamed to resources/projects/jboss-eap-by-eap-maven-plugin/src/main/java/org/jboss/as/quickstarts/helloworld/HelloWorldServlet.java

File renamed without changes.

resources/projects/jboss-eap/src/main/webapp/WEB-INF/beans.xml renamed to resources/projects/jboss-eap-by-eap-maven-plugin/src/main/webapp/WEB-INF/beans.xml

File renamed without changes.

resources/projects/jboss-eap/src/main/webapp/index.html renamed to resources/projects/jboss-eap-by-eap-maven-plugin/src/main/webapp/index.html

File renamed without changes.

resources/projects/jboss-eap/src/test/java/org/jboss/as/quickstarts/helloworld/HelloWorldServletIT.java renamed to resources/projects/jboss-eap-by-eap-maven-plugin/src/test/java/org/jboss/as/quickstarts/helloworld/HelloWorldServletIT.java

File renamed without changes.

resources/projects/jboss-eap/src/test/java/org/jboss/as/quickstarts/helloworld/managed/ManagedHelloWorldServletIT.java renamed to resources/projects/jboss-eap-by-eap-maven-plugin/src/test/java/org/jboss/as/quickstarts/helloworld/managed/ManagedHelloWorldServletIT.java

File renamed without changes.

resources/projects/jboss-eap/src/test/resources/arquillian.xml renamed to resources/projects/jboss-eap-by-eap-maven-plugin/src/test/resources/arquillian.xml

File renamed without changes.

‎resources/projects/jboss-eap-by-eap-runtime-artifacts/pom.xml‎

Lines changed: 242 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,242 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<!--
3+
JBoss, Home of Professional Open Source
4+
Copyright 2015, Red Hat, Inc. and/or its affiliates, and individual
5+
contributors by the @authors tag. See the copyright.txt in the
6+
distribution for a full listing of individual contributors.
7+
8+
Licensed under the Apache License, Version 2.0 (the "License");
9+
you may not use this file except in compliance with the License.
10+
You may obtain a copy of the License at
11+
http://www.apache.org/licenses/LICENSE-2.0
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
-->
18+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
20+
<modelVersion>4.0.0</modelVersion>
21+
<parent>
22+
<groupId>org.jboss.eap.quickstarts</groupId>
23+
<artifactId>jboss-eap-quickstart-parent</artifactId>
24+
<!--
25+
Maintain separation between the artifact id and the version to help prevent
26+
merge conflicts between commits changing the GA and those changing the V.
27+
-->
28+
<version>1.0.0.redhat-00001</version>
29+
<relativePath/>
30+
</parent>
31+
<artifactId>jboss-eap-by-eap-runtime-artifacts</artifactId>
32+
<version>8.0.0.Beta</version>
33+
<packaging>war</packaging>
34+
<name>jboss-eap</name>
35+
<description>jboss-eap</description>
36+
37+
<licenses>
38+
<license>
39+
<name>Apache License, Version 2.0</name>
40+
<distribution>repo</distribution>
41+
<url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
42+
</license>
43+
</licenses>
44+
45+
<properties>
46+
<!-- The versions for BOMs, Dependencies and Plugins -->
47+
<version.server.bom>8.0.0.Beta-redhat-00004</version.server.bom>
48+
<version.eap.maven.plugin>1.0.0.Beta6-redhat-00001</version.eap.maven.plugin>
49+
</properties>
50+
51+
<repositories>
52+
<!-- keep this repository the first -->
53+
<repository>
54+
<id>jboss-public-maven-repository</id>
55+
<name>JBoss Public Maven Repository</name>
56+
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
57+
<releases>
58+
<enabled>true</enabled>
59+
<updatePolicy>never</updatePolicy>
60+
</releases>
61+
<snapshots>
62+
<enabled>true</enabled>
63+
<updatePolicy>never</updatePolicy>
64+
</snapshots>
65+
<layout>default</layout>
66+
</repository>
67+
<repository>
68+
<id>redhat-ga-maven-repository</id>
69+
<name>Red Hat GA Maven Repository</name>
70+
<url>https://maven.repository.redhat.com/ga/</url>
71+
<releases>
72+
<enabled>true</enabled>
73+
<updatePolicy>never</updatePolicy>
74+
</releases>
75+
<snapshots>
76+
<enabled>true</enabled>
77+
<updatePolicy>never</updatePolicy>
78+
</snapshots>
79+
<layout>default</layout>
80+
</repository>
81+
<repository>
82+
<id>redhat-ea-maven-repository</id>
83+
<name>Red Hat Early Access Maven Repository</name>
84+
<url>https://maven.repository.redhat.com/earlyaccess/all/</url>
85+
<releases>
86+
<enabled>true</enabled>
87+
<updatePolicy>never</updatePolicy>
88+
</releases>
89+
<snapshots>
90+
<enabled>true</enabled>
91+
<updatePolicy>never</updatePolicy>
92+
</snapshots>
93+
<layout>default</layout>
94+
</repository>
95+
</repositories>
96+
<pluginRepositories>
97+
<!-- keep this repository the first -->
98+
<pluginRepository>
99+
<id>jboss-public-maven-repository</id>
100+
<name>JBoss Public Maven Repository</name>
101+
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
102+
<releases>
103+
<enabled>true</enabled>
104+
</releases>
105+
<snapshots>
106+
<enabled>true</enabled>
107+
</snapshots>
108+
</pluginRepository>
109+
<pluginRepository>
110+
<id>redhat-ga-maven-repository</id>
111+
<name>Red Hat GA Maven Repository</name>
112+
<url>https://maven.repository.redhat.com/ga/</url>
113+
<releases>
114+
<enabled>true</enabled>
115+
</releases>
116+
<snapshots>
117+
<enabled>true</enabled>
118+
</snapshots>
119+
</pluginRepository>
120+
<pluginRepository>
121+
<id>redhat-ea-maven-repository</id>
122+
<name>Red Hat Early Access Maven Repository</name>
123+
<url>https://maven.repository.redhat.com/earlyaccess/all/</url>
124+
<releases>
125+
<enabled>true</enabled>
126+
</releases>
127+
<snapshots>
128+
<enabled>true</enabled>
129+
</snapshots>
130+
</pluginRepository>
131+
</pluginRepositories>
132+
133+
<dependencyManagement>
134+
<dependencies>
135+
<!-- importing the jboss-eap-ee-with-tools BOM adds specs as managed dependencies -->
136+
<dependency>
137+
<groupId>org.jboss.bom</groupId>
138+
<artifactId>jboss-eap-ee-with-tools</artifactId>
139+
<version>${version.server.bom}</version>
140+
<type>pom</type>
141+
<scope>import</scope>
142+
</dependency>
143+
<dependency>
144+
<groupId>org.jboss.bom</groupId>
145+
<artifactId>eap-runtime-artifacts</artifactId>
146+
<version>7.4.0.GA</version>
147+
<type>pom</type>
148+
<scope>import</scope>
149+
</dependency>
150+
</dependencies>
151+
</dependencyManagement>
152+
153+
<dependencies>
154+
155+
<!-- Import the CDI API, we use provided scope as the API is included in WildFly -->
156+
<dependency>
157+
<groupId>jakarta.enterprise</groupId>
158+
<artifactId>jakarta.enterprise.cdi-api</artifactId>
159+
<scope>provided</scope>
160+
</dependency>
161+
162+
<!-- Import the Common Annotations API (JSR-250), we use provided scope
163+
as the API is included in WildFly -->
164+
<dependency>
165+
<groupId>jakarta.annotation</groupId>
166+
<artifactId>jakarta.annotation-api</artifactId>
167+
<scope>provided</scope>
168+
</dependency>
169+
170+
<!-- Import the Servlet API, we use provided scope as the API is included in WildFly -->
171+
<dependency>
172+
<groupId>jakarta.servlet</groupId>
173+
<artifactId>jakarta.servlet-api</artifactId>
174+
<scope>provided</scope>
175+
</dependency>
176+
177+
<!-- Tests -->
178+
<dependency>
179+
<groupId>junit</groupId>
180+
<artifactId>junit</artifactId>
181+
<scope>test</scope>
182+
<type>jar</type>
183+
</dependency>
184+
<dependency>
185+
<groupId>org.jboss.arquillian.container</groupId>
186+
<artifactId>arquillian-container-test-api</artifactId>
187+
<scope>test</scope>
188+
<type>jar</type>
189+
</dependency>
190+
<dependency>
191+
<groupId>org.jboss.arquillian.junit</groupId>
192+
<artifactId>arquillian-junit-container</artifactId>
193+
<scope>test</scope>
194+
</dependency>
195+
<dependency>
196+
<groupId>org.jboss.arquillian.protocol</groupId>
197+
<artifactId>arquillian-protocol-servlet</artifactId>
198+
<scope>test</scope>
199+
</dependency>
200+
<dependency>
201+
<groupId>org.wildfly.arquillian</groupId>
202+
<artifactId>wildfly-arquillian-common</artifactId>
203+
<scope>test</scope>
204+
</dependency>
205+
<dependency>
206+
<groupId>org.wildfly.arquillian</groupId>
207+
<artifactId>wildfly-arquillian-container-managed</artifactId>
208+
<scope>test</scope>
209+
</dependency>
210+
</dependencies>
211+
212+
<profiles>
213+
<profile>
214+
<id>arq-remote</id>
215+
<build>
216+
<plugins>
217+
<plugin>
218+
<groupId>org.apache.maven.plugins</groupId>
219+
<artifactId>maven-failsafe-plugin</artifactId>
220+
<version>${version.failsafe.plugin}</version>
221+
<configuration>
222+
<includes>
223+
<include>**/HelloWorldServletIT</include>
224+
</includes>
225+
<excludes>
226+
<exclude>**/managed/*</exclude>
227+
</excludes>
228+
</configuration>
229+
<executions>
230+
<execution>
231+
<goals>
232+
<goal>integration-test</goal>
233+
</goals>
234+
</execution>
235+
</executions>
236+
</plugin>
237+
</plugins>
238+
</build>
239+
</profile>
240+
</profiles>
241+
242+
</project>

0 commit comments

Comments
 (0)