Skip to content

Commit 95ac7e1

Browse files
author
Dennis Labordus
authored
Merge pull request #124 from com-pas/develop
New release
2 parents 38851af + 8eb2fb9 commit 95ac7e1

File tree

7 files changed

+19
-10
lines changed

7 files changed

+19
-10
lines changed

.github/workflows/build-project.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
build:
1818
name: Build
1919
runs-on: ubuntu-latest
20-
timeout-minutes: 30
20+
timeout-minutes: 15
2121

2222
steps:
2323
- name: Checkout

.github/workflows/release-project.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
push_to_registry:
1313
name: Build and publish
1414
runs-on: ubuntu-latest
15-
timeout-minutes: 30
15+
timeout-minutes: 15
1616

1717
steps:
1818
- name: Checkout

.github/workflows/sonarcloud-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
build:
2222
name: SonarCloud
2323
runs-on: ubuntu-latest
24-
timeout-minutes: 30
24+
timeout-minutes: 15
2525

2626
if: ${{ (github.event_name != 'pull_request_target' && github.actor != 'dependabot[bot]') || (github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target') }}
2727
steps:

.mvn/wrapper/maven-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
# KIND, either express or implied. See the License for the
1515
# specific language governing permissions and limitations
1616
# under the License.
17-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
18-
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar
17+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip
18+
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ SPDX-License-Identifier: Apache-2.0
2424
<sonarqube-plugin.version>3.2.0</sonarqube-plugin.version>
2525

2626
<compas.scl.xsd.version>0.0.4</compas.scl.xsd.version>
27-
<compas.core.version>0.9.1</compas.core.version>
27+
<compas.core.version>0.9.3</compas.core.version>
2828

29-
<quarkus.platform.version>2.10.3.Final</quarkus.platform.version>
30-
<slf4j.version>2.0.0</slf4j.version>
29+
<quarkus.platform.version>2.12.2.Final</quarkus.platform.version>
30+
<slf4j.version>2.0.1</slf4j.version>
3131
<openpojo.version>0.9.1</openpojo.version>
3232
</properties>
3333

@@ -181,7 +181,7 @@ SPDX-License-Identifier: Apache-2.0
181181
<plugin>
182182
<groupId>org.apache.maven.plugins</groupId>
183183
<artifactId>maven-jar-plugin</artifactId>
184-
<version>3.2.2</version>
184+
<version>3.3.0</version>
185185
<executions>
186186
<execution>
187187
<goals>

riseclipse/pom.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,11 @@ SPDX-License-Identifier: Apache-2.0
4545
<repositories>
4646
<repository>
4747
<id>local-eclipse-p2-mirror</id>
48+
<name>Local Eclipse P2 Mirror</name>
4849
<url>file:///${riseclipse.p2.root}/target/maven/repository/final</url>
50+
<snapshots>
51+
<enabled>false</enabled>
52+
</snapshots>
4953
</repository>
5054
</repositories>
5155

@@ -120,6 +124,11 @@ SPDX-License-Identifier: Apache-2.0
120124
<groupId>org.eclipse.platform</groupId>
121125
<artifactId>org.eclipse.equinox.common</artifactId>
122126
</exclusion>
127+
<exclusion>
128+
<!-- optional dependency, not needed -->
129+
<groupId>org.eclipse.ocl</groupId>
130+
<artifactId>org.eclipse.ocl.examples.xtext.serializer</artifactId>
131+
</exclusion>
123132
</exclusions>
124133
</dependency>
125134
<dependency>

riseclipse/riseclipse-p2-to-m2/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ SPDX-License-Identifier: Apache-2.0
3939
<!-- This is the platform used to run the aggregator, not the one where artifacts are fetched -->
4040
<id>Eclipse platform</id>
4141
<layout>p2</layout>
42-
<url>http://download.eclipse.org/releases/2020-06/</url>
42+
<url>https://download.eclipse.org/releases/2020-06/</url>
4343
</repository>
4444
<repository>
4545
<id>CBI aggregator</id>

0 commit comments

Comments
 (0)