Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into no-issue-bump-vscode-…
Browse files Browse the repository at this point in the history
…extension-tester
  • Loading branch information
ljmotta committed Dec 16, 2024
2 parents f4a7f49 + 3a08bbf commit 2987787
Show file tree
Hide file tree
Showing 19 changed files with 90 additions and 206 deletions.
2 changes: 1 addition & 1 deletion .ci/jenkins/release-jobs/Jenkinsfile.chrome-extensions
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ pipeline {
CHROME_EXTENSION__manifestFile = 'manifest.prod.json'
CHROME_EXTENSION__onlineEditorUrl = 'https://apache.github.io/incubator-kie-kogito-online'
SWF_CHROME_EXTENSION__routerTargetOrigin = 'https://apache.github.io'
SWF_CHROME_EXTENSION__routerRelativePath = "kogito-online/swf-chrome-extension/${params.RELEASE_VERSION}"
SWF_CHROME_EXTENSION__routerRelativePath = "incubator-kie-kogito-online/swf-chrome-extension/${params.RELEASE_VERSION}"
SWF_CHROME_EXTENSION__manifestFile = 'manifest.prod.json'

RELEASE_ARTIFACTS_DIR = "${WORKSPACE}/release-artifacts"
Expand Down
5 changes: 5 additions & 0 deletions .github/actions/setup-env/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,11 @@ runs:
libxml2-utils > /dev/null 2>&1
fi
- name: "Allow unprivileged user namespace (Ubuntu Only)"
if: runner.os == 'Linux'
shell: bash
run: sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0

- name: "Update bash for macOS (macOS Only)"
shell: bash
if: runner.os == 'macOS'
Expand Down
2 changes: 0 additions & 2 deletions .rat-excludes
Original file line number Diff line number Diff line change
Expand Up @@ -1022,8 +1022,6 @@ Base64Util.java
TimeUnit.java
# packages/stunner-editors/errai-common/src/main/java/org/jboss/errai/common/compat/README.eclipse
README.eclipse
# packages/stunner-editors/errai-common/src/main/java/org/jboss/errai/common/compat/javax/annotation/processing/Generated.java
Generated.java
# packages/stunner-editors/errai-common/src/main/resources/META-INF/ErraiApp.properties
ErraiApp.properties
# packages/stunner-editors/errai-common/src/test/resources/ErraiApp.properties
Expand Down
39 changes: 0 additions & 39 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -663,45 +663,6 @@ for packages/stunner-editors/errai-javax-enterprise/src/main/java/javax/enterpri
Copyright 2010, Red Hat, Inc., and individual contributors
Licensed under the Apache License, Version 2.0

----------------------------------------------------------------------------------------------------------------------------------
for packages/stunner-editors/errai-common/src/main/java/org/jboss/errai/common/compat/javax/annotation/processing/Generated.java

Copyright (c) 2005-2013 Oracle and/or its affiliates. All rights reserved.

The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common Development
and Distribution License("CDDL") (collectively, the "License"). You
may not use this file except in compliance with the License. You can
obtain a copy of the License at
https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
or packager/legal/LICENSE.txt. See the License for the specific
language governing permissions and limitations under the License.

When distributing the software, include this License Header Notice in each
file and include the License file at packager/legal/LICENSE.txt.

GPL Classpath Exception:
Oracle designates this particular file as subject to the "Classpath"
exception as provided by Oracle in the GPL Version 2 section of the License
file that accompanied this code.

Modifications:
If applicable, add the following below the License Header, with the fields
enclosed by brackets [] replaced by your own identifying information:
"Portions Copyright [year] [name of copyright owner]"

Contributor(s):
If you wish your version of this file to be governed by only the CDDL or
only the GPL Version 2, indicate your decision by adding "[Contributor]
elects to include this software in this distribution under the [CDDL or GPL
Version 2] license." If you don't indicate a single choice of license, a
recipient has the option to distribute your version of this file under
either the CDDL, the GPL Version 2 or to extend the choice of license to
its licensees as provided above. However, if you add GPL Version 2 code
and therefore, elected the GPL Version 2 license, then the option applies
only if the new code is made subject to such option by the copyright
holder.

---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
for packages/dashbuilder/appformer/uberfire-workbench/uberfire-workbench-client-views-patternfly/src/main/resources/org/uberfire/client/views/static/jquery-ui/jquery-ui.min.js
packages/dashbuilder/appformer/uberfire-workbench/uberfire-workbench-client-views-patternfly/src/main/resources/org/uberfire/client/views/static/jquery-ui/jquery-ui.min.css
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"@types/chrome": "^0.0.193",
"@types/jest": "^29.5.12",
"@types/jest-when": "^3.5.5",
"@types/selenium-webdriver": "^4.1.20",
"@types/selenium-webdriver": "^4.1.27",
"chai": "^4.3.10",
"copy-webpack-plugin": "^11.0.0",
"jest": "^29.7.0",
Expand All @@ -53,7 +53,7 @@
"jest-when": "^3.6.0",
"process": "^0.11.10",
"rimraf": "^3.0.2",
"selenium-webdriver": "^4.15.0",
"selenium-webdriver": "^4.27.0",
"start-server-and-test": "^2.0.3",
"ts-jest": "^29.1.5",
"typescript": "^5.5.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/chrome-extension-test-helper/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
"devDependencies": {
"@kie-tools/tsconfig": "workspace:*",
"@types/chai": "^4.3.6",
"@types/selenium-webdriver": "^4.1.20",
"@types/selenium-webdriver": "^4.1.27",
"chai": "^4.3.10",
"rimraf": "^3.0.2",
"selenium-webdriver": "^4.15.0",
"selenium-webdriver": "^4.27.0",
"typescript": "^5.5.3"
}
}
2 changes: 1 addition & 1 deletion packages/extended-services-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<groupId>org.kie.tools</groupId>
<artifactId>extended-services-java</artifactId>

