You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shenyu.apache.org by sa...@apache.org on 2021/07/30 12:52:32 UTC
[incubator-shenyu] branch master updated: fix license issues (#1836)
This is an automated email from the ASF dual-hosted git repository.
sabersola pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new 2cc9d95 fix license issues (#1836)
2cc9d95 is described below
commit 2cc9d956236f0b651b569ed6e6928248b745dbe4
Author: Zhang Yonglun <zh...@apache.org>
AuthorDate: Fri Jul 30 20:52:26 2021 +0800
fix license issues (#1836)
---
pom.xml | 2 +-
.../shenyu/admin/utils/ThreadLocalUtilTest.java | 53 ----------------------
.../shenyu-src-dist/src/main/assembly/source.xml | 2 +
3 files changed, 3 insertions(+), 54 deletions(-)
diff --git a/pom.xml b/pom.xml
index 571aced..a45f1c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,7 +126,7 @@
<spring-security.version>5.3.10.RELEASE</spring-security.version>
<!--maven plugin version-->
<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
- <apache-rat-plugin.version>0.12</apache-rat-plugin.version>
+ <apache-rat-plugin.version>0.13</apache-rat-plugin.version>
<jacoco-maven-plugin.version>0.8.5</jacoco-maven-plugin.version>
<nexus-staging-maven-plugin.version>1.6.3</nexus-staging-maven-plugin.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
diff --git a/shenyu-admin/src/test/java/org/apache/shenyu/admin/utils/ThreadLocalUtilTest.java b/shenyu-admin/src/test/java/org/apache/shenyu/admin/utils/ThreadLocalUtilTest.java
deleted file mode 100644
index fb3929a..0000000
--- a/shenyu-admin/src/test/java/org/apache/shenyu/admin/utils/ThreadLocalUtilTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2007-present the original author or authors.
- *
- * 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 org.apache.shenyu.admin.utils;
-
-import org.junit.Test;
-
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.assertThat;
-
-public class ThreadLocalUtilTest {
-
- @Test
- public void testPutValue() {
- ThreadLocalUtil.put("threadKey", "threadValue");
- assertThat("threadValue", is(ThreadLocalUtil.get("threadKey")));
- }
-
- @Test
- public void testGetValue() {
- ThreadLocalUtil.put("threadKey", "threadValue");
- assertThat("threadValue", is(ThreadLocalUtil.get("threadKey")));
- }
-
- @Test
- public void testRemove() {
- ThreadLocalUtil.put("threadKey", "threadValue");
- assertThat("threadValue", is(ThreadLocalUtil.get("threadKey")));
- ThreadLocalUtil.remove("threadKey");
- assertThat(ThreadLocalUtil.get("threadKey"), nullValue());
- }
-
- @Test
- public void testClear() {
- ThreadLocalUtil.put("threadValue", "threadValue");
- ThreadLocalUtil.clear();
- assertThat(ThreadLocalUtil.get("threadLocalKey"), nullValue());
- }
-}
diff --git a/shenyu-dist/shenyu-src-dist/src/main/assembly/source.xml b/shenyu-dist/shenyu-src-dist/src/main/assembly/source.xml
index df02b58..1abf11f 100644
--- a/shenyu-dist/shenyu-src-dist/src/main/assembly/source.xml
+++ b/shenyu-dist/shenyu-src-dist/src/main/assembly/source.xml
@@ -79,6 +79,8 @@
<!-- modules ignore -->
<exclude>shenyu-integrated-test/**</exclude>
<exclude>shenyu-examples/**</exclude>
+ <exclude>shenyu-admin/src/main/resources/static/*.css</exclude>
+ <exclude>shenyu-admin/src/main/resources/static/*.js</exclude>
</excludes>
</fileSet>
</fileSets>