Skip to content

Commit 23a1f4c

Browse files
TommyLemonTommyLemon
committed
Java：所有 Demo 升级 APIJSON 6.0.0, apijson-framework 6.0.0, apijson-column 1.5.0，移除不再需要的 javax.activation 依赖
1 parent 9262bc5 commit 23a1f4c

File tree

51 files changed

+113
-279
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+113
-279
lines changed

‎APIJSON-Java-Server/APIJSONBoot-BigData/libs/APIJSON-5.4.0.jar

-205 KB
Binary file not shown.

‎APIJSON-Java-Server/APIJSONBoot-BigData/libs/APIJSON-6.0.0.jar

218 KB
Binary file not shown.

‎APIJSON-Java-Server/APIJSONBoot-MultiDataSource/libs/apijson-column-1.2.9.jar renamed to ‎APIJSON-Java-Server/APIJSONBoot-BigData/libs/apijson-column-1.5.0.jar

5.39 KB
Binary file not shown.

‎APIJSON-Java-Server/APIJSONBoot-BigData/libs/apijson-framework-5.4.0.jar

-2.28 KB
Binary file not shown.

‎APIJSON-Java-Server/APIJSONBoot-BigData/libs/apijson-framework-6.0.0.jar

42.7 KB
Binary file not shown.

‎APIJSON-Java-Server/APIJSONBoot-BigData/pom.xml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>apijson.boot</groupId>
77
<artifactId>apijson-boot</artifactId>
8-
<version>5.4.0</version>
8+
<version>6.0.0</version>
99
<packaging>jar</packaging>
1010

1111
<name>APIJSONBoot-BigData</name>
@@ -18,13 +18,6 @@
1818
</properties>
1919

2020
<dependencies>
21-
<!-- JDK 11+ 需要，否则启动报错 NoClassDefFoundError: javax/activation/UnsupportedDataTypeException -->
22-
<dependency>
23-
<groupId>javax.activation</groupId>
24-
<artifactId>activation</artifactId>
25-
<version>1.1.1</version>
26-
</dependency>
27-
2821
<!-- APIJSON 需要用的依赖库，1.2.0 以上 -->
2922
<dependency>
3023
<groupId>com.alibaba</groupId>
@@ -62,17 +55,17 @@
6255
<dependency>
6356
<groupId>com.github.Tencent</groupId>
6457
<artifactId>APIJSON</artifactId>
65-
<version>5.4.0</version>
58+
<version>6.0.0</version>
6659
</dependency>
6760
<dependency>
6861
<groupId>com.github.APIJSON</groupId>
6962
<artifactId>apijson-framework</artifactId>
70-
<version>5.4.0</version>
63+
<version>6.0.0</version>
7164
</dependency>
7265
<dependency>
7366
<groupId>com.github.APIJSON</groupId>
7467
<artifactId>apijson-column</artifactId>
75-
<version>1.2.9</version>
68+
<version>1.5.0</version>
7669
</dependency>
7770
<!-- 可使用 libs 目录的 apijson-orm.jar, apijson-framework.jar, apijson-column.jar 来替代，两种方式二选一 >>>>>>>>>> -->
7871

‎APIJSON-Java-Server/APIJSONBoot-MultiDataSource/libs/APIJSON-5.4.0.jar

-205 KB
Binary file not shown.

‎APIJSON-Java-Server/APIJSONBoot-MultiDataSource/libs/APIJSON-6.0.0.jar

218 KB
Binary file not shown.

‎APIJSON-Java-Server/APIJSONBoot-BigData/libs/apijson-column-1.2.9.jar renamed to ‎APIJSON-Java-Server/APIJSONBoot-MultiDataSource/libs/apijson-column-1.5.0.jar

5.39 KB
Binary file not shown.

‎APIJSON-Java-Server/APIJSONBoot-MultiDataSource/libs/apijson-framework-5.4.0.jar

-2.28 KB
Binary file not shown.

‎APIJSON-Java-Server/APIJSONBoot-MultiDataSource/libs/apijson-framework-6.0.0.jar

42.7 KB
Binary file not shown.

