Skip to content

Commit a00e578

Browse files
dhendriksdhendriks
authored
Merge pull request #37 from com-github-javabdd/35-include-an-osgi-compatible-manifest
#35 Include an OSGi-compatible manifest
2 parents d39e03a + 0ad0027 commit a00e578

22 files changed

+123
-87
lines changed

‎.checkstyle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

33
<!--
4-
Copyright (c) 2021, 2022 John Whaley and others
4+
Copyright (c) 2021-2023 John Whaley and others
55
66
See the CONTRIBUTORS file(s) distributed with this work for additional
77
information regarding copyright ownership.

‎.classpath‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
33
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
4-
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
54
<classpathentry kind="src" path="src/main/java"/>
65
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
76
<classpathentry kind="output" path="target/classes"/>

‎build.properties‎ renamed to ‎.gitattributes‎

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,24 @@
1-
##############################################################################
2-
# Copyright (c) 2020, 2022 John Whaley and others
3-
#
4-
# See the CONTRIBUTORS file(s) distributed with this work for additional
5-
# information regarding copyright ownership.
6-
#
7-
# This program and the accompanying materials are made available under the
8-
# terms of the GNU Library General Public License v2 or later, which is
9-
# available at https://spdx.org/licenses/LGPL-2.0-or-later.html
10-
#
11-
# SPDX-License-Identifier: LGPL-2.0-or-later
12-
##############################################################################
13-
14-
source.. = src/main/java/
15-
bin.includes = .,\
16-
META-INF/
17-
src.includes = src/
1+
##############################################################################
2+
# Copyright (c) 2020-2023 John Whaley and others
3+
#
4+
# See the CONTRIBUTORS file(s) distributed with this work for additional
5+
# information regarding copyright ownership.
6+
#
7+
# This program and the accompanying materials are made available under the
8+
# terms of the GNU Library General Public License v2 or later, which is
9+
# available at https://spdx.org/licenses/LGPL-2.0-or-later.html
10+
#
11+
# SPDX-License-Identifier: LGPL-2.0-or-later
12+
##############################################################################
13+
14+
# Set the default behavior, convert to native line endings on checkout.
15+
* text=auto
16+
17+
# Declare files that will always have certain line endings on checkout.
18+
*.bash text eol=lf
19+
*.sh text eol=lf
20+
21+
# Denote all files that are truly binary.
22+
*.class binary
23+
*.jar binary
24+
*.png binary

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
##############################################################################
2-
# Copyright (c) 2020, 2022 John Whaley and others
2+
# Copyright (c) 2020-2023 John Whaley and others
33
#
44
# See the CONTRIBUTORS file(s) distributed with this work for additional
55
# information regarding copyright ownership.

‎.project‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,6 @@
1010
<arguments>
1111
</arguments>
1212
</buildCommand>
13-
<buildCommand>
14-
<name>org.eclipse.pde.ManifestBuilder</name>
15-
<arguments>
16-
</arguments>
17-
</buildCommand>
18-
<buildCommand>
19-
<name>org.eclipse.pde.SchemaBuilder</name>
20-
<arguments>
21-
</arguments>
22-
</buildCommand>
2313
<buildCommand>
2414
<name>org.eclipse.m2e.core.maven2Builder</name>
2515
<arguments>
@@ -34,7 +24,6 @@
3424
<natures>
3525
<nature>org.eclipse.jdt.core.javanature</nature>
3626
<nature>org.eclipse.m2e.core.maven2Nature</nature>
37-
<nature>org.eclipse.pde.PluginNature</nature>
3827
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
3928
</natures>
4029
</projectDescription>

