Skip to content

Commit e9b7fe5

Browse files
kolipakakondalkolipakakondal
committed
Merge branch 'v2.1.2' into 'master'
V2.1.2 See merge request idf/idf-eclipse-plugin!130
2 parents c70994c + eebb998 commit e9b7fe5

File tree

8 files changed

+15
-26
lines changed

8 files changed

+15
-26
lines changed

‎.gitlab-ci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ image: ${CI_DOCKER_REGISTRY}/esp32-ci-env
77

88
variables:
99
ARCHIVE_DIR: "dist"
10-
ORIGIN_NAME: "com.espressif.idf.update-2.1.1-SNAPSHOT.zip"
10+
ORIGIN_NAME: "com.espressif.idf.update-2.1.2-SNAPSHOT.zip"
1111

1212
.add_gh_key_remote: &add_gh_key_remote |
1313
cit_add_ssh_key "${GH_PUSH_KEY}"
@@ -32,7 +32,7 @@ build:
3232
# Use an unique name for the archive
3333
- UNIQ_SUFFIX="$(git describe --tags --dirty --abbrev=8)"
3434
- mkdir -p ${ARCHIVE_DIR} && echo "${UNIQ_SUFFIX}" > ${ARCHIVE_DIR}/uniq_suffix_value
35-
- ARCHIVE_NAME=${ORIGIN_NAME/2.1.1-SNAPSHOT/$UNIQ_SUFFIX}
35+
- ARCHIVE_NAME=${ORIGIN_NAME/2.1.2-SNAPSHOT/$UNIQ_SUFFIX}
3636
# build
3737
- export JARSIGNER_KEYSTORE_B64=${JARSIGNER_REL_KEYSTORE_B64:-${JARSIGNER_DEV_KEYSTORE_B64}}
3838
- export JARSIGNER_STOREPASS=${JARSIGNER_REL_STOREPASS:-${JARSIGNER_DEV_STOREPASS}}
@@ -53,7 +53,7 @@ build:
5353
script:
5454
# getting the corresponding unique suffix
5555
- UNIQ_SUFFIX=$(cat ${ARCHIVE_DIR}/uniq_suffix_value)
56-
- ARCHIVE_NAME=${ORIGIN_NAME/2.1.1-SNAPSHOT/$UNIQ_SUFFIX}
56+
- ARCHIVE_NAME=${ORIGIN_NAME/2.1.2-SNAPSHOT/$UNIQ_SUFFIX}
5757
# upload archive
5858
- cit_add_ssh_key "${SRV_KEY}"
5959
- cd ${ARCHIVE_DIR}

‎bundles/com.espressif.idf.branding/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: com.espressif.idf.branding;singleton:=true
5-
Bundle-Version: 2.1.1.qualifier
5+
Bundle-Version: 2.1.2.qualifier
66
Bundle-Vendor: %providerName
77
Bundle-Localization: plugin
88
Bundle-RequiredExecutionEnvironment: JavaSE-11

‎bundles/com.espressif.idf.branding/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55
<artifactId>com.espressif.idf.branding</artifactId>
6-
<version>2.1.1-SNAPSHOT</version>
6+
<version>2.1.2-SNAPSHOT</version>
77
<packaging>eclipse-plugin</packaging>
88

99
<parent>

‎features/com.espressif.idf.feature/feature.xml‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<feature
33
id="com.espressif.idf.feature"
44
label="Espressif IDF Plugins for Eclipse"
5-
version="2.1.1.qualifier"
5+
version="2.1.2.qualifier"
66
provider-name="ESPRESSIF SYSTEMS (SHANGHAI) CO., LTD"
77
plugin="com.espressif.idf.branding">
88

@@ -265,11 +265,4 @@ You may add additional accurate notices of copyright ownership.
265265
version="0.0.0"
266266
unpack="false"/>
267267

268-
<plugin
269-
id="org.eclipse.equinox.simpleconfigurator"
270-
download-size="0"
271-
install-size="0"
272-
version="0.0.0"
273-
unpack="false"/>
274-
275268
</feature>

‎features/com.espressif.idf.feature/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>com.espressif.idf.feature</groupId>
66
<artifactId>com.espressif.idf.feature</artifactId>
7-
<version>2.1.1-SNAPSHOT</version>
7+
<version>2.1.2-SNAPSHOT</version>
88
<packaging>eclipse-feature</packaging>
99

1010
<parent>

‎releng/com.espressif.idf.target/com.espressif.idf.target.target‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,21 @@
44
<locations>
55

66
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
7-
<unit id="org.eclipse.platform.ide" version="0.0.0"/>
7+
<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
88
<unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
9+
<unit id="org.eclipse.rcp.source.feature.group" version="0.0.0"/>
910
<unit id="org.eclipse.test.feature.group" version="0.0.0"/>
10-
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
11-
<repository location="https://download.eclipse.org/eclipse/updates/4.17/"/>
11+
<repository location="http://download.eclipse.org/eclipse/updates/latest"/>
1212
</location>
1313

1414
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
1515
<unit id="org.eclipse.cdt.feature.group" version="0.0.0"/>
1616
<unit id="org.eclipse.cdt.sdk.feature.group" version="0.0.0"/>
1717
<unit id="org.eclipse.cdt.cmake.feature.group" version="0.0.0"/>
18-
<repository location="https://download.eclipse.org/tools/cdt/releases/10.1/"/>
19-
</location>
20-
21-
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
22-
<repository location="https://download.eclipse.org/tm/updates/4.5.0/repository/"/>
2318
<unit id="org.eclipse.tm.terminal.control.feature.feature.group" version="0.0.0"/>
2419
<unit id="org.eclipse.tm.terminal.feature.feature.group" version="0.0.0"/>
2520
<unit id="org.eclipse.tm.terminal.view.feature.feature.group" version="0.0.0"/>
21+
<repository location="http://download.eclipse.org/releases/latest"/>
2622
</location>
2723

2824
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
@@ -37,15 +33,15 @@
3733

3834
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
3935
<unit id="org.eclipse.jgit.feature.group" version="0.0.0"/>
40-
<repository location="http://download.eclipse.org/releases/2020-09"/>
36+
<repository location="https://download.eclipse.org/egit/updates"/>
4137
</location>
4238

4339
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
4440
<unit id="org.eclipse.swtchart.feature.feature.group" version="0.0.0"/>
4541
<repository location="https://download.eclipse.org/swtchart/releases/0.12.0/repository"/>
4642
</location>
4743
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
48-
<repository location="https://download.eclipse.org/tools/cdt/releases/10.1/"/>
44+
<repository location="https://download.eclipse.org/tools/cdt/releases/10.3/"/>
4945
<unit id="org.eclipse.cdt.debug.gdbjtag.feature.group" version=""/>
5046
</location>
5147

‎releng/com.espressif.idf.update/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55
<artifactId>com.espressif.idf.update</artifactId>
6-
<version>2.1.1-SNAPSHOT</version>
6+
<version>2.1.2-SNAPSHOT</version>
77
<packaging>eclipse-repository</packaging>
88

99
<parent>

‎releng/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
<modules>
1919
<module>com.espressif.idf.update</module>
2020
<module>com.espressif.idf.target</module>
21-
<module>com.espressif.idf.product</module>
21+
<!-- <module>com.espressif.idf.product</module> -->
2222
</modules>
2323
</project>

0 commit comments

Comments
 (0)