-
Notifications
You must be signed in to change notification settings - Fork 91
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: Paul Gooderham <[email protected]>
- Loading branch information
1 parent
c58d757
commit a1779e3
Showing
5 changed files
with
335 additions
and
0 deletions.
There are no files selected for viewing
220 changes: 220 additions & 0 deletions
220
liberty-maven-plugin/src/it/binary-scanner-it/resources/basic-dev-project10/pom.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,220 @@ | ||
<?xml version='1.0' encoding='utf-8'?> | ||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
|
||
<modelVersion>4.0.0</modelVersion> | ||
|
||
<groupId>binary-scanner-it-tests</groupId> | ||
<artifactId>dev-sample-proj</artifactId> | ||
<version>1.0-SNAPSHOT</version> | ||
<packaging>war</packaging> | ||
|
||
<properties> | ||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | ||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> | ||
<maven.compiler.source>1.7</maven.compiler.source> | ||
<maven.compiler.target>1.7</maven.compiler.target> | ||
<app.name>LibertyProject</app.name> | ||
<!-- tag::ports[] --> | ||
<testServerHttpPort>9080</testServerHttpPort> | ||
<testServerHttpsPort>9443</testServerHttpsPort> | ||
<!-- end::ports[] --> | ||
<packaging.type>usr</packaging.type> | ||
</properties> | ||
<repositories> | ||
<!-- Sonatype repo needed to get the binary scanner jar for liberty:generate-features --> | ||
<repository> | ||
<id>oss-sonatype</id> | ||
<name>oss-sonatype</name> | ||
<url>https://oss.sonatype.org/content/repositories/snapshots/</url> | ||
<snapshots> | ||
<enabled>true</enabled> | ||
</snapshots> | ||
</repository> | ||
</repositories> | ||
<dependencyManagement> | ||
<dependencies> | ||
<dependency> | ||
<groupId>io.openliberty.features</groupId> | ||
<artifactId>features-bom</artifactId> | ||
<version>RUNTIME_VERSION</version> | ||
<type>pom</type> | ||
<scope>import</scope> | ||
</dependency> | ||
</dependencies> | ||
</dependencyManagement> | ||
|
||
<dependencies> | ||
<!-- Umbrella features --> | ||
<dependency> | ||
<groupId>jakarta.platform</groupId> | ||
<artifactId>jakarta.jakartaee-api</artifactId> | ||
<version>10.0.0</version> | ||
<scope>provided</scope> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.eclipse.microprofile</groupId> | ||
<artifactId>microprofile</artifactId> | ||
<version>6.0</version> | ||
<type>pom</type> | ||
<scope>provided</scope> | ||
</dependency> | ||
<!-- For tests --> | ||
<dependency> | ||
<groupId>junit</groupId> | ||
<artifactId>junit</artifactId> | ||
<version>4.13.1</version> | ||
<scope>test</scope> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.apache.cxf</groupId> | ||
<artifactId>cxf-rt-rs-client</artifactId> | ||
<version>3.2.6</version> | ||
<scope>test</scope> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.apache.cxf</groupId> | ||
<artifactId>cxf-rt-rs-extension-providers</artifactId> | ||
<version>3.2.6</version> | ||
<scope>test</scope> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.glassfish</groupId> | ||
<artifactId>javax.json</artifactId> | ||
<version>1.0.4</version> | ||
<scope>test</scope> | ||
</dependency> | ||
<!-- Java utility classes --> | ||
<dependency> | ||
<groupId>org.apache.commons</groupId> | ||
<artifactId>commons-lang3</artifactId> | ||
<version>3.0</version> | ||
</dependency> | ||
<!-- Support for JDK 9 and above--> | ||
<dependency> | ||
<groupId>javax.xml.bind</groupId> | ||
<artifactId>jaxb-api</artifactId> | ||
<version>2.3.1</version> | ||
<scope>provided</scope> | ||
</dependency> | ||
<dependency> | ||
<groupId>com.sun.xml.bind</groupId> | ||
<artifactId>jaxb-core</artifactId> | ||
<version>2.3.0.1</version> | ||
<scope>provided</scope> | ||
</dependency> | ||
<dependency> | ||
<groupId>javax.activation</groupId> | ||
<artifactId>activation</artifactId> | ||
<version>1.1.1</version> | ||
<scope>provided</scope> | ||
</dependency> | ||
<dependency> | ||
<groupId>javax.batch</groupId> | ||
<artifactId>javax.batch-api</artifactId> | ||
<version>1.0.1</version> | ||
<scope>provided</scope> | ||
</dependency> | ||
<!-- Test runtime dependency for run goal --> | ||
<dependency> | ||
<groupId>org.slf4j</groupId> | ||
<artifactId>slf4j-api</artifactId> | ||
<version>1.7.25</version> | ||
</dependency> | ||
<dependency> | ||
<groupId>ch.qos.logback</groupId> | ||
<artifactId>logback-classic</artifactId> | ||
<version>1.2.3</version> | ||
<scope>runtime</scope> | ||
</dependency> | ||
<!-- ADDITIONAL_DEPENDENCIES --> | ||
</dependencies> | ||
|
||
<build> | ||
<plugins> | ||
<plugin> | ||
<groupId>org.apache.maven.plugins</groupId> | ||
<artifactId>maven-war-plugin</artifactId> | ||
<version>3.3.2</version> | ||
<configuration> | ||
<failOnMissingWebXml>false</failOnMissingWebXml> | ||
<packagingExcludes>pom.xml</packagingExcludes> | ||
</configuration> | ||
</plugin> | ||
<!-- Plugin to run unit tests --> | ||
<plugin> | ||
<groupId>org.apache.maven.plugins</groupId> | ||
<artifactId>maven-surefire-plugin</artifactId> | ||
<version>3.0.0-M1</version> | ||
<executions> | ||
<execution> | ||
<phase>test</phase> | ||
<id>default-test</id> | ||
<configuration> | ||
<excludes> | ||
<exclude>**/it/**</exclude> | ||
</excludes> | ||
<reportsDirectory>${project.build.directory}/test-reports/unit</reportsDirectory> | ||
</configuration> | ||
</execution> | ||
</executions> | ||
</plugin> | ||
<!-- Enable liberty-maven plugin --> | ||
<plugin> | ||
<groupId>io.openliberty.tools</groupId> | ||
<artifactId>liberty-maven-plugin</artifactId> | ||
<version>SUB_VERSION</version> | ||
<configuration> | ||
<assemblyArtifact> | ||
<groupId>io.openliberty</groupId> | ||
<artifactId>openliberty-kernel</artifactId> | ||
<version>RUNTIME_VERSION</version> | ||
<type>zip</type> | ||
</assemblyArtifact> | ||
<packageName>${app.name}</packageName> | ||
<include>${packaging.type}</include> | ||
<bootstrapProperties> | ||
<default.http.port>${testServerHttpPort}</default.http.port> | ||
<default.https.port>${testServerHttpsPort}</default.https.port> | ||
<com.ibm.ws.logging.message.format>json</com.ibm.ws.logging.message.format> | ||
</bootstrapProperties> | ||
<!-- ADDITIONAL_CONFIGURATION --> | ||
</configuration> | ||
</plugin> | ||
<!-- Plugin to run functional tests --> | ||
<plugin> | ||
<groupId>org.apache.maven.plugins</groupId> | ||
<artifactId>maven-failsafe-plugin</artifactId> | ||
<version>3.0.0-M1</version> | ||
<executions> | ||
<execution> | ||
<phase>integration-test</phase> | ||
<id>integration-test</id> | ||
<goals> | ||
<goal>integration-test</goal> | ||
</goals> | ||
<configuration> | ||
<includes> | ||
<include>**/it/**/*.java</include> | ||
</includes> | ||
<!-- tag::system-props[] --> | ||
<systemPropertyVariables> | ||
<liberty.test.port>${testServerHttpPort}</liberty.test.port> | ||
</systemPropertyVariables> | ||
<!-- end::system-props[] --> | ||
</configuration> | ||
</execution> | ||
<execution> | ||
<id>verify-results</id> | ||
<goals> | ||
<goal>verify</goal> | ||
</goals> | ||
</execution> | ||
</executions> | ||
<configuration> | ||
<summaryFile>${project.build.directory}/test-reports/it/failsafe-summary.xml</summaryFile> | ||
<reportsDirectory>${project.build.directory}/test-reports/it</reportsDirectory> | ||
</configuration> | ||
</plugin> | ||
</plugins> | ||
</build> | ||
</project> |
37 changes: 37 additions & 0 deletions
37
...t/binary-scanner-it/resources/basic-dev-project10/src/main/java/com/demo/HelloLogger.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
/******************************************************************************* | ||
* (c) Copyright IBM Corporation 2020. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*******************************************************************************/ | ||
package com.demo; | ||
|
||
import org.slf4j.Logger; | ||
import org.slf4j.LoggerFactory; | ||
|
||
import jakarta.ws.rs.GET; | ||
import jakarta.ws.rs.Path; | ||
import jakarta.ws.rs.Produces; | ||
|
||
import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN; | ||
|
||
@Path("/show-log") | ||
public class HelloLogger { | ||
private static final Logger log = LoggerFactory.getLogger(HelloLogger.class); | ||
|
||
@GET | ||
@Produces(TEXT_PLAIN) | ||
public String showLog() { | ||
log.info("Here is the Log"); | ||
return "Log has been shown"; | ||
} | ||
} |
39 changes: 39 additions & 0 deletions
39
.../binary-scanner-it/resources/basic-dev-project10/src/main/java/com/demo/HelloServlet.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
/******************************************************************************* | ||
* (c) Copyright IBM Corporation 2019. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*******************************************************************************/ | ||
package com.demo; | ||
|
||
import java.io.IOException; | ||
|
||
import org.slf4j.Logger; | ||
import org.slf4j.LoggerFactory; | ||
|
||
import jakarta.servlet.ServletException; | ||
import jakarta.servlet.annotation.WebServlet; | ||
import jakarta.servlet.http.HttpServlet; | ||
import jakarta.servlet.http.HttpServletRequest; | ||
import jakarta.servlet.http.HttpServletResponse; | ||
|
||
@WebServlet(urlPatterns="/servlet") | ||
public class HelloServlet extends HttpServlet { | ||
private static final long serialVersionUID = 1L; | ||
|
||
private static final Logger log = LoggerFactory.getLogger(HelloLogger.class); | ||
|
||
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { | ||
log.info("SLF4J Logger is ready for messages."); | ||
response.getWriter().append("hello world"); | ||
} | ||
} |
34 changes: 34 additions & 0 deletions
34
...it/binary-scanner-it/resources/basic-dev-project10/src/main/java/com/demo/HelloWorld.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
/******************************************************************************* | ||
* (c) Copyright IBM Corporation 2022. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*******************************************************************************/ | ||
package com.demo; | ||
|
||
import org.eclipse.microprofile.health.Liveness; | ||
import org.eclipse.microprofile.health.HealthCheck; | ||
import org.eclipse.microprofile.health.HealthCheckResponse; | ||
|
||
@Liveness | ||
public class HelloWorld implements HealthCheck { | ||
@Override | ||
public HealthCheckResponse call() { | ||
return HealthCheckResponse | ||
.named("liveness check") | ||
.build(); | ||
} | ||
|
||
public String helloWorld() { | ||
return "helloWorld"; | ||
} | ||
} |
5 changes: 5 additions & 0 deletions
5
...src/it/binary-scanner-it/resources/basic-dev-project10/src/main/liberty/config/server.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
<server description="Sample Liberty server"> | ||
<!--replaceable--> | ||
<httpEndpoint host="*" httpPort="${default.http.port}" | ||
httpsPort="${default.https.port}" id="defaultHttpEndpoint"/> | ||
</server> |