‎META-INF/MANIFEST.MF‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎com.github.javabdd.build.launch‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
3+
<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
4+
<stringAttribute key="M2_GOALS" value="clean verify"/>
5+
<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
6+
<booleanAttribute key="M2_OFFLINE" value="false"/>
7+
<stringAttribute key="M2_PROFILES" value=""/>
8+
<listAttribute key="M2_PROPERTIES"/>
9+
<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
10+
<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
11+
<intAttribute key="M2_THREADS" value="1"/>
12+
<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
13+
<stringAttribute key="M2_USER_SETTINGS" value=""/>
14+
<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
15+
<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${workspace}"/>
16+
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
17+
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
18+
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/com.github.javabdd}"/>
19+
</launchConfiguration>

‎pom.xml‎

Lines changed: 64 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
Copyright (c) 2020, 2022 John Whaley and others
2+
Copyright (c) 2020-2023 John Whaley and others
33
44
See the CONTRIBUTORS file(s) distributed with this work for additional
55
information regarding copyright ownership.
@@ -11,7 +11,9 @@ available at https://spdx.org/licenses/LGPL-2.0-or-later.html
1111
SPDX-License-Identifier: LGPL-2.0-or-later
1212
-->
1313

14-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
14+
<project xmlns="http://maven.apache.org/POM/4.0.0"
15+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
16+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1517

1618
<modelVersion>4.0.0</modelVersion>
1719

@@ -20,17 +22,26 @@ SPDX-License-Identifier: LGPL-2.0-or-later
2022
<version>4.0.1-SNAPSHOT</version>
2123
<packaging>jar</packaging>
2224

23-
<name>com.github.javabdd</name>
25+
<name>JavaBDD</name>
2426
<url>https://github.com/com-github-javabdd/com.github.javabdd</url>
2527
<description>JavaBDD: A Java library for Binary Decision Diagrams (BDDs)</description>
2628

29+
<properties>
30+
<java.version>11</java.version>
31+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
32+
</properties>
33+
2734
<licenses>
2835
<license>
2936
<name>LGPL-2.0-or-later</name>
3037
<url>https://spdx.org/licenses/LGPL-2.0-or-later.html</url>
3138
</license>
3239
</licenses>
3340

41+
<organization>
42+
<name>${project.groupId}</name>
43+
</organization>
44+
3445
<developers>
3546
<developer>
3647
<id>dhendriks</id>
@@ -40,27 +51,59 @@ SPDX-License-Identifier: LGPL-2.0-or-later
4051
</developer>
4152
</developers>
4253

43-
<properties>
44-
<project.build.sourceEncoding>
45-
UTF-8
46-
</project.build.sourceEncoding>
47-
</properties>
48-
4954
<build>
5055
<plugins>
5156
<plugin>
5257
<groupId>org.apache.maven.plugins</groupId>
5358
<artifactId>maven-compiler-plugin</artifactId>
5459
<version>3.10.1</version>
5560
<configuration>
56-
<encoding>UTF-8</encoding>
61+
<encoding>${project.build.sourceEncoding}</encoding>
5762
<failOnWarning>true</failOnWarning>
5863
<parameters>true</parameters>
59-
<release>11</release>
64+
<release>${java.version}</release>
6065
<showDeprecation>true</showDeprecation>
6166
<showWarnings>true</showWarnings>
62-
<source>11</source>
63-
<target>11</target>
67+
<source>${java.version}</source>
68+
<target>${java.version}</target>
69+
</configuration>
70+
</plugin>
71+
72+
<plugin>
73+
<groupId>org.apache.felix</groupId>
74+
<artifactId>maven-bundle-plugin</artifactId>
75+
<version>5.1.8</version>
76+
<extensions>true</extensions>
77+
<executions>
78+
<execution>
79+
<id>bundle-manifest</id>
80+
<phase>process-classes</phase>
81+
<goals>
82+
<goal>manifest</goal>
83+
</goals>
84+
</execution>
85+
</executions>
86+
<configuration>
87+
<instructions>
88+
<Automatic-Module-Name>${project.artifactId}</Automatic-Module-Name>
89+
<Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
90+
<Bundle-RequiredExecutionEnvironment>JavaSE-${java.version}</Bundle-RequiredExecutionEnvironment>
91+
<!-- PDE does not support Require-Capability, only Bundle-RequiredExecutionEnvironment. -->
92+
<!-- Bundle-RequiredExecutionEnvironment may not be mixed with Require-Capability. -->
93+
<_noee>true</_noee>
94+
</instructions>
95+
<niceManifest>true</niceManifest>
96+
</configuration>
97+
</plugin>
98+
99+
<plugin>
100+
<groupId>org.apache.maven.plugins</groupId>
101+
<artifactId>maven-jar-plugin</artifactId>
102+
<version>3.3.0</version>
103+
<configuration>
104+
<archive>
105+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
106+
</archive>
64107
</configuration>
65108
</plugin>
66109

