[#454] Rename the semver package

- org.eclipse.embedcdt.core.zafarkhaja.semver

Author: ilg-ul

plugins/org.eclipse.embedcdt.core/META-INF/MANIFEST.MF

@@ -8,7 +8,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %bundle.vendor
 Bundle-Localization: plugin
-Export-Package: com.github.zafarkhaja.semver;
+Export-Package: liqp;version="0.6.8";
   x-friends:="org.eclipse.embedcdt,
    org.eclipse.embedcdt.codered,
    org.eclipse.embedcdt.codered.ui,
@@ -58,7 +58,9 @@ Export-Package: com.github.zafarkhaja.semver;
    org.eclipse.embedcdt.templates.stm,
    org.eclipse.embedcdt.templates.stm.ui,
    org.eclipse.embedcdt.ui",
- com.github.zafarkhaja.semver.expr;
+ org.eclipse.embedcdt.core,
+ org.eclipse.embedcdt.core.preferences,
+ org.eclipse.embedcdt.core.zafarkhaja.semver;
   x-friends:="org.eclipse.embedcdt,
    org.eclipse.embedcdt.codered,
    org.eclipse.embedcdt.codered.ui,
@@ -108,7 +110,7 @@ Export-Package: com.github.zafarkhaja.semver;
    org.eclipse.embedcdt.templates.stm,
    org.eclipse.embedcdt.templates.stm.ui,
    org.eclipse.embedcdt.ui",
- liqp;version="0.6.8";
+ org.eclipse.embedcdt.core.zafarkhaja.semver.expr;
   x-friends:="org.eclipse.embedcdt,
    org.eclipse.embedcdt.codered,
    org.eclipse.embedcdt.codered.ui,
@@ -158,8 +160,6 @@ Export-Package: com.github.zafarkhaja.semver;
    org.eclipse.embedcdt.templates.stm,
    org.eclipse.embedcdt.templates.stm.ui,
    org.eclipse.embedcdt.ui",
- org.eclipse.embedcdt.core,
- org.eclipse.embedcdt.core.preferences,
  org.json.simple;version="1.1.1";
   x-friends:="org.eclipse.embedcdt.debug.gdbjtag.core,
    org.eclipse.embedcdt,

plugins/org.eclipse.embedcdt.core/src/README.md

@@ -4,10 +4,14 @@ The semantic versioning code is included as source code from:
 
 - https://github.com/zafarkhaja/jsemver
 
+To avoid problems while re-exporting the packages 
+(as per https://github.com/eclipse-embed-cdt/eclipse-plugins/issues/453#issuecomment-739520632)
+they were renamed to the project name space.
+
 To compare versions, use:
 
 ```java
-import com.github.zafarkhaja.semver.Version;
+import org.eclipse.embedcdt.core.zafarkhaja.semver.Version;
 
 Version v1 = Version.valueOf("1.0.0-rc.1+build.1");
 Version v2 = Version.valueOf("1.3.7+build.2.b8f12d7");

plugins/org.eclipse.embedcdt.core/src/org/eclipse/embedcdt/core/XpackUtils.java

@@ -27,8 +27,7 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
-
-import com.github.zafarkhaja.semver.Version;
+import org.eclipse.embedcdt.core.zafarkhaja.semver.Version;
 
 public class XpackUtils {
 

plugins/org.eclipse.embedcdt.core/src/com/github/zafarkhaja/semver/MetadataVersion.java renamed to plugins/org.eclipse.embedcdt.core/src/org/eclipse/embedcdt/core/zafarkhaja/semver/MetadataVersion.java

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.github.zafarkhaja.semver;
+package org.eclipse.embedcdt.core.zafarkhaja.semver;
 
 import java.util.Arrays;
 

plugins/org.eclipse.embedcdt.core/src/com/github/zafarkhaja/semver/NormalVersion.java renamed to plugins/org.eclipse.embedcdt.core/src/org/eclipse/embedcdt/core/zafarkhaja/semver/NormalVersion.java

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.github.zafarkhaja.semver;
+package org.eclipse.embedcdt.core.zafarkhaja.semver;
 
 /**
  * The {@code NormalVersion} class represents the version core.

plugins/org.eclipse.embedcdt.core/src/com/github/zafarkhaja/semver/ParseException.java renamed to plugins/org.eclipse.embedcdt.core/src/org/eclipse/embedcdt/core/zafarkhaja/semver/ParseException.java

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.github.zafarkhaja.semver;
+package org.eclipse.embedcdt.core.zafarkhaja.semver;
 
 /**
  * Thrown to indicate an error during the parsing.

plugins/org.eclipse.embedcdt.core/src/com/github/zafarkhaja/semver/Parser.java renamed to plugins/org.eclipse.embedcdt.core/src/org/eclipse/embedcdt/core/zafarkhaja/semver/Parser.java

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.github.zafarkhaja.semver;
+package org.eclipse.embedcdt.core.zafarkhaja.semver;
 
 /**
  * A parser interface.

plugins/org.eclipse.embedcdt.core/src/com/github/zafarkhaja/semver/UnexpectedCharacterException.java renamed to plugins/org.eclipse.embedcdt.core/src/org/eclipse/embedcdt/core/zafarkhaja/semver/UnexpectedCharacterException.java

@@ -21,12 +21,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.github.zafarkhaja.semver;
+package org.eclipse.embedcdt.core.zafarkhaja.semver;
 
-import com.github.zafarkhaja.semver.VersionParser.CharType;
-import com.github.zafarkhaja.semver.util.UnexpectedElementException;
 import java.util.Arrays;
 
+import org.eclipse.embedcdt.core.zafarkhaja.semver.VersionParser.CharType;
+import org.eclipse.embedcdt.core.zafarkhaja.semver.util.UnexpectedElementException;
+
 /**
  * Thrown when attempting to consume a character of unexpected types.
  *

plugins/org.eclipse.embedcdt.core/src/com/github/zafarkhaja/semver/Version.java renamed to plugins/org.eclipse.embedcdt.core/src/org/eclipse/embedcdt/core/zafarkhaja/semver/Version.java

@@ -21,14 +21,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.github.zafarkhaja.semver;
+package org.eclipse.embedcdt.core.zafarkhaja.semver;
 
-import com.github.zafarkhaja.semver.expr.Expression;
-import com.github.zafarkhaja.semver.expr.ExpressionParser;
-import com.github.zafarkhaja.semver.expr.LexerException;
-import com.github.zafarkhaja.semver.expr.UnexpectedTokenException;
 import java.util.Comparator;
 
+import org.eclipse.embedcdt.core.zafarkhaja.semver.expr.Expression;
+import org.eclipse.embedcdt.core.zafarkhaja.semver.expr.ExpressionParser;
+import org.eclipse.embedcdt.core.zafarkhaja.semver.expr.LexerException;
+import org.eclipse.embedcdt.core.zafarkhaja.semver.expr.UnexpectedTokenException;
+
 /**
  * The {@code Version} class is the main class of the Java SemVer library.
  *

plugins/org.eclipse.embedcdt.core/src/com/github/zafarkhaja/semver/VersionParser.java renamed to plugins/org.eclipse.embedcdt.core/src/org/eclipse/embedcdt/core/zafarkhaja/semver/VersionParser.java

@@ -21,14 +21,16 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.github.zafarkhaja.semver;
+package org.eclipse.embedcdt.core.zafarkhaja.semver;
+
+import static org.eclipse.embedcdt.core.zafarkhaja.semver.VersionParser.CharType.*;
 
-import com.github.zafarkhaja.semver.util.Stream;
-import com.github.zafarkhaja.semver.util.UnexpectedElementException;
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
-import static com.github.zafarkhaja.semver.VersionParser.CharType.*;
+
+import org.eclipse.embedcdt.core.zafarkhaja.semver.util.Stream;
+import org.eclipse.embedcdt.core.zafarkhaja.semver.util.UnexpectedElementException;
 
 /**
  * A parser for the SemVer Version.

plugins/org.eclipse.embedcdt.core/src/com/github/zafarkhaja/semver/expr/And.java renamed to plugins/org.eclipse.embedcdt.core/src/org/eclipse/embedcdt/core/zafarkhaja/semver/expr/And.java

@@ -21,9 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.github.zafarkhaja.semver.expr;
+package org.eclipse.embedcdt.core.zafarkhaja.semver.expr;
 
-import com.github.zafarkhaja.semver.Version;
+import org.eclipse.embedcdt.core.zafarkhaja.semver.Version;
 
 /**
  * Expression for the logical "and" operator.

plugins/org.eclipse.embedcdt.core/src/com/github/zafarkhaja/semver/expr/CompositeExpression.java renamed to plugins/org.eclipse.embedcdt.core/src/org/eclipse/embedcdt/core/zafarkhaja/semver/expr/CompositeExpression.java

@@ -21,11 +21,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.github.zafarkhaja.semver.expr;
+package org.eclipse.embedcdt.core.zafarkhaja.semver.expr;
 
-import com.github.zafarkhaja.semver.ParseException;
-import com.github.zafarkhaja.semver.UnexpectedCharacterException;
-import com.github.zafarkhaja.semver.Version;
+import org.eclipse.embedcdt.core.zafarkhaja.semver.ParseException;
+import org.eclipse.embedcdt.core.zafarkhaja.semver.UnexpectedCharacterException;
+import org.eclipse.embedcdt.core.zafarkhaja.semver.Version;
 
 /**
  * This class implements internal DSL for the SemVer Expressions using fluent

plugins/org.eclipse.embedcdt.core/src/com/github/zafarkhaja/semver/expr/Equal.java renamed to plugins/org.eclipse.embedcdt.core/src/org/eclipse/embedcdt/core/zafarkhaja/semver/expr/Equal.java

@@ -21,9 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.github.zafarkhaja.semver.expr;
+package org.eclipse.embedcdt.core.zafarkhaja.semver.expr;
 
-import com.github.zafarkhaja.semver.Version;
+import org.eclipse.embedcdt.core.zafarkhaja.semver.Version;
 
 /**
  * Expression for the comparison "equal" operator.

plugins/org.eclipse.embedcdt.core/src/com/github/zafarkhaja/semver/expr/Expression.java renamed to plugins/org.eclipse.embedcdt.core/src/org/eclipse/embedcdt/core/zafarkhaja/semver/expr/Expression.java

@@ -21,9 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.github.zafarkhaja.semver.expr;
+package org.eclipse.embedcdt.core.zafarkhaja.semver.expr;
 
-import com.github.zafarkhaja.semver.Version;
+import org.eclipse.embedcdt.core.zafarkhaja.semver.Version;
 
 /**
  * The {@code Expression} interface is to be implemented by the nodes of the

plugins/org.eclipse.embedcdt.core/src/com/github/zafarkhaja/semver/expr/ExpressionParser.java renamed to plugins/org.eclipse.embedcdt.core/src/org/eclipse/embedcdt/core/zafarkhaja/semver/expr/ExpressionParser.java

@@ -21,18 +21,20 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.github.zafarkhaja.semver.expr;
+package org.eclipse.embedcdt.core.zafarkhaja.semver.expr;
+
+import static org.eclipse.embedcdt.core.zafarkhaja.semver.expr.CompositeExpression.Helper.*;
+import static org.eclipse.embedcdt.core.zafarkhaja.semver.expr.Lexer.Token.Type.*;
 
-import com.github.zafarkhaja.semver.Parser;
-import com.github.zafarkhaja.semver.Version;
-import com.github.zafarkhaja.semver.expr.Lexer.Token;
-import com.github.zafarkhaja.semver.util.Stream;
-import com.github.zafarkhaja.semver.util.Stream.ElementType;
-import com.github.zafarkhaja.semver.util.UnexpectedElementException;
 import java.util.EnumSet;
 import java.util.Iterator;
-import static com.github.zafarkhaja.semver.expr.CompositeExpression.Helper.*;
-import static com.github.zafarkhaja.semver.expr.Lexer.Token.Type.*;
+
+import org.eclipse.embedcdt.core.zafarkhaja.semver.Parser;
+import org.eclipse.embedcdt.core.zafarkhaja.semver.Version;
+import org.eclipse.embedcdt.core.zafarkhaja.semver.expr.Lexer.Token;
+import org.eclipse.embedcdt.core.zafarkhaja.semver.util.Stream;
+import org.eclipse.embedcdt.core.zafarkhaja.semver.util.UnexpectedElementException;
+import org.eclipse.embedcdt.core.zafarkhaja.semver.util.Stream.ElementType;
 
 /**
  * A parser for the SemVer Expressions.

plugins/org.eclipse.embedcdt.core/src/com/github/zafarkhaja/semver/expr/Greater.java renamed to plugins/org.eclipse.embedcdt.core/src/org/eclipse/embedcdt/core/zafarkhaja/semver/expr/Greater.java

@@ -21,9 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.github.zafarkhaja.semver.expr;
+package org.eclipse.embedcdt.core.zafarkhaja.semver.expr;
 
-import com.github.zafarkhaja.semver.Version;
+import org.eclipse.embedcdt.core.zafarkhaja.semver.Version;
 
 /**
  * Expression for the comparison "greater than" operator.

plugins/org.eclipse.embedcdt.core/src/com/github/zafarkhaja/semver/expr/GreaterOrEqual.java renamed to plugins/org.eclipse.embedcdt.core/src/org/eclipse/embedcdt/core/zafarkhaja/semver/expr/GreaterOrEqual.java

@@ -21,9 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.github.zafarkhaja.semver.expr;
+package org.eclipse.embedcdt.core.zafarkhaja.semver.expr;
 
-import com.github.zafarkhaja.semver.Version;
+import org.eclipse.embedcdt.core.zafarkhaja.semver.Version;
 
 /**
  * Expression for the comparison "greater than or equal to" operator.

plugins/org.eclipse.embedcdt.core/src/com/github/zafarkhaja/semver/expr/Less.java renamed to plugins/org.eclipse.embedcdt.core/src/org/eclipse/embedcdt/core/zafarkhaja/semver/expr/Less.java

@@ -21,9 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.github.zafarkhaja.semver.expr;
+package org.eclipse.embedcdt.core.zafarkhaja.semver.expr;
 
-import com.github.zafarkhaja.semver.Version;
+import org.eclipse.embedcdt.core.zafarkhaja.semver.Version;
 
 /**
  * Expression for the comparison "less than" operator.

plugins/org.eclipse.embedcdt.core/src/com/github/zafarkhaja/semver/expr/LessOrEqual.java renamed to plugins/org.eclipse.embedcdt.core/src/org/eclipse/embedcdt/core/zafarkhaja/semver/expr/LessOrEqual.java

@@ -21,9 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.github.zafarkhaja.semver.expr;
+package org.eclipse.embedcdt.core.zafarkhaja.semver.expr;
 
-import com.github.zafarkhaja.semver.Version;
+import org.eclipse.embedcdt.core.zafarkhaja.semver.Version;
 
 /**
  * Expression for the comparison "less than or equal to" operator.

plugins/org.eclipse.embedcdt.core/src/com/github/zafarkhaja/semver/expr/Lexer.java renamed to plugins/org.eclipse.embedcdt.core/src/org/eclipse/embedcdt/core/zafarkhaja/semver/expr/Lexer.java

@@ -21,14 +21,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.github.zafarkhaja.semver.expr;
+package org.eclipse.embedcdt.core.zafarkhaja.semver.expr;
 
-import com.github.zafarkhaja.semver.util.Stream;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.eclipse.embedcdt.core.zafarkhaja.semver.util.Stream;
+
 /**
  * A lexer for the SemVer Expressions.
  *

plugins/org.eclipse.embedcdt.core/src/com/github/zafarkhaja/semver/expr/LexerException.java renamed to plugins/org.eclipse.embedcdt.core/src/org/eclipse/embedcdt/core/zafarkhaja/semver/expr/LexerException.java

@@ -21,9 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.github.zafarkhaja.semver.expr;
+package org.eclipse.embedcdt.core.zafarkhaja.semver.expr;
 
-import com.github.zafarkhaja.semver.ParseException;
+import org.eclipse.embedcdt.core.zafarkhaja.semver.ParseException;
 
 /**
  * Thrown during the lexical analysis when an illegal character is encountered.

plugins/org.eclipse.embedcdt.core/src/com/github/zafarkhaja/semver/expr/Not.java renamed to plugins/org.eclipse.embedcdt.core/src/org/eclipse/embedcdt/core/zafarkhaja/semver/expr/Not.java

@@ -21,9 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.github.zafarkhaja.semver.expr;
+package org.eclipse.embedcdt.core.zafarkhaja.semver.expr;
 
-import com.github.zafarkhaja.semver.Version;
+import org.eclipse.embedcdt.core.zafarkhaja.semver.Version;
 
 /**
  * Expression for the logical "negation" operator.

plugins/org.eclipse.embedcdt.core/src/com/github/zafarkhaja/semver/expr/NotEqual.java renamed to plugins/org.eclipse.embedcdt.core/src/org/eclipse/embedcdt/core/zafarkhaja/semver/expr/NotEqual.java

@@ -21,9 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.github.zafarkhaja.semver.expr;
+package org.eclipse.embedcdt.core.zafarkhaja.semver.expr;
 
-import com.github.zafarkhaja.semver.Version;
+import org.eclipse.embedcdt.core.zafarkhaja.semver.Version;
 
 /**
  * Expression for the comparison "not equal" operator.

plugins/org.eclipse.embedcdt.core/src/com/github/zafarkhaja/semver/expr/Or.java renamed to plugins/org.eclipse.embedcdt.core/src/org/eclipse/embedcdt/core/zafarkhaja/semver/expr/Or.java

@@ -21,9 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.github.zafarkhaja.semver.expr;
+package org.eclipse.embedcdt.core.zafarkhaja.semver.expr;
 
-import com.github.zafarkhaja.semver.Version;
+import org.eclipse.embedcdt.core.zafarkhaja.semver.Version;
 
 /**
  * Expression for the logical "or" operator.

plugins/org.eclipse.embedcdt.core/src/com/github/zafarkhaja/semver/expr/UnexpectedTokenException.java renamed to plugins/org.eclipse.embedcdt.core/src/org/eclipse/embedcdt/core/zafarkhaja/semver/expr/UnexpectedTokenException.java

@@ -21,13 +21,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.github.zafarkhaja.semver.expr;
+package org.eclipse.embedcdt.core.zafarkhaja.semver.expr;
 
-import com.github.zafarkhaja.semver.ParseException;
-import com.github.zafarkhaja.semver.expr.Lexer.Token;
-import com.github.zafarkhaja.semver.util.UnexpectedElementException;
 import java.util.Arrays;
 
+import org.eclipse.embedcdt.core.zafarkhaja.semver.ParseException;
+import org.eclipse.embedcdt.core.zafarkhaja.semver.expr.Lexer.Token;
+import org.eclipse.embedcdt.core.zafarkhaja.semver.util.UnexpectedElementException;
+
 /**
  * Thrown when a token of unexpected types is encountered during the parsing.
  *

plugins/org.eclipse.embedcdt.core/src/com/github/zafarkhaja/semver/expr/package-info.java renamed to plugins/org.eclipse.embedcdt.core/src/org/eclipse/embedcdt/core/zafarkhaja/semver/expr/package-info.java

@@ -31,4 +31,4 @@
  * @author Zafar Khaja <[email protected]>
  * @since 0.7.0
  */
-package com.github.zafarkhaja.semver.expr;
+package org.eclipse.embedcdt.core.zafarkhaja.semver.expr;

plugins/org.eclipse.embedcdt.core/src/com/github/zafarkhaja/semver/package-info.java renamed to plugins/org.eclipse.embedcdt.core/src/org/eclipse/embedcdt/core/zafarkhaja/semver/package-info.java

@@ -32,4 +32,4 @@
  * @author Zafar Khaja <[email protected]>
  * @since 0.1.0
  */
-package com.github.zafarkhaja.semver;
+package org.eclipse.embedcdt.core.zafarkhaja.semver;