diff --git a/.github/workflows/build-project.yml b/.github/workflows/build-project.yml index da1aa94..ba64df9 100644 --- a/.github/workflows/build-project.yml +++ b/.github/workflows/build-project.yml @@ -17,7 +17,7 @@ jobs: build: name: Build runs-on: ubuntu-latest - timeout-minutes: 30 + timeout-minutes: 15 steps: - name: Checkout diff --git a/.github/workflows/release-project.yml b/.github/workflows/release-project.yml index 83fa670..c160f8f 100644 --- a/.github/workflows/release-project.yml +++ b/.github/workflows/release-project.yml @@ -12,7 +12,7 @@ jobs: push_to_registry: name: Build and publish runs-on: ubuntu-latest - timeout-minutes: 30 + timeout-minutes: 15 steps: - name: Checkout diff --git a/.github/workflows/sonarcloud-analysis.yml b/.github/workflows/sonarcloud-analysis.yml index 76f49a7..b6ca6a0 100644 --- a/.github/workflows/sonarcloud-analysis.yml +++ b/.github/workflows/sonarcloud-analysis.yml @@ -21,7 +21,7 @@ jobs: build: name: SonarCloud runs-on: ubuntu-latest - timeout-minutes: 30 + timeout-minutes: 15 if: ${{ (github.event_name != 'pull_request_target' && github.actor != 'dependabot[bot]') || (github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target') }} steps: diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 41d8213..61a2ef1 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar diff --git a/pom.xml b/pom.xml index b63f131..501c0af 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ SPDX-License-Identifier: Apache-2.0 0.0.4 0.9.1 - 2.10.3.Final + 2.12.1.Final 2.0.0 0.9.1 diff --git a/riseclipse/pom.xml b/riseclipse/pom.xml index 577f66a..d83c2b6 100644 --- a/riseclipse/pom.xml +++ b/riseclipse/pom.xml @@ -45,7 +45,11 @@ SPDX-License-Identifier: Apache-2.0 local-eclipse-p2-mirror + Local Eclipse P2 Mirror file:///${riseclipse.p2.root}/target/maven/repository/final + + false + @@ -120,6 +124,11 @@ SPDX-License-Identifier: Apache-2.0 org.eclipse.platform org.eclipse.equinox.common + + + org.eclipse.ocl + org.eclipse.ocl.examples.xtext.serializer + diff --git a/riseclipse/riseclipse-p2-to-m2/pom.xml b/riseclipse/riseclipse-p2-to-m2/pom.xml index f68786a..b1d9bed 100644 --- a/riseclipse/riseclipse-p2-to-m2/pom.xml +++ b/riseclipse/riseclipse-p2-to-m2/pom.xml @@ -39,7 +39,7 @@ SPDX-License-Identifier: Apache-2.0 Eclipse platform p2 - http://download.eclipse.org/releases/2020-06/ + https://download.eclipse.org/releases/2020-06/ CBI aggregator