Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Raptor Engineering Public Development
Jitsi
jaxb-api
Commits
cae38758
Unverified
Commit
cae38758
authored
3 years ago
by
Lukas Jungmann
Committed by
GitHub
3 years ago
Browse files
Options
Download
Email Patches
Plain Diff
fix cpright (#213)
Signed-off-by:
Lukas Jungmann
<
lukas.jungmann@oracle.com
>
parent
eb47bcb0
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
23 additions
and
23 deletions
+23
-23
CONTRIBUTING.md
CONTRIBUTING.md
+1
-1
NOTICE.md
NOTICE.md
+1
-1
README.md
README.md
+1
-1
api/pom.xml
api/pom.xml
+2
-2
api/src/main/java/jakarta/xml/bind/ContextFinder.java
api/src/main/java/jakarta/xml/bind/ContextFinder.java
+1
-1
api/src/main/java/jakarta/xml/bind/ServiceLoaderUtil.java
api/src/main/java/jakarta/xml/bind/ServiceLoaderUtil.java
+11
-9
etc/jenkins/continuous.groovy
etc/jenkins/continuous.groovy
+1
-1
etc/jenkins/release.groovy
etc/jenkins/release.groovy
+1
-1
etc/spotbugs-exclude.xml
etc/spotbugs-exclude.xml
+1
-1
jaxb-api-test/pom.xml
jaxb-api-test/pom.xml
+1
-2
pom.xml
pom.xml
+2
-3
No files found.
CONTRIBUTING.md
View file @
cae38758
[
//
]:
#
" Copyright (c) 2018, 202
1
Oracle and/or its affiliates. All rights reserved. "
[
//
]:
#
" Copyright (c) 2018, 202
2
Oracle and/or its affiliates. All rights reserved. "
[
//
]:
#
" "
[
//
]:
#
" This program and the accompanying materials are made available under the "
[
//
]:
#
" terms of the Eclipse Distribution License v. 1.0, which is available at "
...
...
This diff is collapsed.
Click to expand it.
NOTICE.md
View file @
cae38758
[
//
]:
#
" Copyright (c) 2018, 202
1
Oracle and/or its affiliates. All rights reserved. "
[
//
]:
#
" Copyright (c) 2018, 202
2
Oracle and/or its affiliates. All rights reserved. "
[
//
]:
#
" "
[
//
]:
#
" This program and the accompanying materials are made available under the "
[
//
]:
#
" terms of the Eclipse Distribution License v. 1.0, which is available at "
...
...
This diff is collapsed.
Click to expand it.
README.md
View file @
cae38758
[
//
]:
#
" Copyright (c) 2018, 202
1
Oracle and/or its affiliates. All rights reserved. "
[
//
]:
#
" Copyright (c) 2018, 202
2
Oracle and/or its affiliates. All rights reserved. "
[
//
]:
#
" "
[
//
]:
#
" This program and the accompanying materials are made available under the "
[
//
]:
#
" terms of the Eclipse Distribution License v. 1.0, which is available at "
...
...
This diff is collapsed.
Click to expand it.
api/pom.xml
View file @
cae38758
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2018, 202
1
Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2018, 202
2
Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
...
...
@@ -243,4 +243,4 @@ Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">
</plugin>
</plugins>
</build>
</project>
</project>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
api/src/main/java/jakarta/xml/bind/ContextFinder.java
View file @
cae38758
/*
* Copyright (c) 2003, 202
1
Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 202
2
Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v. 1.0, which is available at
...
...
This diff is collapsed.
Click to expand it.
api/src/main/java/jakarta/xml/bind/ServiceLoaderUtil.java
View file @
cae38758
/*
* Copyright (c) 2015, 202
1
Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 202
2
Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v. 1.0, which is available at
...
...
@@ -48,16 +48,18 @@ class ServiceLoaderUtil {
return
null
;
}
static
Object
lookupUsingOSGiServiceLoader
(
String
factoryId
,
Logger
logger
)
{
static
<
T
>
T
lookupUsingOSGiServiceLoader
(
String
factoryId
,
Logger
logger
)
{
try
{
// Use reflection to avoid having any dependency on ServiceLoader class
Class
<?>
serviceClass
=
Class
.
forName
(
factoryId
);
@SuppressWarnings
(
"unchecked"
)
Class
<?
extends
T
>
serviceClass
=
(
Class
<?
extends
T
>)
Class
.
forName
(
factoryId
);
Class
<?>
target
=
Class
.
forName
(
OSGI_SERVICE_LOADER_CLASS_NAME
);
Method
m
=
target
.
getMethod
(
OSGI_SERVICE_LOADER_METHOD_NAME
,
Class
.
class
);
Iterator
<?>
iter
=
((
Iterable
)
m
.
invoke
(
null
,
serviceClass
)).
iterator
();
@SuppressWarnings
(
"unchecked"
)
Iterator
<?
extends
T
>
iter
=
((
Iterable
<?
extends
T
>)
m
.
invoke
(
null
,
serviceClass
)).
iterator
();
if
(
iter
.
hasNext
())
{
Object
next
=
iter
.
next
();
T
next
=
iter
.
next
();
logger
.
log
(
Level
.
FINE
,
"Found implementation using OSGi facility; returning object [{0}]."
,
next
.
getClass
().
getName
());
return
next
;
...
...
@@ -67,9 +69,9 @@ class ServiceLoaderUtil {
}
catch
(
IllegalAccessException
|
InvocationTargetException
|
ClassNotFoundException
|
NoSuchMethodException
ignored
)
{
NoSuchMethodException
ex
)
{
logger
.
log
(
Level
.
FINE
,
"Unable to find from OSGi: ["
+
factoryId
+
"]"
,
ignored
);
logger
.
log
(
Level
.
FINE
,
"Unable to find from OSGi: ["
+
factoryId
+
"]"
,
ex
);
return
null
;
}
}
...
...
@@ -86,9 +88,9 @@ class ServiceLoaderUtil {
}
catch
(
IllegalAccessException
|
InvocationTargetException
|
ClassNotFoundException
|
NoSuchMethodException
ignored
)
{
NoSuchMethodException
ex
)
{
logger
.
log
(
Level
.
FINE
,
ignored
,
()
->
"Unable to find from OSGi: ["
+
factoryId
+
"]"
);
logger
.
log
(
Level
.
FINE
,
ex
,
()
->
"Unable to find from OSGi: ["
+
factoryId
+
"]"
);
return
null
;
}
}
...
...
This diff is collapsed.
Click to expand it.
etc/jenkins/continuous.groovy
View file @
cae38758
// Copyright (c) 2019, 202
1
Oracle and/or its affiliates. All rights reserved.
// Copyright (c) 2019, 202
2
Oracle and/or its affiliates. All rights reserved.
//
// This program and the accompanying materials are made available under the
// terms of the Eclipse Distribution License v. 1.0, which is available at
...
...
This diff is collapsed.
Click to expand it.
etc/jenkins/release.groovy
View file @
cae38758
// Copyright (c) 2019, 202
1
Oracle and/or its affiliates. All rights reserved.
// Copyright (c) 2019, 202
2
Oracle and/or its affiliates. All rights reserved.
//
// This program and the accompanying materials are made available under the
// terms of the Eclipse Distribution License v. 1.0, which is available at
...
...
This diff is collapsed.
Click to expand it.
etc/spotbugs-exclude.xml
View file @
cae38758
<!--
Copyright (c) 2013, 202
1
Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2013, 202
2
Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
...
...
This diff is collapsed.
Click to expand it.
jaxb-api-test/pom.xml
View file @
cae38758
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2018, 202
1
Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2018, 202
2
Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
...
...
@@ -130,5 +130,4 @@ Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">
</plugin>
</plugins>
</build>
</project>
This diff is collapsed.
Click to expand it.
pom.xml
View file @
cae38758
<?xml version="1.0"?>
<!--
Copyright (c) 1997, 202
1
Oracle and/or its affiliates. All rights reserved.
Copyright (c) 1997, 202
2
Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
...
...
@@ -70,7 +70,7 @@
<properties>
<copyright.exclude>
${config.dir}/copyright-exclude
</copyright.exclude>
<copyright.ignoreyear>
fals
e
</copyright.ignoreyear>
<copyright.ignoreyear>
tru
e
</copyright.ignoreyear>
<copyright.scmonly>
true
</copyright.scmonly>
<copyright.templatefile>
${config.dir}/edl-copyright.txt
</copyright.templatefile>
<copyright.update>
false
</copyright.update>
...
...
@@ -242,5 +242,4 @@
</modules>
</profile>
</profiles>
</project>
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment