You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2023/02/17 23:21:21 UTC
[cxf] branch 3.6.x-fixes updated (517bbbdb62 -> e2a180e2cb)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from 517bbbdb62 Recording .gitmergeinfo Changes
new b1fb558877 Bump maven-plugin-annotations from 3.6.2 to 3.7.1 (#1143)
new e2a180e2cb Bump jruby from 1.7.27 to 9.4.1.0 (#1144)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/release/samples/ruby_spring_support/pom.xml | 2 +-
.../src/main/java/demo/spring/client/Client.java | 14 ++++++--------
.../src/main/resources/HelloWorldImpl.rb | 2 +-
parent/pom.xml | 2 +-
4 files changed, 9 insertions(+), 11 deletions(-)
[cxf] 01/02: Bump maven-plugin-annotations from 3.6.2 to 3.7.1 (#1143)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit b1fb558877c7681e15ea95d7df7f8ac552a8a2fa
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Fri Feb 17 07:46:03 2023 -0500
Bump maven-plugin-annotations from 3.6.2 to 3.7.1 (#1143)
Bumps [maven-plugin-annotations](https://github.com/apache/maven-plugin-tools) from 3.6.2 to 3.7.1.
- [Release notes](https://github.com/apache/maven-plugin-tools/releases)
- [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.6.2...maven-plugin-tools-3.7.1)
---
updated-dependencies:
- dependency-name: org.apache.maven.plugin-tools:maven-plugin-annotations
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index bd00525fe6..c437194b71 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -870,7 +870,7 @@
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <version>3.6.2</version>
+ <version>3.7.1</version>
<scope>provided</scope>
</dependency>
<dependency>
[cxf] 02/02: Bump jruby from 1.7.27 to 9.4.1.0 (#1144)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit e2a180e2cb6123cdf93b6725100708205d226549
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Fri Feb 17 18:20:32 2023 -0500
Bump jruby from 1.7.27 to 9.4.1.0 (#1144)
* Bump jruby from 1.7.27 to 9.4.1.0
Bumps jruby from 1.7.27 to 9.4.1.0.
---
updated-dependencies:
- dependency-name: org.jruby:jruby
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <su...@github.com>
* Update sample for jruby 9.4.1.0
---------
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
Co-authored-by: Andriy Redko <dr...@gmail.com>
---
.../src/main/release/samples/ruby_spring_support/pom.xml | 2 +-
.../src/main/java/demo/spring/client/Client.java | 14 ++++++--------
.../src/main/resources/HelloWorldImpl.rb | 2 +-
3 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/distribution/src/main/release/samples/ruby_spring_support/pom.xml b/distribution/src/main/release/samples/ruby_spring_support/pom.xml
index a1f7adf790..a4480a3aae 100644
--- a/distribution/src/main/release/samples/ruby_spring_support/pom.xml
+++ b/distribution/src/main/release/samples/ruby_spring_support/pom.xml
@@ -110,7 +110,7 @@
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby</artifactId>
- <version>1.7.27</version>
+ <version>9.4.1.0</version>
</dependency>
<dependency>
<groupId>cglib</groupId>
diff --git a/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/client/Client.java b/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/client/Client.java
index 0a3fb67689..616fdbe366 100644
--- a/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/client/Client.java
+++ b/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/client/Client.java
@@ -30,14 +30,12 @@ public final class Client {
public static void main(String[] args) throws Exception {
// START SNIPPET: client
- ClassPathXmlApplicationContext context
- = new ClassPathXmlApplicationContext(new String[] {"client-beans.xml"});
-
- HelloWorld client = (HelloWorld)context.getBean("client");
-
- String response = client.sayHi("Joe");
- System.out.println("Response: " + response);
- System.exit(0);
+ try (ClassPathXmlApplicationContext context
+ = new ClassPathXmlApplicationContext(new String[] {"client-beans.xml"})) {
+ HelloWorld client = (HelloWorld)context.getBean("client");
+ String response = client.sayHi("Joe");
+ System.out.println("Response: " + response);
+ }
// END SNIPPET: client
}
}
diff --git a/distribution/src/main/release/samples/ruby_spring_support/src/main/resources/HelloWorldImpl.rb b/distribution/src/main/release/samples/ruby_spring_support/src/main/resources/HelloWorldImpl.rb
index 246d953205..821d196460 100644
--- a/distribution/src/main/release/samples/ruby_spring_support/src/main/resources/HelloWorldImpl.rb
+++ b/distribution/src/main/release/samples/ruby_spring_support/src/main/resources/HelloWorldImpl.rb
@@ -17,7 +17,7 @@
require 'java'
-include_class 'demo.spring.service.HelloWorld'
+java_import 'demo.spring.service.HelloWorld'
class HelloWorldImpl