-
Notifications
You must be signed in to change notification settings - Fork 147
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into snyk-upgrade-a38ff930990a08f29e803c2328507fbf
- Loading branch information
Showing
10 changed files
with
130 additions
and
130 deletions.
There are no files selected for viewing
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
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
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
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
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
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
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 |
|---|---|---|
| @@ -1,122 +1,122 @@ | ||
| <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> | ||
| <parent> | ||
| <groupId>my.restful</groupId> | ||
| <artifactId>jax-rs2-guideII</artifactId> | ||
| <version>0.0.1-SNAPSHOT</version> | ||
| </parent> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <groupId>org.feuyeux.restful</groupId> | ||
| <artifactId>sse</artifactId> | ||
| <packaging>war</packaging> | ||
| <version>0.0.1-SNAPSHOT</version> | ||
|
|
||
| <name>sse</name> | ||
| <description>SSE Demo project for JAX-RS2</description> | ||
|
|
||
| <properties> | ||
| <encoding>UTF-8</encoding> | ||
| <java.version>1.8</java.version> | ||
| <jersey.version>2.35</jersey.version> | ||
| <jquery.version>2.2.4</jquery.version> | ||
| <log4j2.version>2.17.2</log4j2.version> | ||
| </properties> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-compiler-plugin</artifactId> | ||
| <version>${maven-compiler-plugin.version}</version> | ||
| <configuration> | ||
| <source>${java.version}</source> | ||
| <target>${java.version}</target> | ||
| <encoding>UTF-8</encoding> | ||
| </configuration> | ||
| </plugin> | ||
|
|
||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-war-plugin</artifactId> | ||
| <version>2.3</version> | ||
| <configuration> | ||
| <failOnMissingWebXml>false</failOnMissingWebXml> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
|
|
||
| <dependencies> | ||
| <!-- jersey --> | ||
| <dependency> | ||
| <groupId>org.glassfish.jersey.containers</groupId> | ||
| <artifactId>jersey-container-servlet</artifactId> | ||
| <version>${jersey.version}</version> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.glassfish.jersey.containers</groupId> | ||
| <artifactId>jersey-container-grizzly2-http</artifactId> | ||
| <version>${jersey.version}</version> | ||
| </dependency> | ||
|
|
||
| <!-- media type --> | ||
| <dependency> | ||
| <groupId>org.glassfish.jersey.media</groupId> | ||
| <artifactId>jersey-media-sse</artifactId> | ||
| <version>${jersey.version}</version> | ||
| </dependency> | ||
|
|
||
| <!-- test --> | ||
| <dependency> | ||
| <groupId>org.glassfish.jersey.connectors</groupId> | ||
| <artifactId>jersey-apache-connector</artifactId> | ||
| <version>${jersey.version}</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.glassfish.jersey.test-framework.providers</groupId> | ||
| <artifactId>jersey-test-framework-provider-bundle</artifactId> | ||
| <version>${jersey.version}</version> | ||
| <type>pom</type> | ||
| <scope>test</scope> | ||
| </dependency> | ||
|
|
||
| <!-- web jars --> | ||
| <dependency> | ||
| <groupId>org.webjars</groupId> | ||
| <artifactId>jquery</artifactId> | ||
| <version>${jquery.version}</version> | ||
| </dependency> | ||
|
|
||
| <!-- log --> | ||
| <dependency> | ||
| <groupId>org.apache.logging.log4j</groupId> | ||
| <artifactId>log4j-api</artifactId> | ||
| <version>${log4j2.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.apache.logging.log4j</groupId> | ||
| <artifactId>log4j-core</artifactId> | ||
| <version>${log4j2.version}</version> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <pluginRepositories> | ||
| <pluginRepository> | ||
| <id>snapshots.codehaus.org</id> | ||
| <name>Codehaus.org Snapshots Maven Repository</name> | ||
| <url>http://nexus.codehaus.org/snapshots</url> | ||
| <layout>default</layout> | ||
| </pluginRepository> | ||
| </pluginRepositories> | ||
|
|
||
| <repositories> | ||
| <repository> | ||
| <id>release.maven.java.net</id> | ||
| <name>java.net Maven Release Repository</name> | ||
| <url>https://maven.java.net/content/groups/public</url> | ||
| <layout>default</layout> | ||
| </repository> | ||
| </repositories> | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> | ||
| <parent> | ||
| <groupId>my.restful</groupId> | ||
| <artifactId>jax-rs2-guideII</artifactId> | ||
| <version>0.0.1-SNAPSHOT</version> | ||
| </parent> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <groupId>org.feuyeux.restful</groupId> | ||
| <artifactId>sse</artifactId> | ||
| <packaging>war</packaging> | ||
| <version>0.0.1-SNAPSHOT</version> | ||
|
|
||
| <name>sse</name> | ||
| <description>SSE Demo project for JAX-RS2</description> | ||
|
|
||
| <properties> | ||
| <encoding>UTF-8</encoding> | ||
| <java.version>1.8</java.version> | ||
| <jersey.version>2.41</jersey.version> | ||
| <jquery.version>2.2.4</jquery.version> | ||
| <log4j2.version>2.17.2</log4j2.version> | ||
| </properties> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-compiler-plugin</artifactId> | ||
| <version>${maven-compiler-plugin.version}</version> | ||
| <configuration> | ||
| <source>${java.version}</source> | ||
| <target>${java.version}</target> | ||
| <encoding>UTF-8</encoding> | ||
| </configuration> | ||
| </plugin> | ||
|
|
||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-war-plugin</artifactId> | ||
| <version>2.3</version> | ||
| <configuration> | ||
| <failOnMissingWebXml>false</failOnMissingWebXml> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
|
|
||
| <dependencies> | ||
| <!-- jersey --> | ||
| <dependency> | ||
| <groupId>org.glassfish.jersey.containers</groupId> | ||
| <artifactId>jersey-container-servlet</artifactId> | ||
| <version>${jersey.version}</version> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.glassfish.jersey.containers</groupId> | ||
| <artifactId>jersey-container-grizzly2-http</artifactId> | ||
| <version>${jersey.version}</version> | ||
| </dependency> | ||
|
|
||
| <!-- media type --> | ||
| <dependency> | ||
| <groupId>org.glassfish.jersey.media</groupId> | ||
| <artifactId>jersey-media-sse</artifactId> | ||
| <version>${jersey.version}</version> | ||
| </dependency> | ||
|
|
||
| <!-- test --> | ||
| <dependency> | ||
| <groupId>org.glassfish.jersey.connectors</groupId> | ||
| <artifactId>jersey-apache-connector</artifactId> | ||
| <version>${jersey.version}</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.glassfish.jersey.test-framework.providers</groupId> | ||
| <artifactId>jersey-test-framework-provider-bundle</artifactId> | ||
| <version>${jersey.version}</version> | ||
| <type>pom</type> | ||
| <scope>test</scope> | ||
| </dependency> | ||
|
|
||
| <!-- web jars --> | ||
| <dependency> | ||
| <groupId>org.webjars</groupId> | ||
| <artifactId>jquery</artifactId> | ||
| <version>${jquery.version}</version> | ||
| </dependency> | ||
|
|
||
| <!-- log --> | ||
| <dependency> | ||
| <groupId>org.apache.logging.log4j</groupId> | ||
| <artifactId>log4j-api</artifactId> | ||
| <version>${log4j2.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.apache.logging.log4j</groupId> | ||
| <artifactId>log4j-core</artifactId> | ||
| <version>${log4j2.version}</version> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <pluginRepositories> | ||
| <pluginRepository> | ||
| <id>snapshots.codehaus.org</id> | ||
| <name>Codehaus.org Snapshots Maven Repository</name> | ||
| <url>http://nexus.codehaus.org/snapshots</url> | ||
| <layout>default</layout> | ||
| </pluginRepository> | ||
| </pluginRepositories> | ||
|
|
||
| <repositories> | ||
| <repository> | ||
| <id>release.maven.java.net</id> | ||
| <name>java.net Maven Release Repository</name> | ||
| <url>https://maven.java.net/content/groups/public</url> | ||
| <layout>default</layout> | ||
| </repository> | ||
| </repositories> | ||
| </project> |
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
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
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