Skip to content

Commit bbd05b4

Browse files
junphinejunphine
committed
home
2 parents 28108cd + 27d73b0 commit bbd05b4

84 files changed

Lines changed: 2122 additions & 10463 deletions

File tree

Some content is hidden

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

‎.idea/inspectionProfiles/Project_Default.xml‎

Lines changed: 1 addition & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎modules/calcite/pom.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,20 @@
268268

269269
<build>
270270
<plugins>
271+
<plugin>
272+
<groupId>org.apache.maven.plugins</groupId>
273+
<artifactId>maven-compiler-plugin</artifactId>
274+
<configuration>
275+
<encoding>${project.build.sourceEncoding}</encoding>
276+
<annotationProcessorPaths combine.children="append">
277+
<path>
278+
<groupId>org.immutables</groupId>
279+
<artifactId>value</artifactId>
280+
<version>${immutables.version}</version>
281+
</path>
282+
</annotationProcessorPaths>
283+
</configuration>
284+
</plugin>
271285
<plugin>
272286
<groupId>org.apache.maven.plugins</groupId>
273287
<artifactId>maven-deploy-plugin</artifactId>

‎modules/core/src/test/java/org/apache/ignite/internal/IgniteClientConnectAfterCommunicationFailureTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,16 +70,16 @@ public void testClientThreadsSuspended() throws Exception {
7070

7171
for (Thread thread : Thread.getAllStackTraces().keySet()) {
7272
if (thread.getName().contains("%client%")) {
73-
thread.suspend();
73+
//--thread.suspend();
7474
blockedAnything = true;
7575
}
7676
}
7777

7878
Thread.sleep(10000);
7979

8080
for (Thread thread : Thread.getAllStackTraces().keySet()) {
81-
if (thread.getName().contains("%client%"))
82-
thread.resume();
81+
//if (thread.getName().contains("%client%"))
82+
//--thread.resume();
8383
}
8484

8585
for (int j = 0; j < 10; j++) {

‎modules/core/src/test/java/org/apache/ignite/platform/PlatformThreadUtils.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public static void suspend(String name) {
3030
for (Thread thread : Thread.getAllStackTraces().keySet()) {
3131
if (thread.getName().contains(name)) {
3232
//noinspection CallToThreadStopSuspendOrResumeManager,deprecation
33-
thread.suspend();
33+
//--thread.suspend();
3434
}
3535
}
3636
}
@@ -44,7 +44,7 @@ public static void resume(String name) {
4444
for (Thread thread : Thread.getAllStackTraces().keySet()) {
4545
if (thread.getName().contains(name)) {
4646
//noinspection CallToThreadStopSuspendOrResumeManager,deprecation
47-
thread.resume();
47+
//--thread.resume();
4848
}
4949
}
5050
}

‎modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2656,8 +2656,8 @@ public void pauseAll(boolean suspend) {
26562656
pauseResumeOperation(true, openSockLock, writeLock);
26572657

26582658
if (suspend) {
2659-
for (Thread t : impl.threads())
2660-
t.suspend();
2659+
//--for (Thread t : impl.threads())
2660+
//--t.suspend();
26612661
}
26622662
}
26632663

@@ -2667,8 +2667,8 @@ public void pauseAll(boolean suspend) {
26672667
public void resumeAll() {
26682668
pauseResumeOperation(false, openSockLock, writeLock);
26692669

2670-
for (IgniteSpiThread t : impl.threads())
2671-
t.resume();
2670+
//for (IgniteSpiThread t : impl.threads())
2671+
//--t.resume();
26722672
}
26732673

26742674
/** {@inheritDoc} */

‎modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryNetworkIssuesTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -467,13 +467,13 @@ private void simulateFailureOfTwoNodes(boolean sequentionally) throws Exception
467467
else
468468
failedNodes.add(4);
469469

470-
failedNodes.forEach(idx -> processNetworkThreads(ignite(idx), Thread::suspend));
470+
//-failedNodes.forEach(idx -> processNetworkThreads(ignite(idx), Thread::suspend));
471471

472472
try {
473473
failLatch.await(10, TimeUnit.SECONDS);
474474
}
475475
finally {
476-
failedNodes.forEach(idx -> processNetworkThreads(ignite(idx), Thread::resume));
476+
//-failedNodes.forEach(idx -> processNetworkThreads(ignite(idx), Thread::resume));
477477
}
478478

479479
for (int i = 0; i < gridCnt; i++) {

‎modules/vertx-rest/pom.xml‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@
3434

3535
<url>http://ignite.apache.org</url>
3636

37-
<properties>
37+
<properties>
38+
<maven.compiler.proc>full</maven.compiler.proc>
3839
<vertx.version>4.4.5</vertx.version>
3940
<jmail.version>1.6.7</jmail.version>
4041
<hutool.version>5.7.11</hutool.version>
@@ -207,7 +208,20 @@
207208
</dependencies>
208209

209210
<build>
210-
<plugins>
211+
<plugins>
212+
<plugin>
213+
<groupId>org.apache.maven.plugins</groupId>
214+
<artifactId>maven-compiler-plugin</artifactId>
215+
<configuration>
216+
<annotationProcessorPaths>
217+
<path>
218+
<groupId>org.projectlombok</groupId>
219+
<artifactId>lombok</artifactId>
220+
<version>1.18.42</version> <!-- 使用实际版本号 -->
221+
</path>
222+
</annotationProcessorPaths>
223+
</configuration>
224+
</plugin>
211225
<plugin>
212226
<groupId>org.apache.maven.plugins</groupId>
213227
<artifactId>maven-deploy-plugin</artifactId>

‎modules/vertx-rest/src/main/java/io/vertx/webmvc/creater/WebApiCreater.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ public void start(Promise<Void> startPromise) {
153153

154154
String staticDirs = getProperty("spring.web.resources.static-locations");
155155

156-
HttpServer server = vertx.createHttpServer(options);
156+
server = vertx.createHttpServer(options);
157157
router = Router.router(vertx);
158158
router.route().handler(BodyHandler.create());
159159
router.route().last().failureHandler(ErrorHandler.create(vertx));

‎parent-internal/pom.xml‎

Lines changed: 1 addition & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -90,103 +90,10 @@
9090
<execution>
9191
<id>flatten</id>
9292
<inherited>false</inherited>
93-
<phase/>
93+
<phase></phase>
9494
</execution>
9595
</executions>
9696
</plugin>
9797
</plugins>
9898
</build>
99-
100-
<profiles>
101-
<profile>
102-
<id>m2e</id>
103-
<!--This profile is activated when eclipse interacts with maven (using m2e).-->
104-
<activation>
105-
<property>
106-
<name>m2e.version</name>
107-
</property>
108-
</activation>
109-
<build>
110-
<plugins>
111-
<plugin>
112-
<!--eclipse do not support duplicated package-info.java, in both src and test.-->
113-
<artifactId>maven-compiler-plugin</artifactId>
114-
<executions>
115-
<execution>
116-
<id>default-testCompile</id>
117-
<phase>test-compile</phase>
118-
<configuration>
119-
<testExcludes>
120-
<exclude>**/package-info.java</exclude>
121-
</testExcludes>
122-
</configuration>
123-
<goals>
124-
<goal>testCompile</goal>
125-
</goals>
126-
</execution>
127-
</executions>
128-
</plugin>
129-
</plugins>
130-
<pluginManagement>
131-
<plugins>
132-
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on
133-
the Maven build itself.-->
134-
<plugin>
135-
<groupId>org.eclipse.m2e</groupId>
136-
<artifactId>lifecycle-mapping</artifactId>
137-
<version>1.0.0</version>
138-
<configuration>
139-
<lifecycleMappingMetadata>
140-
<pluginExecutions>
141-
<pluginExecution>
142-
<pluginExecutionFilter>
143-
<groupId>org.apache.maven.plugins</groupId>
144-
<artifactId>maven-antrun-plugin</artifactId>
145-
<versionRange>[1.7,)</versionRange>
146-
<goals>
147-
<goal>run</goal>
148-
<goal>properties-augmentation</goal>
149-
<goal>licenses-file-rename</goal>
150-
</goals>
151-
</pluginExecutionFilter>
152-
<action>
153-
<ignore/>
154-
</action>
155-
</pluginExecution>
156-
<pluginExecution>
157-
<pluginExecutionFilter>
158-
<groupId>org.codehaus.mojo</groupId>
159-
<artifactId>flatten-maven-plugin</artifactId>
160-
<versionRange>[1.3.2,)</versionRange>
161-
<goals>
162-
<goal>flatten</goal>
163-
</goals>
164-
</pluginExecutionFilter>
165-
<action>
166-
<ignore/>
167-
</action>
168-
</pluginExecution>
169-
<pluginExecution>
170-
<pluginExecutionFilter>
171-
<groupId>org.codehaus.mojo</groupId>
172-
<artifactId>exec-maven-plugin</artifactId>
173-
<versionRange>[1.3.2,)</versionRange>
174-
<goals>
175-
<goal>java</goal>
176-
<goal>default</goal>
177-
</goals>
178-
</pluginExecutionFilter>
179-
<action>
180-
<ignore/>
181-
</action>
182-
</pluginExecution>
183-
</pluginExecutions>
184-
</lifecycleMappingMetadata>
185-
</configuration>
186-
</plugin>
187-
</plugins>
188-
</pluginManagement>
189-
</build>
190-
</profile>
191-
</profiles>
19299
</project>

‎parent/pom.xml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@
125125
<!-- OSGI Manifest generation default property values -->
126126
<osgi.import.package>*</osgi.import.package>
127127
<osgi.export.package>{local-packages}</osgi.export.package>
128+
<osgi.private.package>**/internal/**</osgi.private.package>
128129

129130
<flattenMode>clean</flattenMode>
130131

@@ -276,6 +277,7 @@
276277
<artifactId>maven-javadoc-plugin</artifactId>
277278
<version>${maven.javadoc.plugin.version}</version>
278279
<configuration>
280+
<skip>true</skip>
279281
<taglets>
280282
<taglet>
281283
<tagletClass>org.apache.ignite.tools.javadoc.IgniteLinkTaglet</tagletClass>
@@ -402,7 +404,7 @@
402404
</configuration>
403405
</plugin>
404406

405-
<!-- <plugin>
407+
<plugin>
406408
<groupId>org.apache.felix</groupId>
407409
<artifactId>maven-bundle-plugin</artifactId>
408410
<version>${maven.bundle.plugin.version}</version>
@@ -446,7 +448,7 @@
446448
</goals>
447449
</execution>
448450
</executions>
449-
</plugin> -->
451+
</plugin>
450452

451453
<plugin>
452454
<groupId>org.apache.maven.plugins</groupId>
@@ -968,7 +970,7 @@
968970
<dependency>
969971
<groupId>org.apache.ignite</groupId>
970972
<artifactId>ignite-apache-license-gen</artifactId>
971-
<version>1.4.0</version>
973+
<version>1.5.0-SNAPSHOT</version>
972974
</dependency>
973975
</dependencies>
974976

0 commit comments

Comments
 (0)