From b972dd920e1f3ece9ffb1eefbaacf320692f7cba Mon Sep 17 00:00:00 2001 From: Dennis Hendriks Date: Tue, 25 Apr 2023 19:10:16 +0200 Subject: [PATCH 1/7] #35 pom.xml: formatting improvements + proper bundle name. --- pom.xml | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/pom.xml b/pom.xml index d54964f..a1657be 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,9 @@ available at https://spdx.org/licenses/LGPL-2.0-or-later.html SPDX-License-Identifier: LGPL-2.0-or-later --> - + 4.0.0 @@ -20,7 +22,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later 4.0.1-SNAPSHOT jar - com.github.javabdd + JavaBDD https://github.com/com-github-javabdd/com.github.javabdd JavaBDD: A Java library for Binary Decision Diagrams (BDDs) @@ -41,9 +43,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later - - UTF-8 - + UTF-8 @@ -86,17 +86,13 @@ SPDX-License-Identifier: LGPL-2.0-or-later true false forked-path - - -Dgpg.passphrase=${gpg.passphrase} - + -Dgpg.passphrase=${gpg.passphrase} @{project.version} org.apache.maven.scm - - maven-scm-provider-gitexe - + maven-scm-provider-gitexe 2.0.0-M3 @@ -174,25 +170,17 @@ SPDX-License-Identifier: LGPL-2.0-or-later ossrh - - https://oss.sonatype.org/content/repositories/snapshots - + https://oss.sonatype.org/content/repositories/snapshots ossrh - - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - + https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - scm:git:git://github.com/dexecutor/dependent-tasks-executor.git - - - scm:git:git@github.com:dexecutor/dexecutor.git - + scm:git:git://github.com/dexecutor/dependent-tasks-executor.git + scm:git:git@github.com:dexecutor/dexecutor.git https://github.com/com-github-javabdd/com.github.javabdd HEAD From 69929eac6879fb12644924e0f133e21d2ff08705 Mon Sep 17 00:00:00 2001 From: Dennis Hendriks Date: Tue, 25 Apr 2023 19:21:49 +0200 Subject: [PATCH 2/7] #35 Generate manifest during build + other small changes to pom.xml. - Moved 'properties' section. - Reuse Java version and source encoding properties where possible. - Added 'organization'. - Upgraded versions of used Maven plugins. --- pom.xml | 63 ++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 53 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index a1657be..af1ef9c 100644 --- a/pom.xml +++ b/pom.xml @@ -26,6 +26,11 @@ SPDX-License-Identifier: LGPL-2.0-or-later https://github.com/com-github-javabdd/com.github.javabdd JavaBDD: A Java library for Binary Decision Diagrams (BDDs) + + 11 + UTF-8 + + LGPL-2.0-or-later @@ -33,6 +38,10 @@ SPDX-License-Identifier: LGPL-2.0-or-later + + ${project.artifactId} + + dhendriks @@ -42,10 +51,6 @@ SPDX-License-Identifier: LGPL-2.0-or-later - - UTF-8 - - @@ -53,14 +58,52 @@ SPDX-License-Identifier: LGPL-2.0-or-later maven-compiler-plugin 3.10.1 - UTF-8 + ${project.build.sourceEncoding} true true - 11 + ${java.version} true true - 11 - 11 + ${java.version} + ${java.version} + + + + + org.apache.felix + maven-bundle-plugin + 5.1.8 + true + + + bundle-manifest + process-classes + + manifest + + + + + + ${project.artifactId} + lazy + JavaSE-${java.version} + + + <_noee>true + + true + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.3.0 + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + @@ -81,7 +124,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later org.apache.maven.plugins maven-release-plugin - 3.0.0-M7 + 3.0.0 true false @@ -93,7 +136,7 @@ SPDX-License-Identifier: LGPL-2.0-or-later org.apache.maven.scm maven-scm-provider-gitexe - 2.0.0-M3 + 2.0.0 From 1ec1fa9c180bf08add83d863aba0ad1d711d82ce Mon Sep 17 00:00:00 2001 From: Dennis Hendriks Date: Tue, 25 Apr 2023 19:22:26 +0200 Subject: [PATCH 3/7] #35 No longer a PDE project, just a Maven project. --- .classpath | 1 - .project | 11 ----------- META-INF/MANIFEST.MF | 9 --------- build.properties | 17 ----------------- 4 files changed, 38 deletions(-) delete mode 100644 META-INF/MANIFEST.MF delete mode 100644 build.properties diff --git a/.classpath b/.classpath index b4a19c0..ce98e59 100644 --- a/.classpath +++ b/.classpath @@ -1,7 +1,6 @@ - diff --git a/.project b/.project index 320f75c..d6d90c1 100644 --- a/.project +++ b/.project @@ -10,16 +10,6 @@ - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - org.eclipse.m2e.core.maven2Builder @@ -34,7 +24,6 @@ org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature - org.eclipse.pde.PluginNature net.sf.eclipsecs.core.CheckstyleNature diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF deleted file mode 100644 index c5b5207..0000000 --- a/META-INF/MANIFEST.MF +++ /dev/null @@ -1,9 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: JavaBDD -Bundle-SymbolicName: com.github.javabdd -Bundle-Version: 3.0.0.qualifier -Export-Package: com.github.javabdd -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Automatic-Module-Name: com.github.javabdd -Bundle-Vendor: com-github-javabdd diff --git a/build.properties b/build.properties deleted file mode 100644 index b2bef07..0000000 --- a/build.properties +++ /dev/null @@ -1,17 +0,0 @@ -############################################################################## -# Copyright (c) 2020, 2022 John Whaley and others -# -# See the CONTRIBUTORS file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the GNU Library General Public License v2 or later, which is -# available at https://spdx.org/licenses/LGPL-2.0-or-later.html -# -# SPDX-License-Identifier: LGPL-2.0-or-later -############################################################################## - -source.. = src/main/java/ -bin.includes = .,\ - META-INF/ -src.includes = src/ From 61f59d83af272e744891647476fb1801eccf0c7f Mon Sep 17 00:00:00 2001 From: Dennis Hendriks Date: Tue, 25 Apr 2023 19:25:40 +0200 Subject: [PATCH 4/7] #35 Copyright year update + use '-' instead of ', ' to separate years. --- .checkstyle | 2 +- .gitignore | 2 +- pom.xml | 2 +- release-perform | 2 +- release-prepare | 2 +- src/main/java/com/github/javabdd/BDD.java | 2 +- src/main/java/com/github/javabdd/BDDBitVector.java | 2 +- src/main/java/com/github/javabdd/BDDDomain.java | 2 +- src/main/java/com/github/javabdd/BDDException.java | 2 +- src/main/java/com/github/javabdd/BDDFactory.java | 2 +- src/main/java/com/github/javabdd/BDDFactoryIntImpl.java | 2 +- src/main/java/com/github/javabdd/BDDPairing.java | 2 +- src/main/java/com/github/javabdd/BDDVarSet.java | 2 +- src/main/java/com/github/javabdd/BitString.java | 2 +- src/main/java/com/github/javabdd/FindBestOrder.java | 2 +- src/main/java/com/github/javabdd/JFactory.java | 2 +- src/main/java/com/github/javabdd/TryVarOrder.java | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.checkstyle b/.checkstyle index 4f63892..6af492e 100644 --- a/.checkstyle +++ b/.checkstyle @@ -1,7 +1,7 @@