‎APIJSON-Java-Server/APIJSONBoot-MultiDataSource/libs/apijson-router-1.1.0.jar renamed to ‎APIJSON-Java-Server/APIJSONBoot-MultiDataSource/libs/apijson-router-1.5.0.jar

13.4 KB
Binary file not shown.

‎APIJSON-Java-Server/APIJSONBoot/libs/APIJSON-5.4.0.jar

-205 KB
Binary file not shown.

‎APIJSON-Java-Server/APIJSONBoot/libs/APIJSON-6.0.0.jar

218 KB
Binary file not shown.

‎APIJSON-Java-Server/APIJSONBoot/libs/apijson-column-1.2.9.jar renamed to ‎APIJSON-Java-Server/APIJSONBoot/libs/apijson-column-1.5.0.jar

5.39 KB
Binary file not shown.

‎APIJSON-Java-Server/APIJSONBoot/libs/apijson-framework-5.4.0.jar

-2.28 KB
Binary file not shown.

‎APIJSON-Java-Server/APIJSONBoot/libs/apijson-framework-6.0.0.jar

42.7 KB
Binary file not shown.

‎APIJSON-Java-Server/APIJSONBoot/pom.xml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>apijson.boot</groupId>
77
<artifactId>apijson-boot</artifactId>
8-
<version>5.4.0</version>
8+
<version>6.0.0</version>
99
<packaging>jar</packaging>
1010

1111
<name>APIJSONBoot</name>
@@ -18,13 +18,6 @@
1818
</properties>
1919

2020
<dependencies>
21-
<!-- JDK 11+ 需要，否则启动报错 NoClassDefFoundError: javax/activation/UnsupportedDataTypeException -->
22-
<dependency>
23-
<groupId>javax.activation</groupId>
24-
<artifactId>activation</artifactId>
25-
<version>1.1.1</version>
26-
</dependency>
27-
2821
<!-- APIJSON 需要用的依赖库，1.2.0 以上 -->
2922
<dependency>
3023
<groupId>com.alibaba</groupId>
@@ -62,17 +55,17 @@
6255
<dependency>
6356
<groupId>com.github.Tencent</groupId>
6457
<artifactId>APIJSON</artifactId>
65-
<version>5.4.0</version>
58+
<version>6.0.0</version>
6659
</dependency>
6760
<dependency>
6861
<groupId>com.github.APIJSON</groupId>
6962
<artifactId>apijson-framework</artifactId>
70-
<version>5.4.0</version>
63+
<version>6.0.0</version>
7164
</dependency>
7265
<dependency>
7366
<groupId>com.github.APIJSON</groupId>
7467
<artifactId>apijson-column</artifactId>
75-
<version>1.2.9</version>
68+
<version>1.5.0</version>
7669
</dependency>
7770
<!-- 可使用 libs 目录的 apijson-orm.jar, apijson-framework.jar, apijson-column.jar 来替代，两种方式二选一 >>>>>>>>>> -->
7871

‎APIJSON-Java-Server/APIJSONDemo-ClickHouse/pom.xml

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>apijson.demo</groupId>
77
<artifactId>apijson-demo</artifactId>
8-
<version>5.4.0</version>
8+
<version>6.0.0</version>
99

1010
<name>APIJSONDemo-ClickHouse</name>
1111
<description>Demo project for testing APIJSON server based on SpringBoot</description>
@@ -17,25 +17,18 @@
1717
</properties>
1818

1919
<dependencies>
20-
<!-- JDK 11+ 需要，否则启动报错 NoClassDefFoundError: javax/activation/UnsupportedDataTypeException -->
21-
<dependency>
22-
<groupId>javax.activation</groupId>
23-
<artifactId>activation</artifactId>
24-
<version>1.1.1</version>
25-
</dependency>
26-
2720
<!-- 需要的 APIJSON 相关依赖 -->
2821
<dependency>
2922
<groupId>com.github.Tencent</groupId>
3023
<artifactId>APIJSON</artifactId>
31-
<version>5.4.0</version>
24+
<version>6.0.0</version>
3225
</dependency>
33-
<dependency>
34-
<groupId>com.github.APIJSON</groupId>
35-
<artifactId>apijson-framework</artifactId>
36-
<version>5.4.0</version>
37-
</dependency>
38-
26+
<dependency>
27+
<groupId>com.github.APIJSON</groupId>
28+
<artifactId>apijson-framework</artifactId>
29+
<version>6.0.0</version>
30+
</dependency>
31+
3932
<!-- 需要用的数据库 JDBC 驱动 -->
4033
<dependency>
4134
<groupId>cc.blynk.clickhouse</groupId>