<name>KIE Tools :: KIE Sandbox :: Extended Services Quarkus app</name>
<name>KIE Tools :: Extended Services Quarkus app</name>
<description
>Quarkus-based application that wraps Kogito JIT Executor for consumption as a KIE Sandbox backend.</description>

Expand Down
12 changes: 6 additions & 6 deletions packages/extended-services-vscode-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"engines": {
"vscode": "^1.67.0"
},
"displayName": "Apache KIE Extended Services",
"displayName": "Apache KIE Extended Services",
"categories": [
"Other"
],
Expand All @@ -62,13 +62,13 @@
{
"category": "Extended-Services",
"command": "extended-services-vscode-extension.startExtendedServices",
"title": "Connect Apache KIE Extended-Services",
"title": "Connect Apache KIE Extended Services",
"when": "extended-services-vscode-extension.connected"
},
{
"category": "Extended-Services",
"command": "extended-services-vscode-extension.stopExtendedServices",
"title": "Disconnect Apache KIE Extended-Services"
"title": "Disconnect Apache KIE Extended Services"
}
],
"configuration": {
Expand All @@ -94,22 +94,22 @@
"type": "string"
}
},
"title": "Apache KIE Extended Services"
"title": "Apache KIE Extended Services"
},
"icons": {
"extended-services-connected": {
"default": {
"fontCharacter": "\\E000",
"fontPath": "./static/extended-services-font.woff"
},
"description": "Connected to the Apache KIE Extended-Services"
"description": "Connected to the Apache KIE Extended Services"
},
"extended-services-disconnected": {
"default": {
"fontCharacter": "\\E001",
"fontPath": "./static/extended-services-font.woff"
},
"description": "Apache KIE Extended-Services are Disconnected"
"description": "Apache KIE Extended Services are Disconnected"
}
},
"languages": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import * as validationRequests from "./requests/ValidationRequests";
import * as validationResponse from "./requests/ValidationResponse";
import * as vscode from "vscode";

const source: string = "Apache KIE Extended Services";
const source: string = "Apache KIE Extended Services";

