Merge 2.7.9 release (#783)
* renew NOTICE
* prepare 2.7.9 release
* fix test cases order in dubbo-spring-boot-autuconfigure-compatible
* add test suite to make order
diff --git a/NOTICE b/NOTICE
index e02ff73..f6fa147 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache Dubbo
-Copyright 2018-2020 The Apache Software Foundation
+Copyright 2018-2021 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
diff --git a/dubbo-spring-boot-compatible/autoconfigure/src/test/java/org/apache/dubbo/spring/boot/TestSuite.java b/dubbo-spring-boot-compatible/autoconfigure/src/test/java/org/apache/dubbo/spring/boot/TestSuite.java
new file mode 100644
index 0000000..f9106b9
--- /dev/null
+++ b/dubbo-spring-boot-compatible/autoconfigure/src/test/java/org/apache/dubbo/spring/boot/TestSuite.java
@@ -0,0 +1,53 @@
+/*
+ * 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.
+ */
+package org.apache.dubbo.spring.boot;
+
+import org.apache.dubbo.spring.boot.autoconfigure.CompatibleDubboAutoConfigurationTest;
+import org.apache.dubbo.spring.boot.autoconfigure.CompatibleDubboAutoConfigurationTestWithoutProperties;
+import org.apache.dubbo.spring.boot.autoconfigure.DubboAutoConfigurationOnMultipleConfigTest;
+import org.apache.dubbo.spring.boot.autoconfigure.DubboAutoConfigurationOnSingleConfigTest;
+import org.apache.dubbo.spring.boot.autoconfigure.RelaxedDubboConfigBinderTest;
+import org.apache.dubbo.spring.boot.context.event.AwaitingNonWebApplicationListenerTest;
+import org.apache.dubbo.spring.boot.context.event.DubboConfigBeanDefinitionConflictApplicationListenerTest;
+import org.apache.dubbo.spring.boot.context.event.OverrideDubboConfigApplicationListenerDisableTest;
+import org.apache.dubbo.spring.boot.context.event.OverrideDubboConfigApplicationListenerTest;
+import org.apache.dubbo.spring.boot.context.event.WelcomeLogoApplicationListenerTest;
+import org.apache.dubbo.spring.boot.env.DubboDefaultPropertiesEnvironmentPostProcessorTest;
+import org.apache.dubbo.spring.boot.util.DubboUtilsTest;
+import org.apache.dubbo.spring.boot.util.EnvironmentUtilsTest;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+ CompatibleDubboAutoConfigurationTest.class,
+ CompatibleDubboAutoConfigurationTestWithoutProperties.class,
+ DubboAutoConfigurationOnMultipleConfigTest.class,
+ DubboAutoConfigurationOnSingleConfigTest.class,
+ RelaxedDubboConfigBinderTest.class,
+ AwaitingNonWebApplicationListenerTest.class,
+ DubboConfigBeanDefinitionConflictApplicationListenerTest.class,
+ OverrideDubboConfigApplicationListenerDisableTest.class,
+ OverrideDubboConfigApplicationListenerTest.class,
+ WelcomeLogoApplicationListenerTest.class,
+ DubboDefaultPropertiesEnvironmentPostProcessorTest.class,
+ DubboUtilsTest.class,
+ EnvironmentUtilsTest.class
+})
+public class TestSuite {
+}
diff --git a/dubbo-spring-boot-compatible/autoconfigure/src/test/java/org/apache/dubbo/spring/boot/context/event/OverrideDubboConfigApplicationListenerTest.java b/dubbo-spring-boot-compatible/autoconfigure/src/test/java/org/apache/dubbo/spring/boot/context/event/OverrideDubboConfigApplicationListenerTest.java
index 87ee1c3..eb1e0aa 100644
--- a/dubbo-spring-boot-compatible/autoconfigure/src/test/java/org/apache/dubbo/spring/boot/context/event/OverrideDubboConfigApplicationListenerTest.java
+++ b/dubbo-spring-boot-compatible/autoconfigure/src/test/java/org/apache/dubbo/spring/boot/context/event/OverrideDubboConfigApplicationListenerTest.java
@@ -25,6 +25,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringRunner;
@@ -47,6 +48,7 @@
@SpringBootTest(
classes = {OverrideDubboConfigApplicationListener.class}
)
+@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD)
public class OverrideDubboConfigApplicationListenerTest {
@BeforeClass
@@ -62,7 +64,6 @@
@Test
public void testOnApplicationEvent() {
-
Properties properties = ConfigUtils.getProperties();
Assert.assertEquals("dubbo-demo-application", properties.get("dubbo.application.name"));
diff --git a/pom.xml b/pom.xml
index 59ad031..1018482 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
<properties>
<maven_javadoc_version>3.0.1</maven_javadoc_version>
<maven_surefire_version>2.19.1</maven_surefire_version>
- <revision>2.7.9-SNAPSHOT</revision>
+ <revision>2.7.9</revision>
</properties>
<modules>
