You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ro...@apache.org on 2019/12/09 19:58:05 UTC
[aries-cdi] branch master updated: cleanup
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-cdi.git
The following commit(s) were added to refs/heads/master by this push:
new 4fbfc9a cleanup
new 1411612 Merge pull request #27 from rotty3000/master
4fbfc9a is described below
commit 4fbfc9a0f12cd091516fcff278b41afb9308d15a
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Mon Dec 9 14:31:23 2019 -0500
cleanup
Signed-off-by: Raymond Augé <ro...@apache.org>
---
.github/workflows/maven.yml | 12 ++++++++
.../cdi/build/tools/AddExtensionRequirement.java | 34 +++++++++++-----------
.../internal/container/ConfigurationExtension.java | 14 +++++++++
.../cdi/extension/mp/metrics/StubJsonProvider.java | 14 +++++++++
.../java/org/apache/aries/cdi/test/tb17/A.java | 14 +++++++++
.../java/org/apache/aries/cdi/test/tb17/C.java | 14 +++++++++
.../java/org/apache/aries/cdi/test/tb17/D.java | 14 +++++++++
.../java/org/apache/aries/cdi/test/tb17/E.java | 14 +++++++++
.../java/org/apache/aries/cdi/test/tb17/F.java | 14 +++++++++
.../java/org/apache/aries/cdi/test/tb17/G.java | 14 +++++++++
.../java/org/apache/aries/cdi/test/tb17/H.java | 14 +++++++++
.../resources/OSGI-INF/configurator/config.json | 12 ++++++++
.../apache/aries/cdi/owb/CdiScannerService.java | 16 +++++++++-
.../aries/cdi/owb/OWBCDIContainerInitializer.java | 14 +++++++++
.../aries/cdi/spi/configuration/Configuration.java | 14 +++++++++
.../cdi/weld/WeldCDIContainerInitializer.java | 14 +++++++++
16 files changed, 224 insertions(+), 18 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 584cdbf..bd7817d 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -1,3 +1,15 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
name: Java CI
on: [push, pull_request]
diff --git a/cdi-build-tools/src/main/java/org/apache/aries/cdi/build/tools/AddExtensionRequirement.java b/cdi-build-tools/src/main/java/org/apache/aries/cdi/build/tools/AddExtensionRequirement.java
index 9e6aef3..988f35e 100644
--- a/cdi-build-tools/src/main/java/org/apache/aries/cdi/build/tools/AddExtensionRequirement.java
+++ b/cdi-build-tools/src/main/java/org/apache/aries/cdi/build/tools/AddExtensionRequirement.java
@@ -29,23 +29,23 @@ import net.bytebuddy.dynamic.DynamicType.Builder;
/**
* Example:
* <pre>
- * <transformation>
- * <plugin>org.apache.aries.cdi.build.tools.AddExtensionRequirement.AddExtensionRequirement</plugin>
- * <arguments>
- * <argument>
- * <index>1</index>
- * <value>eclipse.microprofile.config</value>
- * </argument>
- * <argument>
- * <index>2</index>
- * <value>${mp.config.version}</value>
- * </argument>
- * <argument>
- * <index>3</index>
- * <value>org.eclipse.microprofile.config.inject.ConfigProperty</value>
- * </argument>
- * </arguments>
- * </transformation>
+ * <transformation>
+ * <plugin>org.apache.aries.cdi.build.tools.AddExtensionRequirement.AddExtensionRequirement</plugin>
+ * <arguments>
+ * <argument>
+ * <index>1</index>
+ * <value>eclipse.microprofile.config</value>
+ * </argument>
+ * <argument>
+ * <index>2</index>
+ * <value>${mp.config.version}</value>
+ * </argument>
+ * <argument>
+ * <index>3</index>
+ * <value>org.eclipse.microprofile.config.inject.ConfigProperty</value>
+ * </argument>
+ * </arguments>
+ * </transformation>
* </pre>
*/
public class AddExtensionRequirement implements Plugin {
diff --git a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ConfigurationExtension.java b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ConfigurationExtension.java
index fa19ee6..c006aa5 100644
--- a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ConfigurationExtension.java
+++ b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ConfigurationExtension.java
@@ -1,3 +1,17 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.aries.cdi.container.internal.container;
import static org.osgi.service.http.whiteboard.HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT;
diff --git a/cdi-extension-mp-metrics/src/main/java/org/apache/aries/cdi/extension/mp/metrics/StubJsonProvider.java b/cdi-extension-mp-metrics/src/main/java/org/apache/aries/cdi/extension/mp/metrics/StubJsonProvider.java
index 73d3a68..389fc1a 100644
--- a/cdi-extension-mp-metrics/src/main/java/org/apache/aries/cdi/extension/mp/metrics/StubJsonProvider.java
+++ b/cdi-extension-mp-metrics/src/main/java/org/apache/aries/cdi/extension/mp/metrics/StubJsonProvider.java
@@ -1,3 +1,17 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.aries.cdi.extension.mp.metrics;
import javax.json.spi.JsonProvider;
diff --git a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb17/A.java b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb17/A.java
index 463d105..acff571 100644
--- a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb17/A.java
+++ b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb17/A.java
@@ -1,3 +1,17 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.aries.cdi.test.tb17;
import org.apache.aries.cdi.test.interfaces.Pojo;
diff --git a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb17/C.java b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb17/C.java
index 2b267c3..ff21f3d 100644
--- a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb17/C.java
+++ b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb17/C.java
@@ -1,3 +1,17 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.aries.cdi.test.tb17;
import org.apache.aries.cdi.test.interfaces.Pojo;
diff --git a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb17/D.java b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb17/D.java
index 1193d22..b998774 100644
--- a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb17/D.java
+++ b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb17/D.java
@@ -1,3 +1,17 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.aries.cdi.test.tb17;
import org.apache.aries.cdi.test.interfaces.Pojo;
diff --git a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb17/E.java b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb17/E.java
index b378b98..d852852 100644
--- a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb17/E.java
+++ b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb17/E.java
@@ -1,3 +1,17 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.aries.cdi.test.tb17;
import javax.enterprise.context.ApplicationScoped;
diff --git a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb17/F.java b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb17/F.java
index f331996..c61c2fe 100644
--- a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb17/F.java
+++ b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb17/F.java
@@ -1,3 +1,17 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.aries.cdi.test.tb17;
import javax.decorator.Decorator;
diff --git a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb17/G.java b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb17/G.java
index 6488d05..e441b6f 100644
--- a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb17/G.java
+++ b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb17/G.java
@@ -1,3 +1,17 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.aries.cdi.test.tb17;
import javax.enterprise.context.ConversationScoped;
diff --git a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb17/H.java b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb17/H.java
index d3d6f1e..9fa53c3 100644
--- a/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb17/H.java
+++ b/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb17/H.java
@@ -1,3 +1,17 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.aries.cdi.test.tb17;
import javax.inject.Inject;
diff --git a/cdi-itests/src/main/resources/OSGI-INF/configurator/config.json b/cdi-itests/src/main/resources/OSGI-INF/configurator/config.json
index cc606ae..13ba63b 100644
--- a/cdi-itests/src/main/resources/OSGI-INF/configurator/config.json
+++ b/cdi-itests/src/main/resources/OSGI-INF/configurator/config.json
@@ -1,3 +1,15 @@
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
{
":configurator:resource-version" : 1,
diff --git a/cdi-owb/src/main/java/org/apache/aries/cdi/owb/CdiScannerService.java b/cdi-owb/src/main/java/org/apache/aries/cdi/owb/CdiScannerService.java
index b0dcb30..0a6bc04 100644
--- a/cdi-owb/src/main/java/org/apache/aries/cdi/owb/CdiScannerService.java
+++ b/cdi-owb/src/main/java/org/apache/aries/cdi/owb/CdiScannerService.java
@@ -1,6 +1,20 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.aries.cdi.owb;
-import static java.util.Collections.*;
+import static java.util.Collections.emptySet;
import java.net.URL;
import java.util.Collection;
diff --git a/cdi-owb/src/main/java/org/apache/aries/cdi/owb/OWBCDIContainerInitializer.java b/cdi-owb/src/main/java/org/apache/aries/cdi/owb/OWBCDIContainerInitializer.java
index a39756d..3dbe9bb 100644
--- a/cdi-owb/src/main/java/org/apache/aries/cdi/owb/OWBCDIContainerInitializer.java
+++ b/cdi-owb/src/main/java/org/apache/aries/cdi/owb/OWBCDIContainerInitializer.java
@@ -1,3 +1,17 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.aries.cdi.owb;
import static java.util.Objects.requireNonNull;
diff --git a/cdi-spi/src/main/java/org/apache/aries/cdi/spi/configuration/Configuration.java b/cdi-spi/src/main/java/org/apache/aries/cdi/spi/configuration/Configuration.java
index c12325c..f7d3b2c 100644
--- a/cdi-spi/src/main/java/org/apache/aries/cdi/spi/configuration/Configuration.java
+++ b/cdi-spi/src/main/java/org/apache/aries/cdi/spi/configuration/Configuration.java
@@ -1,3 +1,17 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.aries.cdi.spi.configuration;
import java.util.Map;
diff --git a/cdi-weld/src/main/java/org/apache/aries/cdi/weld/WeldCDIContainerInitializer.java b/cdi-weld/src/main/java/org/apache/aries/cdi/weld/WeldCDIContainerInitializer.java
index 9057214..f621a7b 100644
--- a/cdi-weld/src/main/java/org/apache/aries/cdi/weld/WeldCDIContainerInitializer.java
+++ b/cdi-weld/src/main/java/org/apache/aries/cdi/weld/WeldCDIContainerInitializer.java
@@ -1,3 +1,17 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.aries.cdi.weld;
import static java.util.Objects.requireNonNull;