function createBPMNDiagnostics(validationResponses: validationResponse.BPMNValidationResponse[]): vscode.Diagnostic[] {
return validationResponses.map((validationResponse) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ function fetchConnectionHeartbeatIntervalinSecs(): number {
function fetchExtendedServicesURL(): URL {
const extendedServicesURL = vscode.workspace.getConfiguration().get<string>(extendedServicesURLID);
if (!extendedServicesURL) {
throw new Error("Extended Services URL configuration not found");
throw new Error("URL configuration not found");
}

try {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ function initializeVSCodeElements() {

statusBarItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right, 100);
statusBarItem.text = "$(extended-services-disconnected)";
statusBarItem.tooltip = "Apache KIE Extended Services are not connected. \n" + "Click to connect.";
statusBarItem.tooltip = "Apache KIE Extended Services is not connected. \n" + "Click to connect.";
statusBarItem.command = startExtendedServicesCommandUID;
statusBarItem.hide();

Expand Down Expand Up @@ -171,7 +171,7 @@ export function activate(context: vscode.ExtensionContext) {
if (configuration) {
validate(configuration);
statusBarItem.text = "$(extended-services-connected)";
statusBarItem.tooltip = "Apache KIE Extended Services are connected. Click to disconnect.";
statusBarItem.tooltip = "Apache KIE Extended Services is connected. Click to disconnect.";
statusBarItem.command = stopExtendedServicesCommandUID;
}
});
Expand All @@ -184,7 +184,7 @@ export function activate(context: vscode.ExtensionContext) {
connection.subscribeDisconnected(() => {
vscode.commands.executeCommand("setContext", connectedEnablementUID, false);
statusBarItem.text = "$(extended-services-disconnected)";
statusBarItem.tooltip = "Apache KIE Extended Services are not connected. Click to connect.";
statusBarItem.tooltip = "Apache KIE Extended Services is not connected. Click to connect.";
statusBarItem.command = startExtendedServicesCommandUID;
diagnosticCollection.clear();
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ export function activate(context: vscode.ExtensionContext) {
if (configuration) {
validate(configuration);
statusBarItem.text = "$(extended-services-connected)";
statusBarItem.tooltip = "Apache KIE Extended Services are connected. Click to disconnect.";
statusBarItem.tooltip = "Apache KIE Extended Services are connected. Click to disconnect.";
statusBarItem.command = stopExtendedServicesCommandUID;
}
});
Expand All @@ -230,7 +230,7 @@ export function activate(context: vscode.ExtensionContext) {
connection.subscribeDisconnected(() => {
vscode.commands.executeCommand("setContext", connectedEnablementUID, false);
statusBarItem.text = "$(extended-services-disconnected)";
statusBarItem.tooltip = "Apache KIE Extended Services are not connected. Click to connect.";
statusBarItem.tooltip = "Apache KIE Extended Services are not connected. Click to connect.";
statusBarItem.command = startExtendedServicesCommandUID;
diagnosticCollection.clear();
});
Expand Down
6 changes: 3 additions & 3 deletions packages/serverless-workflow-vscode-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"@types/chai": "^4.3.6",
"@types/fs-extra": "^11.0.1",
"@types/mocha": "^10.0.7",
"@types/selenium-webdriver": "^4.1.20",
"@types/selenium-webdriver": "^4.1.27",
"@types/vscode": "1.67.0",
"@vscode/test-electron": "^2.3.6",
"@vscode/test-web": "^0.0.30",
Expand All @@ -77,7 +77,7 @@
"process": "^0.11.10",
"rimraf": "^3.0.2",
"sanitize-filename-ts": "^1.0.2",
"selenium-webdriver": "^4.15.0",
"selenium-webdriver": "^4.27.0",
"typescript": "^5.5.3",
"vscode-extension-tester": "^8.10.0",
"webpack": "^5.94.0",
Expand All @@ -88,7 +88,7 @@
"engines": {
"vscode": "^1.67.0"
},
"displayName": "KIE Serverless Workflow Editor",
"displayName": "Apache KIE Serverless Workflow Editor",
"categories": [
"Other"
],
Expand Down
4 changes: 3 additions & 1 deletion packages/sonataflow-operator/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,15 @@ BUILDER ?= docker
# USE_IMAGE_DIGESTS defines if images are resolved via tags or digests
# You can enable this value if you would like to use SHA Based Digests
# To enable set flag to true
IMG_TAG_SEP = :
USE_IMAGE_DIGESTS ?= false
ifeq ($(USE_IMAGE_DIGESTS), true)
BUNDLE_GEN_FLAGS += --use-image-digests
IMG_TAG_SEP = @
endif

# Image URL to use all building/pushing image targets
IMG ?= $(IMAGE_TAG_BASE):$(IMAGE_TAG)
IMG ?= $(IMAGE_TAG_BASE)$(IMG_TAG_SEP)$(IMAGE_TAG)
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
ENVTEST_K8S_VERSION = 1.26

Expand Down
Original file line number Diff line number Diff line change
@@ -1,98 +1,50 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You 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
*
* Copyright (c) 2005-2013 Oracle and/or its affiliates. All rights reserved.
* http://www.apache.org/licenses/LICENSE-2.0
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common Development
* and Distribution License("CDDL") (collectively, the "License"). You
* may not use this file except in compliance with the License. You can
* obtain a copy of the License at
* https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
* or packager/legal/LICENSE.txt. See the License for the specific
* language governing permissions and limitations under the License.
*
* When distributing the software, include this License Header Notice in each
* file and include the License file at packager/legal/LICENSE.txt.
*
* GPL Classpath Exception:
* Oracle designates this particular file as subject to the "Classpath"
* exception as provided by Oracle in the GPL Version 2 section of the License
* file that accompanied this code.
*
* Modifications:
* If applicable, add the following below the License Header, with the fields
* enclosed by brackets [] replaced by your own identifying information:
* "Portions Copyright [year] [name of copyright owner]"
*
* Contributor(s):
* If you wish your version of this file to be governed by only the CDDL or
* only the GPL Version 2, indicate your decision by adding "[Contributor]
* elects to include this software in this distribution under the [CDDL or GPL
* Version 2] license." If you don't indicate a single choice of license, a
* recipient has the option to distribute your version of this file under
* either the CDDL, the GPL Version 2 or to extend the choice of license to
* its licensees as provided above. However, if you add GPL Version 2 code
* and therefore, elected the GPL Version 2 license, then the option applies
* only if the new code is made subject to such option by the copyright
* holder.
* 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 javax.annotation.processing;

import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
import static java.lang.annotation.ElementType.CONSTRUCTOR;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.LOCAL_VARIABLE;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.PACKAGE;
import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.RetentionPolicy.SOURCE;

/**
* The Generated annotation is used to mark source code that has been generated.
* It can also be used to differentiate user written code from generated code
* in a single file. When used, the value element must have the name of the
* code generator. The recommended convention is to use the fully qualified
* name of the code generator in the value field .
* <p>For example: com.company.package.classname.
* The date element is used to indicate the date the source was generated.
* The date element must follow the ISO 8601 standard. For example the date
* element would have the following value 2001-07-04T12:08:56.235-0700
* which represents 2001-07-04 12:08:56 local time in the U.S. Pacific
* Time time zone.</p>
* <p>The comment element is a place holder for any comments that the code
* generator may want to include in the generated code.</p>
* Used to identify generated code.
*
* @since Common Annotations 1.0
*/

@Documented
@Retention(SOURCE)
@Target({PACKAGE, TYPE, ANNOTATION_TYPE, METHOD, CONSTRUCTOR, FIELD,
LOCAL_VARIABLE, PARAMETER})
@Target({ ElementType.ANNOTATION_TYPE, ElementType.CONSTRUCTOR, ElementType.FIELD, ElementType.LOCAL_VARIABLE,
ElementType.METHOD, ElementType.PACKAGE, ElementType.PARAMETER, ElementType.TYPE })
@Retention(RetentionPolicy.SOURCE)
public @interface Generated {
/**
* The value element MUST have the name of the code generator.
* The recommended convention is to use the fully qualified name of the
* code generator. For example: com.acme.generator.CodeGen.
* @return The name of the code generator. It is recommended that the fully qualified name of the code generator is
* used.
*/
String[] value();

/**
* Date when the source was generated.
* @return The date the code was generated
*/
String date() default "";

/**
* A place holder for any comments that the code generator may want to
* include in the generated code.
* @return Additional comments (if any) related to the code generation
*/
String comments() default "";
}

}
Loading

0 comments on commit 2987787

Please sign in to comment.