Bug 581504: Remove ip_log.xml use/requirement
With the new tooling from EF (e.g. dash license tool) we
no longer need to maintain ip_log.xml in Orbit.
We aren't deleting all exiting ip_log.xml files as
that would cause all existing bundles to have their
qualifiers touched which is undesirable. (We could
exclude ip_log.xml from jgit timestamp, but that leads
to some special cases that aren't worth the effort.)
The EBR plug-ins provide the ip_log.xml verification,
therefore, besides documentation updates, this simply
bumps to the newest EBR version that requires EBR
PR https://github.com/eclipse/ebr/pull/61 to be
merged and built.
Change-Id: Ia0f814edea57984f71aac342f4fd973d8bf5fe56
diff --git a/README.md b/README.md
index 3823106..994d334 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
Eclipse Orbit Recipes
=====================
-This repositories hosts recipes for building OSGi bundles as part of the Eclipse Orbit project. This repository is based on functionality provided by the [Eclipse EBR project](https://github.com/eclipse/ebr).
+This repositories hosts recipes for building OSGi bundles as part of the Eclipse Orbit project. This repository is based on functionality provided by the [Eclipse EBR maven plug-ins](https://github.com/eclipse/ebr).
The Very Short Version
@@ -17,7 +17,7 @@
This project uses Maven for assembling of OSGi bundles based on artifacts in Maven Central or
any other accessible Maven repository.
-1. Install Java (JDK 8 preferred) and Maven.
+1. Install Java 11 (Java 8 and Java 17 don't work) and Maven.
2. Clone this repository and go into the repository root folder.
Please ensure you cloned using the [Gerrit URL](https://wiki.eclipse.org/Gerrit#Gerrit_push_URL).
@@ -69,7 +69,7 @@
* [Bundle Checklist](https://wiki.eclipse.org/Orbit_Bundle_Checklist)
* [Additional articles](https://wiki.eclipse.org/Category:Orbit)
-It's important to ensure that the bundle you're adding has been approved for use in at least one other Eclipse project on [IPZilla](https://dev.eclipse.org/ipzilla/query.cgi) or [ClearlyDefined](https://clearlydefined.io/). In the latter case, please ensure the license is compatible and that the license score is at least 60. See [IP Prereq Diligence](https://www.eclipse.org/projects/handbook/#ip-prereq-diligence) for further details.
+It's important to ensure that the bundle you're adding has been approved for use. See [IP Provenance](https://wiki.eclipse.org/Orbit/Bundle_Checklist#IP_Provenance) for some instructions. See [IP Prereq Diligence](https://www.eclipse.org/projects/handbook/#ip-prereq-diligence) for further details.
### 1. Pick a Category
@@ -102,17 +102,6 @@
# (note the -DirtyWorkingTree=ignore to ignore uncommitted Git changes for now)
mvn -U clean package -DdirtyWorkingTree=warning
- # hidden gem: automatically create a CQ for an Eclipse project
- # (use carefully, creates the CQ if none is referenced in the ip_log.xml file)
- # mvn -V clean package -DsubmitCqsToProject=<Eclipse.project.id> -DcqCryptography=<Yes|No|Unknown|Explanation> -DdirtyWorkingTree=warning
- # (once the CQ is created, source to upload can be found in 'target/sources-for-eclipse-ipzilla')
- # (after uploading the source, wait for approval)
-
- # enter any non-PB CQ number into the IP log and add any missing information (your name, e-mail etc.)
- # You may also specify a ClearlyDefined URL (if present) by replacing the <ipzilla bug_id=""/> with <clearlydefined url="https://clearlydefined.io/definitions/maven/mavencentral/com.example.group/artifact/x.y.z" (of course replacing the URL with the appropriate one for the bundle you're adding)
-
- $EDITOR src/eclipse/ip_log.xml
-
# review the generated about files
ls -la src/main/resources/about_files
cat src/main/resources/about.html
diff --git a/releng/mavenparent/pom.xml b/releng/mavenparent/pom.xml
index a2c1b5b..7224ca3 100644
--- a/releng/mavenparent/pom.xml
+++ b/releng/mavenparent/pom.xml
@@ -64,7 +64,7 @@
<maven-dependency-version>3.3.0</maven-dependency-version>
<!-- versions of the EBR plug-in to use -->
- <ebr-version>1.4.0-SNAPSHOT</ebr-version>
+ <ebr-version>2.0.0-SNAPSHOT</ebr-version>
<!-- force update of Eclipse IP info on every execution -->
<forceIpFilesUpdate>false</forceIpFilesUpdate>