‎APIJSON-Java-Server/APIJSONDemo-ClickHouse/src/main/java/apijson/demo/DemoApplication.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
*/
4242
@Configuration
4343
@SpringBootApplication
44-
@EnableAutoConfiguration
4544
@EnableConfigurationProperties
4645
public class DemoApplication implements WebServerFactoryCustomizer<ConfigurableServletWebServerFactory> {
4746
public static final String TAG = "DemoApplication";

‎APIJSON-Java-Server/APIJSONDemo-Druid/pom.xml

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>apijson.demo</groupId>
77
<artifactId>apijson-demo-druid</artifactId>
8-
<version>5.4.0</version>
8+
<version>6.0.0</version>
99
<packaging>jar</packaging>
1010

1111
<name>APIJSONDemo-Druid</name>
@@ -18,19 +18,17 @@
1818
</properties>
1919

2020
<dependencies>
21-
<!-- JDK 11+ 需要，否则启动报错 NoClassDefFoundError: javax/activation/UnsupportedDataTypeException -->
22-
<dependency>
23-
<groupId>javax.activation</groupId>
24-
<artifactId>activation</artifactId>
25-
<version>1.1.1</version>
26-
</dependency>
27-
2821
<!-- 需要的 APIJSON 相关依赖 -->
29-
<dependency>
30-
<groupId>com.github.APIJSON</groupId>
31-
<artifactId>apijson-framework</artifactId>
32-
<version>5.4.0</version>
33-
</dependency>
22+
<dependency>
23+
<groupId>com.github.Tencent</groupId>
24+
<artifactId>APIJSON</artifactId>
25+
<version>6.0.0</version>
26+
</dependency>
27+
<dependency>
28+
<groupId>com.github.APIJSON</groupId>
29+
<artifactId>apijson-framework</artifactId>
30+
<version>6.0.0</version>
31+
</dependency>
3432

3533
<!-- 需要用的数据库 JDBC 驱动 -->
3634
<dependency>

‎APIJSON-Java-Server/APIJSONDemo-Druid/src/main/java/apijson/demo/DemoApplication.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
*/
4242
@Configuration
4343
@SpringBootApplication
44-
@EnableAutoConfiguration
4544
@EnableConfigurationProperties
4645
public class DemoApplication implements WebServerFactoryCustomizer<ConfigurableServletWebServerFactory> {
4746

‎APIJSON-Java-Server/APIJSONDemo-Elasticsearch/pom.xml

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>apijson.demo</groupId>
77
<artifactId>apijson-demo</artifactId>
8-
<version>5.4.0</version>
8+
<version>6.0.0</version>
99

1010
<name>APIJSONDemo-Elasticsearch</name>
1111
<description>Demo project for testing APIJSON server based on SpringBoot</description>
@@ -17,24 +17,17 @@
1717
</properties>
1818

1919
<dependencies>
20-
<!-- JDK 11+ 需要，否则启动报错 NoClassDefFoundError: javax/activation/UnsupportedDataTypeException -->
21-
<dependency>
22-
<groupId>javax.activation</groupId>
23-
<artifactId>activation</artifactId>
24-
<version>1.1.1</version>
25-
</dependency>
26-
2720
<!-- 需要的 APIJSON 相关依赖 -->
2821
<dependency>
2922
<groupId>com.github.Tencent</groupId>
3023
<artifactId>APIJSON</artifactId>
31-
<version>5.4.0</version>
24+
<version>6.0.0</version>
25+
</dependency>
26+
<dependency>
27+
<groupId>com.github.APIJSON</groupId>
28+
<artifactId>apijson-framework</artifactId>
29+
<version>6.0.0</version>
3230
</dependency>
33-
<dependency>
34-
<groupId>com.github.APIJSON</groupId>
35-
<artifactId>apijson-framework</artifactId>
36-
<version>5.4.0</version>
37-
</dependency>
3831

3932
<!-- 需要用的数据库 JDBC 驱动 -->
4033
<dependency>

‎APIJSON-Java-Server/APIJSONDemo-Elasticsearch/src/main/java/apijson/demo/DemoApplication.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
*/
4242
@Configuration
4343
@SpringBootApplication
44-
@EnableAutoConfiguration
4544
@EnableConfigurationProperties
4645
public class DemoApplication implements WebServerFactoryCustomizer<ConfigurableServletWebServerFactory> {
4746
public static final String TAG = "DemoApplication";

‎APIJSON-Java-Server/APIJSONDemo-Hadoop/pom.xml

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>apijson.demo</groupId>
77
<artifactId>apijson-demo</artifactId>
8-
<version>5.4.0</version>
8+
<version>6.0.0</version>
99

1010
<name>APIJSONDemo-Hadoop</name>
1111
<description>Demo project for testing APIJSON server based on SpringBoot</description>
@@ -17,24 +17,17 @@
1717
</properties>
1818

1919
<dependencies>
20-
<!-- JDK 11+ 需要，否则启动报错 NoClassDefFoundError: javax/activation/UnsupportedDataTypeException -->
21-
<dependency>
22-
<groupId>javax.activation</groupId>
23-
<artifactId>activation</artifactId>
24-
<version>1.1.1</version>
25-
</dependency>
26-
2720
<!-- 需要的 APIJSON 相关依赖 -->
2821
<dependency>
2922
<groupId>com.github.Tencent</groupId>
3023
<artifactId>APIJSON</artifactId>
31-
<version>5.4.0</version>
24+
<version>6.0.0</version>
25+
</dependency>
26+
<dependency>
27+
<groupId>com.github.APIJSON</groupId>
28+
<artifactId>apijson-framework</artifactId>
29+
<version>6.0.0</version>
3230
</dependency>
33-
<dependency>
34-
<groupId>com.github.APIJSON</groupId>
35-
<artifactId>apijson-framework</artifactId>
36-
<version>5.4.0</version>
37-
</dependency>
3831

3932
<!-- 需要用的数据库 JDBC 驱动 -->
4033
<dependency>

‎APIJSON-Java-Server/APIJSONDemo-Hadoop/src/main/java/apijson/demo/DemoApplication.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
*/
4343
@Configuration
4444
@SpringBootApplication
45-
@EnableAutoConfiguration
4645
@EnableConfigurationProperties
4746
public class DemoApplication implements WebServerFactoryCustomizer<ConfigurableServletWebServerFactory> {
4847
public static final String TAG = "DemoApplication";

‎APIJSON-Java-Server/APIJSONDemo-HikariCP/pom.xml

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>apijson.demo</groupId>
77
<artifactId>apijson-demo-hikaricp</artifactId>
8-
<version>5.4.0</version>
8+
<version>6.0.0</version>
99
<packaging>jar</packaging>
1010

1111
<name>APIJSONDemo</name>
@@ -18,19 +18,17 @@
1818
</properties>
1919

2020
<dependencies>
21-
<!-- JDK 11+ 需要，否则启动报错 NoClassDefFoundError: javax/activation/UnsupportedDataTypeException -->
22-
<dependency>
23-
<groupId>javax.activation</groupId>
24-
<artifactId>activation</artifactId>
25-
<version>1.1.1</version>
26-
</dependency>
27-
2821
<!-- 需要的 APIJSON 相关依赖 -->
29-
<dependency>
30-
<groupId>com.github.APIJSON</groupId>
31-
<artifactId>apijson-framework</artifactId>
32-
<version>5.4.0</version>
33-
</dependency>
22+
<dependency>
23+
<groupId>com.github.Tencent</groupId>
24+
<artifactId>APIJSON</artifactId>
25+
<version>6.0.0</version>
26+
</dependency>
27+
<dependency>
28+
<groupId>com.github.APIJSON</groupId>
29+
<artifactId>apijson-framework</artifactId>
30+
<version>6.0.0</version>
31+
</dependency>
3432

3533
<!-- 需要用的数据库 JDBC 驱动 -->
3634
<dependency>

‎APIJSON-Java-Server/APIJSONDemo-HikariCP/src/main/java/apijson/demo/DemoApplication.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
*/
4242
@Configuration
4343
@SpringBootApplication
44-
@EnableAutoConfiguration
4544
@EnableConfigurationProperties
4645
public class DemoApplication implements WebServerFactoryCustomizer<ConfigurableServletWebServerFactory> {
4746

‎APIJSON-Java-Server/APIJSONDemo-MultiDataSource-Elasticsearch/pom.xml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</parent>
1010
<groupId>apijson.demo</groupId>
1111
<artifactId>apijsondemo-multidatasource-elasticsearch</artifactId>
12-
<version>5.5.0</version>
12+
<version>6.0.0</version>
1313

1414
<name>apijsondemo-multidatasource-elasticsearch</name>
1515
<description>Demo project for testing APIJSON server based on SpringBoot</description>
@@ -33,7 +33,7 @@
3333
<commons.codec.version>1.10</commons.codec.version>
3434
<commons-collections4.version>4.4</commons-collections4.version>
3535
<commons.configuration.version>1.10</commons.configuration.version>
36-
<apijson.version>5.5.0</apijson.version>
36+
<apijson.version>6.0.0</apijson.version>
3737
<mysql.version>8.0.31</mysql.version>
3838
<spring-context-support.version>5.3.18</spring-context-support.version>
3939
<spring-boot-configuration-processor.version>2.6.6</spring-boot-configuration-processor.version>
@@ -42,13 +42,6 @@
4242
</properties>
4343

4444
<dependencies>
45-
<!-- JDK 11+ 需要，否则启动报错 NoClassDefFoundError: javax/activation/UnsupportedDataTypeException -->
46-
<dependency>
47-
<groupId>javax.activation</groupId>
48-
<artifactId>activation</artifactId>
49-
<version>1.1.1</version>
50-
</dependency>
51-
5245
<!-- 需要的 APIJSON 相关依赖 -->
5346
<dependency>
5447
<groupId>com.github.Tencent</groupId>

‎APIJSON-Java-Server/APIJSONDemo-MultiDataSource-Elasticsearch/src/main/java/apijson/demo/DemoApplication.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
*/
4646
@Configuration
4747
@SpringBootApplication
48-
@EnableAutoConfiguration
4948
@EnableConfigurationProperties
5049
public class DemoApplication implements WebServerFactoryCustomizer<ConfigurableServletWebServerFactory> {
5150
public static final String TAG = "DemoApplication";

‎APIJSON-Java-Server/APIJSONDemo-MultiDataSource-Kafka/pom.xml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</parent>
1010
<groupId>apijson.demo</groupId>
1111
<artifactId>apijsondemo-multidatasource-kafka</artifactId>
12-
<version>5.4.0</version>
12+
<version>6.0.0</version>
1313

1414
<name>apijsondemo-multidatasource-kafka</name>
1515
<description>Demo project for testing APIJSON server based on SpringBoot</description>
@@ -32,7 +32,7 @@
3232
<commons.codec.version>1.10</commons.codec.version>
3333
<commons-collections4.version>4.4</commons-collections4.version>
3434
<commons.configuration.version>1.10</commons.configuration.version>
35-
<apijson.version>5.4.0</apijson.version>
35+
<apijson.version>6.0.0</apijson.version>
3636
<mysql.version>8.0.31</mysql.version>
3737
<spring-context-support.version>5.3.18</spring-context-support.version>
3838
<spring-boot-configuration-processor.version>2.6.6</spring-boot-configuration-processor.version>
@@ -42,13 +42,6 @@
4242
</properties>
4343

4444
<dependencies>
45-
<!-- JDK 11+ 需要，否则启动报错 NoClassDefFoundError: javax/activation/UnsupportedDataTypeException -->
46-
<dependency>
47-
<groupId>javax.activation</groupId>
48-
<artifactId>activation</artifactId>
49-
<version>1.1.1</version>
50-
</dependency>
51-
5245
<!-- 需要的 APIJSON 相关依赖 -->
5346
<dependency>
5447
<groupId>com.github.Tencent</groupId>

0 commit comments

Comments
 (0)