Compare commits
5
Commits
07e42bc98c
..
master
| Author | SHA1 | Date | |
|---|---|---|---|
 c-chengc1
|
fdefa440bb | ||
|
c-chengc1
|
4b364f593a | ||
|
c-chengc1
|
3c6ef5b25a | ||
|
c-chengc1
|
0d755b8888 | ||
|
c-chengc1
|
ee218c9632 |
@@ -190,24 +190,24 @@ public class WkFailProcessor extends ViewProcessor {
|
|||||||
//1.判断是否为企业微信浏览器并且对接了企业微信
|
//1.判断是否为企业微信浏览器并且对接了企业微信
|
||||||
if (browserPlatform == BrowserPlatform.QI_YE_WEI_XIN && propertiesProxy.getBoolean("wxwork.enable", false)) {
|
if (browserPlatform == BrowserPlatform.QI_YE_WEI_XIN && propertiesProxy.getBoolean("wxwork.enable", false)) {
|
||||||
//进行企业微信授权
|
//进行企业微信授权
|
||||||
// String token = getWxWorkToken();
|
String token = getWxWorkToken();
|
||||||
// if (StrUtil.isNotBlank(token)) {
|
if (StrUtil.isNotBlank(token)) {
|
||||||
// //跳转到企业微信授权地址
|
// //跳转到企业微信授权地址
|
||||||
// new ServerRedirectView(buildWxWorkOauth2Url()).render(request, response, null);
|
new ServerRedirectView(buildWxWorkOauth2Url()).render(request, response, null);
|
||||||
// } else {
|
} else {
|
||||||
// //跳转到错误页 别问我为啥错了 我也不知道 首先去检查配置文件里的参数有没有写对
|
// //跳转到错误页 别问我为啥错了 我也不知道 首先去检查配置文件里的参数有没有写对
|
||||||
//// new ServerRedirectView(Globals.AppDomain + errorUri).render(request, response, null);
|
//// new ServerRedirectView(Globals.AppDomain + errorUri).render(request, response, null);
|
||||||
// //跳转到cas登录页
|
//跳转到cas登录页
|
||||||
// String callBackUrl = propertiesProxy.get("cas.client-host-url") + propertiesProxy.get("cas.client-call-back-url") + "?redirect=" + redirect;
|
String callBackUrl = propertiesProxy.get("cas.client-host-url") + propertiesProxy.get("cas.client-call-back-url") + "?redirect=" + redirect;
|
||||||
// String authUrl = propertiesProxy.get("cas.qi-wx-server-login-url") + "?service=" + URLEncoder.encode(callBackUrl, StandardCharsets.UTF_8);
|
String authUrl = propertiesProxy.get("cas.qi-wx-server-login-url") + "?service=" + URLEncoder.encode(callBackUrl, StandardCharsets.UTF_8);
|
||||||
// new ServerRedirectView(authUrl).render(request, response, null);
|
new ServerRedirectView(authUrl).render(request, response, null);
|
||||||
// }
|
}
|
||||||
|
|
||||||
// 武汉城市职业学院 跳转到企业微信cas登录页
|
// 武汉城市职业学院 跳转到企业微信cas登录页
|
||||||
String callBackUrl = propertiesProxy.get("wecom.wecom-client-host-url") + propertiesProxy.get("wecom.wecom-client-call-back-url") + "?redirect=" + redirect;
|
/* String callBackUrl = propertiesProxy.get("wecom.wecom-client-host-url") + propertiesProxy.get("wecom.wecom-client-call-back-url") + "?redirect=" + redirect;
|
||||||
String authUrl = propertiesProxy.get("wecom.wecom-server-login-url") + "?service=" + URLEncoder.encode(callBackUrl, StandardCharsets.UTF_8);
|
String authUrl = propertiesProxy.get("wecom.wecom-server-login-url") + "?service=" + URLEncoder.encode(callBackUrl, StandardCharsets.UTF_8);
|
||||||
log.info("auth:"+authUrl);
|
log.info("auth:"+authUrl);
|
||||||
new ServerRedirectView(authUrl).render(request, response, null);
|
new ServerRedirectView(authUrl).render(request, response, null);*/
|
||||||
} else if (browserPlatform == BrowserPlatform.WEI_XIN && propertiesProxy.getBoolean("wx.enable", false)) {
|
} else if (browserPlatform == BrowserPlatform.WEI_XIN && propertiesProxy.getBoolean("wx.enable", false)) {
|
||||||
//进行微信公众号授权
|
//进行微信公众号授权
|
||||||
//跳转到微信授权页
|
//跳转到微信授权页
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
AmiMu2ZH1GAFuH2L
|
||||||
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 558 KiB |
@@ -2,9 +2,7 @@ const home = {
|
|||||||
template: /*language=HTML*/ `
|
template: /*language=HTML*/ `
|
||||||
<div class="home-page">
|
<div class="home-page">
|
||||||
<div class="home-summary-bar" :class="{'home-summary-bar--visible': showHomeSummary}">
|
<div class="home-summary-bar" :class="{'home-summary-bar--visible': showHomeSummary}">
|
||||||
<img class="home-summary-bar__logo"
|
<span class="home-summary-bar__logo" role="img" aria-label="南京审计大学"></span>
|
||||||
src="/assets/mobile/img/home/v4/中国地质大学-logo.png"
|
|
||||||
alt="中国地质大学">
|
|
||||||
<span class="home-summary-bar__divider"></span>
|
<span class="home-summary-bar__divider"></span>
|
||||||
<span class="home-summary-bar__title">智慧工会</span>
|
<span class="home-summary-bar__title">智慧工会</span>
|
||||||
</div>
|
</div>
|
||||||
@@ -14,8 +12,8 @@ const home = {
|
|||||||
<div class="home-hero__content">
|
<div class="home-hero__content">
|
||||||
<div class="home-hero__topbar">
|
<div class="home-hero__topbar">
|
||||||
<img class="home-hero__brand-logo"
|
<img class="home-hero__brand-logo"
|
||||||
src="/assets/mobile/img/home/v4/中国地质大学-logo.png"
|
src="/assets/mobile/img/home/v4/南京审计大学-logo.svg"
|
||||||
alt="中国地质大学">
|
alt="南京审计大学">
|
||||||
</div>
|
</div>
|
||||||
<div class="home-hero__title">智慧工会</div>
|
<div class="home-hero__title">智慧工会</div>
|
||||||
<div class="home-hero__subtitle">情系职工 · 真诚服务</div>
|
<div class="home-hero__subtitle">情系职工 · 真诚服务</div>
|
||||||
@@ -765,8 +763,11 @@ const home = {
|
|||||||
width: 118px;
|
width: 118px;
|
||||||
height: 28px;
|
height: 28px;
|
||||||
display: block;
|
display: block;
|
||||||
object-fit: contain;
|
flex-shrink: 0;
|
||||||
object-position: left center;
|
/* 白底吸顶栏使用蓝色标识，复用原 Logo 的透明轮廓以保留校徽和校名字形。 */
|
||||||
|
background-color: #005bac;
|
||||||
|
-webkit-mask: url('/assets/mobile/img/home/v4/南京审计大学-logo.svg') left center / contain no-repeat;
|
||||||
|
mask: url('/assets/mobile/img/home/v4/南京审计大学-logo.svg') left center / contain no-repeat;
|
||||||
}
|
}
|
||||||
|
|
||||||
.home-summary-bar__divider {
|
.home-summary-bar__divider {
|
||||||
|
|||||||
BIN
Binary file not shown.
-1
@@ -1 +0,0 @@
|
|||||||
887dae22390914b7be8401e8ce87571d8f776eb6
|
|
||||||
-1
@@ -1 +0,0 @@
|
|||||||
71eb5eaecf2b7fd91d9dd7409a56314b9f2f132b3dffbb9e13ee56d0999b8c59
|
|
||||||
BIN
Binary file not shown.
-1
@@ -1 +0,0 @@
|
|||||||
5bc042d969b2a8fae96441b439096181eb11bbce
|
|
||||||
-1
@@ -1 +0,0 @@
|
|||||||
0d9b4629144a1fd15ed01362ce0dc2c9c5246e4f57250dd95fb52dbbbb75c532
|
|
||||||
-150
@@ -1,150 +0,0 @@
|
|||||||
<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/maven-v4_0_0.xsd">
|
|
||||||
<parent>
|
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
|
||||||
<artifactId>jetty-project</artifactId>
|
|
||||||
<version>9.4.57.v20241219</version>
|
|
||||||
</parent>
|
|
||||||
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<artifactId>jetty-client</artifactId>
|
|
||||||
<version>9.4.57.v20241219-cug-patch1</version>
|
|
||||||
<name>Jetty :: Asynchronous HTTP Client</name>
|
|
||||||
<properties>
|
|
||||||
<bundle-symbolic-name>${project.groupId}.client</bundle-symbolic-name>
|
|
||||||
<jetty.test.policy.loc>target/test-policy</jetty.test.policy.loc>
|
|
||||||
<spotbugs.onlyAnalyze>org.eclipse.client.*</spotbugs.onlyAnalyze>
|
|
||||||
</properties>
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-dependency-plugin</artifactId>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>unpack</id>
|
|
||||||
<phase>generate-test-resources</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>unpack</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<artifactItems>
|
|
||||||
<artifactItem>
|
|
||||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
|
||||||
<artifactId>jetty-test-policy</artifactId>
|
|
||||||
<version>${jetty-test-policy.version}</version>
|
|
||||||
<type>jar</type>
|
|
||||||
<overWrite>true</overWrite>
|
|
||||||
<includes>**/*.keystore,**/*.pem</includes>
|
|
||||||
<outputDirectory>${jetty.test.policy.loc}</outputDirectory>
|
|
||||||
</artifactItem>
|
|
||||||
</artifactItems>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-shade-plugin</artifactId>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<phase>package</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>shade</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<minimizeJar>true</minimizeJar>
|
|
||||||
<shadedArtifactAttached>true</shadedArtifactAttached>
|
|
||||||
<shadedClassifierName>hybrid</shadedClassifierName>
|
|
||||||
<artifactSet>
|
|
||||||
<includes>
|
|
||||||
<include>org.eclipse.jetty:jetty-http</include>
|
|
||||||
<include>org.eclipse.jetty:jetty-io</include>
|
|
||||||
<include>org.eclipse.jetty:jetty-util</include>
|
|
||||||
</includes>
|
|
||||||
</artifactSet>
|
|
||||||
<relocations>
|
|
||||||
<relocation>
|
|
||||||
<pattern>org.eclipse.jetty.http</pattern>
|
|
||||||
<shadedPattern>org.eclipse.jetty.client.shaded.http</shadedPattern>
|
|
||||||
</relocation>
|
|
||||||
<relocation>
|
|
||||||
<pattern>org.eclipse.jetty.io</pattern>
|
|
||||||
<shadedPattern>org.eclipse.jetty.client.shaded.io</shadedPattern>
|
|
||||||
</relocation>
|
|
||||||
<relocation>
|
|
||||||
<pattern>org.eclipse.jetty.util</pattern>
|
|
||||||
<shadedPattern>org.eclipse.jetty.client.shaded.util</shadedPattern>
|
|
||||||
</relocation>
|
|
||||||
</relocations>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
|
||||||
<artifactId>jetty-http</artifactId>
|
|
||||||
<version>9.4.57.v20241219-cug-patch1</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
|
||||||
<artifactId>jetty-io</artifactId>
|
|
||||||
<version>9.4.57.v20241219</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
|
||||||
<artifactId>jetty-jmx</artifactId>
|
|
||||||
<version>9.4.57.v20241219</version>
|
|
||||||
<optional>true</optional>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
|
||||||
<artifactId>jetty-server</artifactId>
|
|
||||||
<version>9.4.57.v20241219-cug-patch1</version>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
|
||||||
<artifactId>jetty-security</artifactId>
|
|
||||||
<version>9.4.57.v20241219-cug-patch1</version>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.kerby</groupId>
|
|
||||||
<artifactId>kerb-simplekdc</artifactId>
|
|
||||||
<version>2.1.0</version>
|
|
||||||
<scope>test</scope>
|
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>org.jline</groupId>
|
|
||||||
<artifactId>jline</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
|
||||||
<!-- transitive dependency defined as a range and we don't want that -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>net.minidev</groupId>
|
|
||||||
<artifactId>json-smart</artifactId>
|
|
||||||
<version>2.5.1</version>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.slf4j</groupId>
|
|
||||||
<artifactId>slf4j-simple</artifactId>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
|
||||||
<artifactId>jetty-test-helper</artifactId>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.awaitility</groupId>
|
|
||||||
<artifactId>awaitility</artifactId>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
</project>
|
|
||||||
-1
@@ -1 +0,0 @@
|
|||||||
024e0627736731cbd441931d50fcb22bf17f4cc0
|
|
||||||
-1
@@ -1 +0,0 @@
|
|||||||
989a013455688dc528a988c41514fbfece0e3354a54398af5a404cda582c94bd
|
|
||||||
BIN
Binary file not shown.
-1
@@ -1 +0,0 @@
|
|||||||
d551472980052c26105c45dc476bfe07cc23dfb5
|
|
||||||
-1
@@ -1 +0,0 @@
|
|||||||
dcfe694ef6f27d9d6268e2fb135a1c9a7aabdfa55e7d738fc8df79f573086027
|
|
||||||
BIN
Binary file not shown.
-1
@@ -1 +0,0 @@
|
|||||||
086fa31420e9a5a623cac7967b0b6de0674d93af
|
|
||||||
-1
@@ -1 +0,0 @@
|
|||||||
90058e595b73d85b96e192b7e6806098f83467680a95466974f445d6706ed682
|
|
||||||
-107
@@ -1,107 +0,0 @@
|
|||||||
<?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/maven-v4_0_0.xsd">
|
|
||||||
<parent>
|
|
||||||
<artifactId>jetty-project</artifactId>
|
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
|
||||||
<version>9.4.57.v20241219</version>
|
|
||||||
</parent>
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<artifactId>jetty-http</artifactId>
|
|
||||||
<version>9.4.57.v20241219-cug-patch1</version>
|
|
||||||
<name>Jetty :: Http Utility</name>
|
|
||||||
<properties>
|
|
||||||
<bundle-symbolic-name>${project.groupId}.http</bundle-symbolic-name>
|
|
||||||
<spotbugs.onlyAnalyze>org.eclipse.jetty.http.*</spotbugs.onlyAnalyze>
|
|
||||||
</properties>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
|
||||||
<artifactId>jetty-util</artifactId>
|
|
||||||
<version>9.4.57.v20241219</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
|
||||||
<artifactId>jetty-io</artifactId>
|
|
||||||
<version>9.4.57.v20241219</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>javax.servlet</groupId>
|
|
||||||
<artifactId>javax.servlet-api</artifactId>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
|
||||||
<artifactId>jetty-test-helper</artifactId>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.felix</groupId>
|
|
||||||
<artifactId>maven-bundle-plugin</artifactId>
|
|
||||||
<extensions>true</extensions>
|
|
||||||
<configuration>
|
|
||||||
<instructions>
|
|
||||||
<Require-Capability>osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.http.HttpFieldPreEncoder)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional</Require-Capability>
|
|
||||||
<Provide-Capability>osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.http.HttpFieldPreEncoder</Provide-Capability>
|
|
||||||
</instructions>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-jar-plugin</artifactId>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>test-jar</id>
|
|
||||||
<goals>
|
|
||||||
<goal>test-jar</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-shade-plugin</artifactId>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<phase>package</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>shade</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<finalName>${jmhjar.name}</finalName>
|
|
||||||
<shadeTestJar>true</shadeTestJar>
|
|
||||||
<artifactSet>
|
|
||||||
<includes>
|
|
||||||
<include>org.openjdk.jmh:jmh-core</include>
|
|
||||||
</includes>
|
|
||||||
</artifactSet>
|
|
||||||
<transformers>
|
|
||||||
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
|
|
||||||
<mainClass>org.openjdk.jmh.Main</mainClass>
|
|
||||||
</transformer>
|
|
||||||
</transformers>
|
|
||||||
<filters>
|
|
||||||
<filter>
|
|
||||||
<artifact>org.openjdk.jmh:jmh-core</artifact>
|
|
||||||
<includes>
|
|
||||||
<include>**</include>
|
|
||||||
</includes>
|
|
||||||
</filter>
|
|
||||||
<filter>
|
|
||||||
<artifact>*:*</artifact>
|
|
||||||
<excludes>
|
|
||||||
<exclude>META-INF/*.SF</exclude>
|
|
||||||
<exclude>META-INF/*.DSA</exclude>
|
|
||||||
<exclude>META-INF/*.RSA</exclude>
|
|
||||||
</excludes>
|
|
||||||
</filter>
|
|
||||||
</filters>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
</project>
|
|
||||||
-1
@@ -1 +0,0 @@
|
|||||||
f27754642c5b5e3b2e570669b7a1ceef613fc589
|
|
||||||
-1
@@ -1 +0,0 @@
|
|||||||
967fff3457fb62eb7485fe303cc4162edc1c02b15498c2f8401fbca263649ab8
|
|
||||||
BIN
Binary file not shown.
-1
@@ -1 +0,0 @@
|
|||||||
0f398cff4f7ab827fecb9d4f657685b973512e35
|
|
||||||
-1
@@ -1 +0,0 @@
|
|||||||
770e71875fa37effaab5c11e932b9a52c2e019236062575b0403760242b0bf08
|
|
||||||
BIN
Binary file not shown.
-1
@@ -1 +0,0 @@
|
|||||||
b01b199c670073760b66dbd5f79bbf0c3639ffc5
|
|
||||||
-1
@@ -1 +0,0 @@
|
|||||||
d757e04e165d940c019e9346c36e9bf8d1a71c8b6b196519bda4200e2a16f5d4
|
|
||||||
-89
@@ -1,89 +0,0 @@
|
|||||||
<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/maven-v4_0_0.xsd">
|
|
||||||
<parent>
|
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
|
||||||
<artifactId>jetty-project</artifactId>
|
|
||||||
<version>9.4.57.v20241219</version>
|
|
||||||
</parent>
|
|
||||||
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<artifactId>jetty-jaspi</artifactId>
|
|
||||||
<version>9.4.57.v20241219-cug-patch1</version>
|
|
||||||
<name>Jetty :: JASPI Security</name>
|
|
||||||
<description>Jetty security infrastructure</description>
|
|
||||||
|
|
||||||
<properties>
|
|
||||||
<bundle-symbolic-name>${project.groupId}.security.jaspi</bundle-symbolic-name>
|
|
||||||
<spotbugs.onlyAnalyze>org.eclipse.jetty.jaspi.*</spotbugs.onlyAnalyze>
|
|
||||||
</properties>
|
|
||||||
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.felix</groupId>
|
|
||||||
<artifactId>maven-bundle-plugin</artifactId>
|
|
||||||
<extensions>true</extensions>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<goals>
|
|
||||||
<goal>manifest</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<instructions>
|
|
||||||
<Require-Capability>osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)"</Require-Capability>
|
|
||||||
<Provide-Capability>osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.security.Authenticator$Factory</Provide-Capability>
|
|
||||||
</instructions>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
|
||||||
<artifactId>jetty-security</artifactId>
|
|
||||||
<version>9.4.57.v20241219-cug-patch1</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
|
||||||
<artifactId>jetty-test-helper</artifactId>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.eclipse.jetty.orbit</groupId>
|
|
||||||
<artifactId>javax.security.auth.message</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>javax.xml.bind</groupId>
|
|
||||||
<artifactId>jaxb-api</artifactId>
|
|
||||||
<version>2.3.1</version>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.glassfish.jaxb</groupId>
|
|
||||||
<artifactId>jaxb-runtime</artifactId>
|
|
||||||
<!-- Must stay on 3.x as 4.x is for Java 11 -->
|
|
||||||
<version>3.0.2</version>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>javax.activation</groupId>
|
|
||||||
<artifactId>javax.activation-api</artifactId>
|
|
||||||
<version>1.2.0</version>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.geronimo.components</groupId>
|
|
||||||
<artifactId>geronimo-jaspi</artifactId>
|
|
||||||
<version>2.0.0</version>
|
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>org.apache.geronimo.specs</groupId>
|
|
||||||
<artifactId>geronimo-jaspic_1.0_spec</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
</project>
|
|
||||||
-1
@@ -1 +0,0 @@
|
|||||||
7be35862967482c8ebe9615f5d5cd47230f9f1ee
|
|
||||||
-1
@@ -1 +0,0 @@
|
|||||||
8e49cd7df44f050c96d896726129fa5c9d0ac5895261cda774c8c899e617e5a6
|
|
||||||
BIN
Binary file not shown.
-1
@@ -1 +0,0 @@
|
|||||||
41dcd1e0dc8c03bf94f2419067f5330217a43468
|
|
||||||
-1
@@ -1 +0,0 @@
|
|||||||
b9ff8bf676cf5911cce7080c438d5cb96436b27d25462a671cc47b2eb6a5f322
|
|
||||||
BIN
Binary file not shown.
-1
@@ -1 +0,0 @@
|
|||||||
56e0e92f7cefb02d7c5748b480f45c063c6163ae
|
|
||||||
-1
@@ -1 +0,0 @@
|
|||||||
a89e010985a3a347c700c32a535f92f89b6c2548cabcf5e434563b2a59c37b2d
|
|
||||||
-56
@@ -1,56 +0,0 @@
|
|||||||
<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/maven-v4_0_0.xsd">
|
|
||||||
<parent>
|
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
|
||||||
<artifactId>jetty-project</artifactId>
|
|
||||||
<version>9.4.57.v20241219</version>
|
|
||||||
</parent>
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<artifactId>jetty-security</artifactId>
|
|
||||||
<version>9.4.57.v20241219-cug-patch1</version>
|
|
||||||
<name>Jetty :: Security</name>
|
|
||||||
<description>Jetty security infrastructure</description>
|
|
||||||
<properties>
|
|
||||||
<bundle-symbolic-name>${project.groupId}.security</bundle-symbolic-name>
|
|
||||||
<spotbugs.onlyAnalyze>org.eclipse.jetty.security.*</spotbugs.onlyAnalyze>
|
|
||||||
</properties>
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.felix</groupId>
|
|
||||||
<artifactId>maven-bundle-plugin</artifactId>
|
|
||||||
<extensions>true</extensions>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<goals>
|
|
||||||
<goal>manifest</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<instructions>
|
|
||||||
<Require-Capability>osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.security.Authenticator$Factory)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional</Require-Capability>
|
|
||||||
</instructions>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
|
||||||
<artifactId>jetty-server</artifactId>
|
|
||||||
<version>9.4.57.v20241219-cug-patch1</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
|
||||||
<artifactId>jetty-http</artifactId>
|
|
||||||
<version>9.4.57.v20241219-cug-patch1</version>
|
|
||||||
<classifier>tests</classifier>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
|
||||||
<artifactId>jetty-test-helper</artifactId>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
</project>
|
|
||||||
-1
@@ -1 +0,0 @@
|
|||||||
4f296e131092ecc93d76c210fd18d8133d82af7f
|
|
||||||
-1
@@ -1 +0,0 @@
|
|||||||
c2697118caa818c3f6b17bce98e60f971a56905a96b69eef9b3f34d0bcd1e729
|
|
||||||
BIN
Binary file not shown.
-1
@@ -1 +0,0 @@
|
|||||||
479360715d77a8473a1344047f56b2f5a00a80a4
|
|
||||||
-1
@@ -1 +0,0 @@
|
|||||||
e9f670a373dd91b8ce752d1cc601ffb4890a8cffe67a3fb3addca09c9b0d3405
|
|
||||||
BIN
Binary file not shown.
-1
@@ -1 +0,0 @@
|
|||||||
6d3866a9a9ec769524b2ed4009cbde3497af6b71
|
|
||||||
-1
@@ -1 +0,0 @@
|
|||||||
d2a396bd5f8f30ed1b6664e4cc07ddd0df9e1ef4a25452291f24e475890ef037
|
|
||||||
-108
@@ -1,108 +0,0 @@
|
|||||||
<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/maven-v4_0_0.xsd">
|
|
||||||
<parent>
|
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
|
||||||
<artifactId>jetty-project</artifactId>
|
|
||||||
<version>9.4.57.v20241219</version>
|
|
||||||
</parent>
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<artifactId>jetty-server</artifactId>
|
|
||||||
<version>9.4.57.v20241219-cug-patch1</version>
|
|
||||||
<name>Jetty :: Server Core</name>
|
|
||||||
<description>The core jetty server artifact.</description>
|
|
||||||
<properties>
|
|
||||||
<bundle-symbolic-name>${project.groupId}.server</bundle-symbolic-name>
|
|
||||||
<spotbugs.onlyAnalyze>org.eclipse.jetty.server.*</spotbugs.onlyAnalyze>
|
|
||||||
</properties>
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-jar-plugin</artifactId>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>test-jar</id>
|
|
||||||
<goals>
|
|
||||||
<goal>test-jar</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-resources-plugin</artifactId>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>copy-resources-keystore</id>
|
|
||||||
<phase>process-resources</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>copy-resources</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<encoding>UTF-8</encoding>
|
|
||||||
<outputDirectory>${project.build.directory}/jetty-config-files</outputDirectory>
|
|
||||||
<resources>
|
|
||||||
<resource>
|
|
||||||
<directory>src/main/config</directory>
|
|
||||||
<includes>
|
|
||||||
<include>**/**keystore**</include>
|
|
||||||
</includes>
|
|
||||||
</resource>
|
|
||||||
</resources>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>javax.servlet</groupId>
|
|
||||||
<artifactId>javax.servlet-api</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
|
||||||
<artifactId>jetty-http</artifactId>
|
|
||||||
<version>9.4.57.v20241219-cug-patch1</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
|
||||||
<artifactId>jetty-io</artifactId>
|
|
||||||
<version>9.4.57.v20241219</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
|
||||||
<artifactId>jetty-xml</artifactId>
|
|
||||||
<version>9.4.57.v20241219</version>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
|
||||||
<artifactId>jetty-jmx</artifactId>
|
|
||||||
<version>9.4.57.v20241219</version>
|
|
||||||
<optional>true</optional>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.eclipse.jetty.toolchain</groupId>
|
|
||||||
<artifactId>jetty-test-helper</artifactId>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
|
||||||
<artifactId>jetty-http</artifactId>
|
|
||||||
<version>9.4.57.v20241219-cug-patch1</version>
|
|
||||||
<classifier>tests</classifier>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
|
||||||
<artifactId>jetty-util-ajax</artifactId>
|
|
||||||
<version>9.4.57.v20241219</version>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.awaitility</groupId>
|
|
||||||
<artifactId>awaitility</artifactId>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
</project>
|
|
||||||
-1
@@ -1 +0,0 @@
|
|||||||
269449bfdbb79d75afe4c4d73973cc7f38152591
|
|
||||||
-1
@@ -1 +0,0 @@
|
|||||||
e1bf730db18ea8cd98c95bee03673b3601f34322e30e91d3cfd8210c0d7dd00c
|
|
||||||
Reference in New Issue
Block a user