Skip to content

Commit 922101c

Browse files
committed
Update Tycho & Maven
1 parent 9f63989 commit 922101c

File tree

4 files changed

+24
-7
lines changed

4 files changed

+24
-7
lines changed

.mvn/maven.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
-Dtycho.version=4.0.9
1+
-Dtycho.version=4.0.12
22
-Dtycho.p2.transport.min-cache-minutes=129600

.mvn/wrapper/maven-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
19-
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
18+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
19+
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar

CONTRIBUTING.md

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Recommended resources
1919

2020
You need:
2121
- latest version of [Eclipse IDE for Eclipse Committers](https://www.eclipse.org/downloads/packages/)
22-
- JDK 17
22+
- JDK 21
2323
- Bazelisk available as `bazel` binary in `PATH` environment
2424

2525
### Additional Plug-Ins from the Eclipse Marketplace:
@@ -41,7 +41,7 @@ As a result, modifications in the core plug-in may need adaption in BEF as well
4141
**After cloning the repository, follow these steps:**
4242

4343
- Launch the Eclipse IDE for Committers with a **new workspace**
44-
- Ensure JDK 17 is configured (*Preferences > Java > Installed JREs*)
44+
- Ensure JDK 21 is configured (*Preferences > Java > Installed JREs*)
4545
- Click *File > Import > General > Existing Projects into Workspace*
4646
- Select the `bazel-eclipse` folder as the root directory
4747
- Select **Search for nested projects** (critical step)
@@ -67,7 +67,7 @@ Once done everything should build.
6767
This will download the IntelliJ Aspects and puts them into a ZIP file for use.
6868
We don't distribute them in our source control.
6969
Note, the shell script requires a working Git and Bazel binary in the `PATH`.
70-
On MacOS, GNU Tar (`gtar`) is needed as well.
70+
On MacOS, GNU Tar (`gtar`) is needed as well (`brew install gnu-tar`).
7171

7272

7373
## Debugging
@@ -95,3 +95,20 @@ We use [GitHub Actions](https://github.com/salesforce/bazel-eclipse/actions) for
9595

9696
This is explained in more detail in the [build guide](docs/dev/thebuild.md).
9797

98+
### Command Line Build
99+
100+
To build on the command line quickly, run the following commands:
101+
102+
1. Import IJ Aspects
103+
104+
```
105+
pushd ./bundles/com.salesforce.bazel.sdk/aspects/import
106+
./import-and-build.sh
107+
popd
108+
```
109+
110+
2. Run Maven build
111+
112+
```
113+
./mvnw clean verify
114+
```

releng/mavenparent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<coretest.vmparams></coretest.vmparams>
3232
<uitest.vmparams>-Dorg.eclipse.swtbot.search.timeout=30000 -Dorg.eclipse.swtbot.screenshots.dir=target/screenshots</uitest.vmparams>
3333

34-
<tycho.version>4.0.9</tycho.version>
34+
<tycho.version>4.0.12</tycho.version>
3535

3636
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3737

0 commit comments

Comments
 (0)