@@ -81,23 +124,19 @@ SPDX-License-Identifier: LGPL-2.0-or-later
81124
<plugin>
82125
<groupId>org.apache.maven.plugins</groupId>
83126
<artifactId>maven-release-plugin</artifactId>
84-
<version>3.0.0-M7</version>
127+
<version>3.0.0</version>
85128
<configuration>
86129
<localCheckout>true</localCheckout>
87130
<pushChanges>false</pushChanges>
88131
<mavenExecutorId>forked-path</mavenExecutorId>
89-
<arguments>
90-
-Dgpg.passphrase=${gpg.passphrase}
91-
</arguments>
132+
<arguments>-Dgpg.passphrase=${gpg.passphrase}</arguments>
92133
<tagNameFormat>@{project.version}</tagNameFormat>
93134
</configuration>
94135
<dependencies>
95136
<dependency>
96137
<groupId>org.apache.maven.scm</groupId>
97-
<artifactId>
98-
maven-scm-provider-gitexe
99-
</artifactId>
100-
<version>2.0.0-M3</version>
138+
<artifactId>maven-scm-provider-gitexe</artifactId>
139+
<version>2.0.0</version>
101140
</dependency>
102141
</dependencies>
103142
</plugin>
@@ -174,25 +213,17 @@ SPDX-License-Identifier: LGPL-2.0-or-later
174213
<distributionManagement>
175214
<snapshotRepository>
176215
<id>ossrh</id>
177-
<url>
178-
https://oss.sonatype.org/content/repositories/snapshots
179-
</url>
216+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
180217
</snapshotRepository>
181218
<repository>
182219
<id>ossrh</id>
183-
<url>
184-
https://oss.sonatype.org/service/local/staging/deploy/maven2/
185-
</url>
220+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
186221
</repository>
187222
</distributionManagement>
188223

189224
<scm>
190-
<connection>
191-
scm:git:git://github.com/dexecutor/dependent-tasks-executor.git
192-
</connection>
193-
<developerConnection>
194-
scm:git:git@github.com:dexecutor/dexecutor.git
195-
</developerConnection>
225+
<connection>scm:git:git://github.com/dexecutor/dependent-tasks-executor.git</connection>
226+
<developerConnection>scm:git:git@github.com:dexecutor/dexecutor.git</developerConnection>
196227
<url>https://github.com/com-github-javabdd/com.github.javabdd</url>
197228
<tag>HEAD</tag>
198229
</scm>

‎release-perform‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/bash
22

33
##############################################################################
4-
# Copyright (c) 2020, 2022 John Whaley and others
4+
# Copyright (c) 2020-2023 John Whaley and others
55
#
66
# See the CONTRIBUTORS file(s) distributed with this work for additional
77
# information regarding copyright ownership.

‎release-prepare‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/bash
22

33
##############################################################################
4-
# Copyright (c) 2020, 2022 John Whaley and others
4+
# Copyright (c) 2020-2023 John Whaley and others
55
#
66
# See the CONTRIBUTORS file(s) distributed with this work for additional
77
# information regarding copyright ownership.

0 commit comments

Comments
 (0)