Repository: incubator-edgent Updated Branches: refs/heads/feature/alternate-servlet-engines [created] d07dff673
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/d07dff67/platforms/java7/console/server/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/java7/console/server/pom.xml b/platforms/java7/console/server/pom.xml deleted file mode 100644 index 1f1cbd4..0000000 --- a/platforms/java7/console/server/pom.xml +++ /dev/null @@ -1,198 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You 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. - ---> -<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> - - <parent> - <groupId>org.apache.edgent.java7</groupId> - <artifactId>edgent-console</artifactId> - <version>1.3.0-SNAPSHOT</version> - </parent> - - <artifactId>edgent-console-server</artifactId> - - <name>Apache Edgent (Java 7): Console: Server</name> - - <build> - <resources> - <resource> - <directory>${project.basedir}/src/main/resources</directory> - <targetPath>${project.build.outputDirectory}/</targetPath> - </resource> - <resource> - <directory>${project.basedir}/../../../../src/main/appended-resources/licenses</directory> - <targetPath>${project.build.outputDirectory}/META-INF/licenses</targetPath> - </resource> - </resources> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <!-- - Copy the servlets.war into the build output so it is embedded as - resource into the jar. - --> - <execution> - <id>copy-war</id> - <phase>generate-resources</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.apache.edgent.java7</groupId> - <artifactId>edgent-console-servlets</artifactId> - <version>${project.version}</version> - <type>war</type> - <outputDirectory>${project.build.outputDirectory}/resources</outputDirectory> - <destFileName>servlets.war</destFileName> - </artifactItem> - </artifactItems> - </configuration> - </execution> - <execution> - <id>copy</id> - <phase>compile</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.apache.edgent</groupId> - <artifactId>${project.artifactId}</artifactId> - <version>${project.version}</version> - <outputDirectory>${project.build.directory}/classes</outputDirectory> - <excludes>META-INF/**,resources/**</excludes> - </artifactItem> - </artifactItems> - </configuration> - </execution> - <execution> - <id>copy-test</id> - <phase>test-compile</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.apache.edgent</groupId> - <artifactId>${project.artifactId}</artifactId> - <version>${project.version}</version> - <classifier>tests</classifier> - <outputDirectory>${project.build.directory}/test-classes</outputDirectory> - <excludes>META-INF/**</excludes> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <!-- needed because of HttpServer impl and HttpServerPortTest --> - <reuseForks>false</reuseForks> - </configuration> - </plugin> - </plugins> - </build> - - <reporting> - <plugins> - <!-- For some strange reason this report is causing trouble --> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <version>0.7.9</version> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </reporting> - - <dependencies> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - <version>${jetty.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-io</artifactId> - <version>${jetty.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-security</artifactId> - <version>${jetty.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - <version>${jetty.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlet</artifactId> - <version>${jetty.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</artifactId> - <version>${jetty.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-webapp</artifactId> - <version>${jetty.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-xml</artifactId> - <version>${jetty.version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>1.7.12</version> - </dependency> - - <!-- - This artifact is needed by the maven-dependency-plugin - by marking this dependency optional, it is not included - in the resulting artifact, but Maven ensures it is built - prior to this module. - --> - <dependency> - <groupId>org.apache.edgent.java7</groupId> - <artifactId>edgent-console-servlets</artifactId> - <version>1.3.0-SNAPSHOT</version> - <type>war</type> - <optional>true</optional> - </dependency> - </dependencies> - -</project> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/d07dff67/platforms/java7/console/server/src/main/remote-resources/META-INF/LICENSE ---------------------------------------------------------------------- diff --git a/platforms/java7/console/server/src/main/remote-resources/META-INF/LICENSE b/platforms/java7/console/server/src/main/remote-resources/META-INF/LICENSE deleted file mode 100644 index bc4b691..0000000 --- a/platforms/java7/console/server/src/main/remote-resources/META-INF/LICENSE +++ /dev/null @@ -1,41 +0,0 @@ - -=============================================================================== -APACHE EDGENT SUBCOMPONENTS: - -This binary includes a number of subcomponents with separate -copyright notices and license terms. Your use of this binary -is subject to the terms and conditions of the following licenses. - -=============================================================================== -License: Apache License Version 2.0 -For details, see META-INF/licenses/apache-license-version-2.0.txt - -gson (com.google.code.gson:gson:2.2.4) -metrics-core (io.dropwizard.metrics:metrics-core:3.1.2) - -=============================================================================== -License: MIT - -jquery (org.webjars:jquery:1.11.2) - For details, see META-INF/licenses/jquery-1_11_2-MIT.txt. - -jquery-ui (org.webjars:jquery-ui:1.11.4) - For details, see META-INF/licenses/jquery-ui-1_11_4-MIT.txt. - -d3.legend.js (https://gist.githubusercontent.com/ZJONSSON/3918369/raw/bf9bce6b68a3b70f87450f155436ca4a84af1ba4/d3.legend.js) - For details, see META-INF/licenses/d3.legend-MIT.txt. - -=============================================================================== -License: BSD 3-Clause - -d3 (org.webjars.bower:d3:3.3.9) - For details, see META-INF/licenses/d3-3_3_9-BSD.txt. - -=============================================================================== -License: BSD 2-Clause - -d3-plugins-sankey (org.webjars.bower:d3-plugins-sankey:1.1.0) - For details, see META-INF/licenses/d3-plugins-sankey-1_1_0-BSD.txt. - -=============================================================================== - http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/d07dff67/platforms/java7/console/server/src/main/remote-resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git a/platforms/java7/console/server/src/main/remote-resources/META-INF/NOTICE b/platforms/java7/console/server/src/main/remote-resources/META-INF/NOTICE deleted file mode 100644 index 9c9e7e9..0000000 --- a/platforms/java7/console/server/src/main/remote-resources/META-INF/NOTICE +++ /dev/null @@ -1,28 +0,0 @@ -=============================================================================== - -Portions of this software were developed by IBM Corp. -Copyright IBM Corp. 2015, 2016 - -=============================================================================== - -APACHE EDGENT SUBCOMPONENTS: - -This product includes a number of subcomponents with separate -copyright notices and license terms. The following notices apply. - -------------------------------------------------------------------------------- -metrics-core (io.dropwizard.metrics:metrics-core:3.1.2) - -Metrics -Copyright 2010-2013 Coda Hale and Yammer, Inc. - -This product includes software developed by Coda Hale and Yammer, Inc. - -This product includes code derived from the JSR-166 project (ThreadLocalRandom, -Striped64, LongAdder) with the following comments: - - Written by Doug Lea with assistance from members of JCP JSR-166 - Expert Group and released to the public domain, as explained at - http://creativecommons.org/publicdomain/zero/1.0/ - -=============================================================================== http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/d07dff67/platforms/java7/console/servlets/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/java7/console/servlets/pom.xml b/platforms/java7/console/servlets/pom.xml index 5a53177..13ab196 100644 --- a/platforms/java7/console/servlets/pom.xml +++ b/platforms/java7/console/servlets/pom.xml @@ -115,6 +115,8 @@ <version>2.6</version> <configuration> <failOnMissingWebXml>false</failOnMissingWebXml> + <!-- Additionally create a jar version containing only the classes --> + <attachClasses>true</attachClasses> </configuration> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/d07dff67/platforms/java7/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/java7/distribution/pom.xml b/platforms/java7/distribution/pom.xml index 1a6376b..6885a9a 100644 --- a/platforms/java7/distribution/pom.xml +++ b/platforms/java7/distribution/pom.xml @@ -205,8 +205,8 @@ <!-- Include console-servlets.war to enable a user to run it in their own Servlets engine. - It's bundled in the edgent-console-server.jar. - Note, edgent-console-server is pulled in as a dependency + It's bundled in the edgent-console-server-jetty.jar. + Note, edgent-console-server-jetty is pulled in as a dependency of the development provider. --> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/d07dff67/platforms/java7/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/java7/pom.xml b/platforms/java7/pom.xml index bcd7b7c..c73e170 100644 --- a/platforms/java7/pom.xml +++ b/platforms/java7/pom.xml @@ -91,7 +91,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> - <version>1.15</version> + <version>1.16</version> <executions> <execution> <id>check-jdk-signatures</id> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/d07dff67/platforms/java7/providers/development/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/java7/providers/development/pom.xml b/platforms/java7/providers/development/pom.xml index 7a541af..9db0614 100644 --- a/platforms/java7/providers/development/pom.xml +++ b/platforms/java7/providers/development/pom.xml @@ -90,7 +90,7 @@ </dependency> <dependency> <groupId>org.apache.edgent.java7</groupId> - <artifactId>edgent-console-server</artifactId> + <artifactId>edgent-console-server-jetty</artifactId> <version>1.3.0-SNAPSHOT</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/d07dff67/platforms/java7/test/svt/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/java7/test/svt/pom.xml b/platforms/java7/test/svt/pom.xml index f812c55..9806a57 100644 --- a/platforms/java7/test/svt/pom.xml +++ b/platforms/java7/test/svt/pom.xml @@ -98,7 +98,7 @@ </dependency> <dependency> <groupId>org.apache.edgent.java7</groupId> - <artifactId>edgent-console-server</artifactId> + <artifactId>edgent-console-server-jetty</artifactId> <version>1.3.0-SNAPSHOT</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/d07dff67/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 6450e14..99c8ef7 100644 --- a/pom.xml +++ b/pom.xml @@ -51,9 +51,10 @@ <project.reporting.outputencoding>UTF-8</project.reporting.outputencoding> <maven.version>3.3.1</maven.version> - <jetty.version>9.3.6.v20151106</jetty.version> + <jetty.version>9.4.8.v20180619</jetty.version> + <tomcat.version>9.0.10</tomcat.version> <gson.version>2.2.4</gson.version> - <slf4j.version>1.7.12</slf4j.version> + <slf4j.version>1.7.25</slf4j.version> <!-- URL of the ASF SonarQube server --> <sonar.host.url>https://builds.apache.org/analysis</sonar.host.url> @@ -202,6 +203,12 @@ <version>3.3.0.603</version> </plugin> + <plugin> + <groupId>org.sonatype.ossindex.maven</groupId> + <artifactId>ossindex-maven-plugin</artifactId> + <version>1.0.0</version> + </plugin> + <!-- This is a fake plugin which is used to tell m2e (Eclipse) how to process this maven project. @@ -300,6 +307,22 @@ </pluginManagement> <plugins> + + <!-- Audit all dependencies for known vulnerabilities --> + <plugin> + <groupId>org.sonatype.ossindex.maven</groupId> + <artifactId>ossindex-maven-plugin</artifactId> + <executions> + <execution> + <id>audit-dependencies</id> + <phase>validate</phase> + <goals> + <goal>audit</goal> + </goals> + </execution> + </executions> + </plugin> + <!-- Check if all source files have the required apache license headers --> <plugin> <groupId>org.apache.rat</groupId> @@ -637,7 +660,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> - <version>1.15</version> + <version>1.16</version> <executions> <execution> <id>check-jdk-signatures</id> @@ -870,7 +893,7 @@ <dependency> <groupId>io.dropwizard.metrics</groupId> <artifactId>metrics-core</artifactId> - <version>3.1.2</version> + <version>3.2.6</version> <exclusions> <exclusion> <groupId>org.slf4j</groupId> @@ -893,6 +916,21 @@ </dependency> </dependencies> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>2.8.5</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.2</version> + </dependency> + </dependencies> + </dependencyManagement> + <repositories> <repository> <id>apache-release</id> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/d07dff67/providers/development/pom.xml ---------------------------------------------------------------------- diff --git a/providers/development/pom.xml b/providers/development/pom.xml index 692cf9e..cfc8e69 100644 --- a/providers/development/pom.xml +++ b/providers/development/pom.xml @@ -42,7 +42,7 @@ </dependency> <dependency> <groupId>org.apache.edgent</groupId> - <artifactId>edgent-console-server</artifactId> + <artifactId>edgent-console-server-jetty</artifactId> <version>1.3.0-SNAPSHOT</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/d07dff67/test/svt/pom.xml ---------------------------------------------------------------------- diff --git a/test/svt/pom.xml b/test/svt/pom.xml index 06dd1a3..c0c99d6 100644 --- a/test/svt/pom.xml +++ b/test/svt/pom.xml @@ -42,7 +42,7 @@ </dependency> <dependency> <groupId>org.apache.edgent</groupId> - <artifactId>edgent-console-server</artifactId> + <artifactId>edgent-console-server-jetty</artifactId> <version>1.3.0-SNAPSHOT</version> </dependency> <dependency>
