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.

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

Move apollo-demo, scripts/docker-quick-start and scripts/apollo-on-kubernetes out of main repository #4440

Merged
merged 4 commits into from
Jul 10, 2022

Conversation

nobodyiam
Copy link
Member

What's the purpose of this PR

Move apollo-demo, scripts/docker-quick-start and scripts/apollo-on-kubernetes out of main repository, see #4427.

Brief changelog

Follow this checklist to help us incorporate your contribution quickly and easily:

  • Read the Contributing Guide before making this pull request.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • Write necessary unit tests to verify the code.
  • Run mvn clean test to make sure this pull request doesn't break anything.
  • Update the CHANGES log.

@codecov-commenter
Copy link

codecov-commenter commented Jul 3, 2022

Codecov Report

Merging #4440 (1b4ce17) into master (3e8fdc5) will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##             master    #4440   +/-   ##
=========================================
  Coverage     53.57%   53.57%           
  Complexity     2692     2692           
=========================================
  Files           488      488           
  Lines         15229    15229           
  Branches       1587     1587           
=========================================
  Hits           8159     8159           
  Misses         6514     6514           
  Partials        556      556           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3e8fdc5...1b4ce17. Read the comment docs.

@Anilople
Copy link
Contributor

Anilople commented Jul 7, 2022

After remove apollo-demo/src/main/java/com/ctrip/framework/apollo/demo/spring/xmlConfigDemo/bean/XmlBean.java

Do we need to change the javadoc in

https://github.com/nobodyiam/apollo/blob/17b208d27225f7f4fe15ff0cbaf105ae47dcf507/apollo-client/src/main/java/com/ctrip/framework/apollo/spring/property/SpringValueDefinitionProcessor.java#L44

 *  &lt;bean class=&quot;com.ctrip.framework.apollo.demo.spring.xmlConfigDemo.bean.XmlBean&quot;&gt;

from com.ctrip.framework.apollo.demo.spring.xmlConfigDemo.bean.XmlBean to com.apolloconfig.apollo.demo.spring.bean.XmlBean?

XmlBean in https://github.com/apolloconfig/apollo-demo-java/blob/dfbd9f9c794157cbcccef7ba68d2349bef533559/spring-demo/src/main/java/com/apolloconfig/apollo/demo/spring/bean/XmlBean.java#L22 now.

@nobodyiam
Copy link
Member Author

@Anilople That I think is all right as it is only used to explain what SpringValueDefinitionProcessor does - to process the placeholders in Spring XML configuration files.

To process xml config placeholders, e.g.
    <bean class="com.ctrip.framework.apollo.demo.spring.xmlConfigDemo.bean.XmlBean">
      <property name="timeout" value="${timeout:200}"/>
      <property name="batch" value="${batch:100}"/>
    </bean>

@nobodyiam nobodyiam merged commit 3440475 into apolloconfig:master Jul 10, 2022
@nobodyiam nobodyiam deleted the clean-repository-1 branch July 10, 2022 14:21
@github-actions github-actions bot locked and limited conversation to collaborators Jul 10, 2022
@nobodyiam nobodyiam added this to the 2.1.0 milestone Feb 5, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants