Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove lookout dependency #359

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

remove lookout dependency #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38ce2f9
remove lookout dependency
hui-cha Sep 23, 2024
c0cdf8e
update version 6.5.6
huanglongchao Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.5.1
6.5.6
8 changes: 1 addition & 7 deletions client/all/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.alipay.sofa</groupId>
<artifactId>registry-client-all</artifactId>
<version>6.5.1</version>
<version>6.5.6</version>

<name>${project.groupId}:${project.artifactId}</name>
<url>http://github.com/alipay/sofa-registry</url>
Expand Down Expand Up @@ -54,7 +54,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<bolt.version>1.6.2</bolt.version>
<hessian.version>3.3.8</hessian.version>
<lookout.version>1.5.2</lookout.version>
<sofa.common.tools.version>1.0.12</sofa.common.tools.version>
<netty.version>4.1.42.Final</netty.version>
<slf4j.version>1.7.21</slf4j.version>
Expand Down Expand Up @@ -97,11 +96,6 @@
<artifactId>sofa-common-tools</artifactId>
<version>${sofa.common.tools.version}</version>
</dependency>
<dependency>
<groupId>com.alipay.sofa.lookout</groupId>
<artifactId>lookout-api</artifactId>
<version>${lookout.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion client/api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>registry-client-parent</artifactId>
<version>6.5.1</version>
<version>6.5.6</version>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codebase verification

Issues Found: Lookout dependencies still present in the codebase.

The following pom.xml files contain Lookout-related dependencies:

  • sofa-registry/pom.xml
  • sofa-registry/client/all/pom.xml
  • sofa-registry/client/impl/pom.xml
🔗 Analysis chain

LGTM. Verify alignment with PR objectives.

The update of the parent version from 6.5.1 to 6.5.6 looks good. This change likely introduces bug fixes, new features, or improvements from the parent project.

To ensure this change aligns with the PR objectives of removing the Lookout dependency, please run the following verification:

Action Required: Further verify removal of Lookout dependency.

The initial verification attempt failed because the mvn command is unavailable. To ensure the Lookout dependency has been removed, please run the following script:

Action Required: Verify removal of Lookout dependency across all POM files.

The previous attempt to locate Lookout dependencies failed due to the missing parent POM. To ensure comprehensive verification, please run the following script:

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify that the Lookout dependency has been removed and that no new dependencies related to Lookout have been introduced in the updated parent version.

# Test 1: Check if there are any Lookout-related dependencies in the effective POM
echo "Checking for Lookout-related dependencies in the effective POM:"
mvn help:effective-pom -f client/api/pom.xml | grep -i lookout

# Test 2: Verify that the parent POM doesn't introduce any Lookout-related dependencies
echo "Checking parent POM for Lookout-related dependencies:"
mvn help:effective-pom -f ../pom.xml | grep -i lookout

# Note: If both commands return no results, it indicates that no Lookout-related dependencies are present.

Length of output: 518

Script:

#!/bin/bash
# Description: Search for Lookout-related dependencies in POM files.

echo "Searching for Lookout-related dependencies in client/api/pom.xml:"
grep -i 'lookout' client/api/pom.xml

echo "Searching for Lookout-related dependencies in the parent POM:"
grep -i 'lookout' ../pom.xml

Length of output: 383

Script:

#!/bin/bash
# Description: Recursively search all pom.xml files for Lookout-related dependencies.

echo "Searching for Lookout-related dependencies in all pom.xml files:"
rg -i 'lookout' --glob 'pom.xml'

Length of output: 979

<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
6 changes: 1 addition & 5 deletions client/impl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>registry-client-parent</artifactId>
<version>6.5.1</version>
<version>6.5.6</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down Expand Up @@ -49,10 +49,6 @@
<groupId>com.alipay.sofa.common</groupId>
<artifactId>sofa-common-tools</artifactId>
</dependency>
<dependency>
<groupId>com.alipay.sofa.lookout</groupId>
<artifactId>lookout-api</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down
128 changes: 0 additions & 128 deletions client/impl/src/main/java/com/alipay/sofa/registry/client/event/LookoutSubscriber.java
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions ...nt/impl/src/main/java/com/alipay/sofa/registry/client/provider/DefaultRegistryClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,7 @@
import com.alipay.sofa.registry.client.api.registration.SubscriberRegistration;
import com.alipay.sofa.registry.client.auth.AuthManager;
import com.alipay.sofa.registry.client.auth.NoopAuthManager;
import com.alipay.sofa.registry.client.event.ConfiguratorProcessEvent;
import com.alipay.sofa.registry.client.event.DefaultEventBus;
import com.alipay.sofa.registry.client.event.LookoutSubscriber;
import com.alipay.sofa.registry.client.event.SubscriberProcessEvent;
import com.alipay.sofa.registry.client.log.LoggerFactory;
import com.alipay.sofa.registry.client.remoting.ClientConnection;
import com.alipay.sofa.registry.client.remoting.ClientConnectionCloseEventProcessor;
Expand Down Expand Up @@ -101,8 +98,6 @@ public class DefaultRegistryClient implements RegistryClient {

private EventBus eventBus;

private LookoutSubscriber lookoutSubscriber;

private AtomicBoolean init = new AtomicBoolean(false);

/**
Expand Down Expand Up @@ -155,16 +150,9 @@ public void init() {
return;
}

// init lookout subscriber
if (null == lookoutSubscriber) {
this.lookoutSubscriber = new LookoutSubscriber();
}

// init event bus
if (null == eventBus) {
this.eventBus = new DefaultEventBus(registryClientConfig);
this.eventBus.register(SubscriberProcessEvent.class, lookoutSubscriber);
this.eventBus.register(ConfiguratorProcessEvent.class, lookoutSubscriber);
}

// init server manager
Expand Down Expand Up @@ -538,15 +526,6 @@ public void setAuthManager(AuthManager authManager) {
this.authManager = authManager;
}

/**
* Setter method for property <tt>lookoutSubscriber</tt>.
*
* @param lookoutSubscriber value to be assigned to property lookoutSubscriber
*/
public void setLookoutSubscriber(LookoutSubscriber lookoutSubscriber) {
this.lookoutSubscriber = lookoutSubscriber;
}

/**
* Setter method for property <tt>eventBus</tt>.
*
Expand Down
81 changes: 0 additions & 81 deletions client/impl/src/test/java/com/alipay/sofa/registry/client/event/LookoutSubscriberTest.java
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion client/log/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>registry-client-parent</artifactId>
<version>6.5.1</version>
<version>6.5.6</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>registry-parent</artifactId>
<version>6.5.1</version>
<version>6.5.6</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>registry-parent</artifactId>
<version>6.5.1</version>
<version>6.5.6</version>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codebase verification

Version inconsistency detected in sofa-registry module.

Several pom.xml and .properties files within the sofa-registry directory still reference version 6.5.1. Please update these to 6.5.6 to ensure consistency across the project:

  • ./sofa-registry/client/all/pom.xml
  • ./sofa-registry/client/api/pom.xml
  • ./sofa-registry/client/impl/pom.xml
  • ./sofa-registry/client/log/pom.xml
  • ./sofa-registry/client/pom.xml
  • ./sofa-registry/core/pom.xml
  • ./sofa-registry/pom.xml
  • ./sofa-registry/server/common/model/pom.xml
  • ./sofa-registry/server/common/pom.xml
  • ./sofa-registry/server/common/util/pom.xml
  • ./sofa-registry/server/distribution/all/pom.xml
  • ./sofa-registry/server/distribution/pom.xml
  • ./sofa-registry/server/pom.xml
  • ./sofa-registry/server/remoting/api/pom.xml
  • ./sofa-registry/server/remoting/bolt/pom.xml
  • ./sofa-registry/server/remoting/http/pom.xml
  • ./sofa-registry/server/remoting/pom.xml
  • ./sofa-registry/server/server/data/pom.xml
  • ./sofa-registry/server/server/integration/pom.xml
  • ./sofa-registry/server/server/meta/pom.xml
  • ./sofa-registry/server/server/pom.xml
  • ./sofa-registry/server/server/session/pom.xml
  • ./sofa-registry/server/server/shared/pom.xml
  • ./sofa-registry/server/store/api/pom.xml
  • ./sofa-registry/server/store/jdbc/pom.xml
  • ./sofa-registry/server/store/jraft/pom.xml
  • ./sofa-registry/server/store/pom.xml
  • ./sofa-registry/test/pom.xml
🔗 Analysis chain

Version update looks good, but verify consistency.

The parent project version has been updated from 6.5.1 to 6.5.6. This change is likely to include bug fixes, improvements, or new features in the parent project.

To ensure consistency across the project, let's verify if this version update is reflected in other relevant files:

This script will help us identify any inconsistencies in version numbers across the project and ensure that the old version (6.5.1) has been completely replaced.

Generating new verification scripts for version consistency.

To ensure that the version update from 6.5.1 to 6.5.6 is consistently applied across all pom.xml files, please execute the following scripts:

These scripts will help verify that the version update is consistently applied and that no old version references remain in the codebase.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Check for inconsistencies in version numbers across pom.xml files

# Test 1: Check if all pom.xml files have the same version
echo "Checking pom.xml files for version consistency:"
find . -name pom.xml -type f -exec grep -H "<version>" {} + | grep -v "\${" | sort | uniq -c

# Test 2: Check if there are any remaining references to the old version
echo "Checking for any remaining references to version 6.5.1:"
grep -r "6.5.1" --include="*.xml" --include="*.properties" .

Length of output: 362

Script:

# Check if all pom.xml files have the updated version 6.5.6
echo "Verifying that all pom.xml files have version 6.5.6:"
fd "pom.xml" -x grep -H "<version>6\.5\.6</version>" {}

# Ensure there are no remaining references to the old version 6.5.1
echo "Ensuring no pom.xml or properties files reference version 6.5.1:"
grep -r "6\.5\.1" --include="pom.xml" --include="*.properties" .

Length of output: 4024

<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
8 changes: 1 addition & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.alipay.sofa</groupId>
<artifactId>registry-parent</artifactId>
<version>6.5.1</version>
<version>6.5.6</version>

<packaging>pom</packaging>

Expand Down Expand Up @@ -78,7 +78,6 @@
<jersey.version>2.26</jersey.version>
<protobuf.version>3.17.3</protobuf.version>
<slf4j.version>1.7.21</slf4j.version>
<lookout.version>1.5.2</lookout.version>
<mockito.version>1.10.19</mockito.version>
<powermock.version>1.6.6</powermock.version>
<jraft.version>1.3.5</jraft.version>
Expand Down Expand Up @@ -305,11 +304,6 @@
<artifactId>log4j-api</artifactId>
<version>${log4j2.version}</version>
</dependency>
<dependency>
<groupId>com.alipay.sofa.lookout</groupId>
<artifactId>lookout-api</artifactId>
<version>${lookout.version}</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion server/common/model/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>registry-common</artifactId>
<version>6.5.1</version>
<version>6.5.6</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion server/common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>registry-server-parent</artifactId>
<version>6.5.1</version>
<version>6.5.6</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
Loading
Loading