Skip to content

Commit

Permalink
tidy up names used in dependency modules
Browse files Browse the repository at this point in the history
  • Loading branch information
RBirdwatcher committed Jul 26, 2020
1 parent b261ef1 commit 0027ad8
Show file tree
Hide file tree
Showing 24 changed files with 81 additions and 82 deletions.
@@ -1,21 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" output="target/classes" path="src">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" output="target/classes" path="src">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.efbt.util.dependencies</name>
<name>org.eclipse.efbt.dependencies</name>
<comment></comment>
<projects>
</projects>
Expand Down
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.efbt.util.access.impl.jackess</name>
<name>org.eclipse.efbt.dependencies.access.jackcess</name>
<comment></comment>
<projects>
</projects>
Expand Down
@@ -0,0 +1,14 @@
Manifest-Version: 1.0
Export-Package: org.eclipse.efbt.dependencies.access.jackcess;uses:="c
om.healthmarketscience.jackcess";version="1.0.0.SNAPSHOT"
Bundle-SymbolicName: org.eclipse.efbt.dependencies.org.eclipse.efbt.de
pendencies.access.jackcess
Bundle-Name: org.eclipse.efbt.dependencies.access.jackcess
Bundle-Version: 1.0.0.SNAPSHOT
Bundle-ManifestVersion: 2
Bnd-LastModified: 1595766709966
Import-Package: com.healthmarketscience.jackcess;version="3.0",org.ecl
ipse.efbt.dependencies.access.jackcess;version="1.0"
Created-By: 1.8.0_102 (Oracle Corporation)
Tool: Bnd-0.0.357

Expand Up @@ -9,7 +9,7 @@
<version>1.0.0-SNAPSHOT</version>
</parent>

<artifactId>org.eclipse.efbt.util.access.impl.jackess</artifactId>
<artifactId>org.eclipse.efbt.dependencies.access.jackcess</artifactId>

<dependencies>
<dependency>
Expand Down
@@ -1,4 +1,4 @@
package org.eclipse.efbt.util.access.impl.jackess;
package org.eclipse.efbt.dependencies.access.jackcess;

import java.io.File;
import java.io.IOException;
Expand Down
Binary file not shown.
@@ -0,0 +1,5 @@
#Generated by Maven
#Sun Jul 26 13:20:12 BST 2020
version=1.0.0-SNAPSHOT
groupId=org.eclipse.efbt.dependencies
artifactId=org.eclipse.efbt.dependencies.access.jackcess
@@ -0,0 +1 @@
org\eclipse\efbt\dependencies\access\jackcess\JackcessUtils.class
@@ -0,0 +1 @@
C:\Users\neil\git\efbt-tidyupdeps\org.eclipse.efbt.dependencies\org.eclipse.efbt.dependencies.access.jackcess\src\main\java\org\eclipse\efbt\dependencies\access\jackcess\JackcessUtils.java
Binary file not shown.
Expand Up @@ -19,7 +19,7 @@
</properties>

<modules>
<module>org.eclipse.efbt.util.access.impl.jackess</module>
<module>org.eclipse.efbt.dependencies.access.jackcess</module>
<module>pomfirst-thirdparty</module>

</modules>
Expand All @@ -31,11 +31,7 @@
<artifactId>jackcess</artifactId>
<version>3.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
<version>1.5</version>
</dependency>

</dependencies>
</dependencyManagement>

Expand Down
@@ -1,34 +1,34 @@
Manifest-Version: 1.0
Bundle-SymbolicName: org.eclipse.efbt.dependencies.pomfirst-thirdparty
Embed-Directory: jars
Built-By: Neil
Bundle-ManifestVersion: 2
Bnd-LastModified: 1592840155301
Embed-Dependency: jackcess
Import-Package: com.healthmarketscience.jackcess;version="3.0",com.hea
lthmarketscience.jackcess.complex;version="3.0",com.healthmarketscien
ce.jackcess.expr;version="3.0",com.healthmarketscience.jackcess.impl;
version="3.0",com.healthmarketscience.jackcess.impl.complex;version="
3.0",com.healthmarketscience.jackcess.impl.expr;version="3.0",com.hea
lthmarketscience.jackcess.impl.query;version="3.0",com.healthmarketsc
ience.jackcess.query;version="3.0",com.healthmarketscience.jackcess.u
til;version="3.0",javax.script,org.apache.commons.lang3;version="3.8"
,org.apache.commons.lang3.builder;version="3.8",org.apache.commons.la
ng3.text;version="3.8",org.apache.commons.logging;version="1.2",org.a
pache.poi.poifs.filesystem
Tool: Bnd-0.0.357
Export-Package: com.healthmarketscience.jackcess.complex;version="3.0.
1",com.healthmarketscience.jackcess.impl.query;version="3.0.1",com.he
althmarketscience.jackcess.query;version="3.0.1",com.healthmarketscie
nce.jackcess;version="3.0.1",com.healthmarketscience.jackcess.impl;ve
rsion="3.0.1",com.healthmarketscience.jackcess.impl.complex;version="
3.0.1",com.healthmarketscience.jackcess.expr;version="3.0.1",com.heal
thmarketscience.jackcess.impl.expr;version="3.0.1",com.healthmarketsc
ience.jackcess.util;version="3.0.1"
Bundle-Version: 1.0.0.SNAPSHOT
Bundle-Name: pomfirst-thirdparty
Bundle-ClassPath: jars/jackcess-3.0.1.jar
Embed-Transitive: true
Created-By: Apache Maven Bundle Plugin
Build-Jdk: 1.8.0_192

Manifest-Version: 1.0
Bundle-SymbolicName: org.eclipse.efbt.dependencies.pomfirst-thirdparty
Embed-Directory: jars
Built-By: neil
Bundle-ManifestVersion: 2
Bnd-LastModified: 1595766710834
Embed-Dependency: jackcess
Import-Package: com.healthmarketscience.jackcess;version="3.0",com.hea
lthmarketscience.jackcess.complex;version="3.0",com.healthmarketscien
ce.jackcess.expr;version="3.0",com.healthmarketscience.jackcess.impl;
version="3.0",com.healthmarketscience.jackcess.impl.complex;version="
3.0",com.healthmarketscience.jackcess.impl.expr;version="3.0",com.hea
lthmarketscience.jackcess.impl.query;version="3.0",com.healthmarketsc
ience.jackcess.query;version="3.0",com.healthmarketscience.jackcess.u
til;version="3.0",javax.script,org.apache.commons.lang3;version="3.8"
,org.apache.commons.lang3.builder;version="3.8",org.apache.commons.la
ng3.text;version="3.8",org.apache.commons.logging;version="1.2",org.a
pache.poi.poifs.filesystem
Tool: Bnd-0.0.357
Export-Package: com.healthmarketscience.jackcess.complex;version="3.0.
1",com.healthmarketscience.jackcess.impl.query;version="3.0.1",com.he
althmarketscience.jackcess.query;version="3.0.1",com.healthmarketscie
nce.jackcess;version="3.0.1",com.healthmarketscience.jackcess.impl;ve
rsion="3.0.1",com.healthmarketscience.jackcess.impl.complex;version="
3.0.1",com.healthmarketscience.jackcess.expr;version="3.0.1",com.heal
thmarketscience.jackcess.impl.expr;version="3.0.1",com.healthmarketsc
ience.jackcess.util;version="3.0.1"
Bundle-Version: 1.0.0.SNAPSHOT
Bundle-Name: pomfirst-thirdparty
Bundle-ClassPath: jars/jackcess-3.0.1.jar
Embed-Transitive: true
Created-By: Apache Maven Bundle Plugin
Build-Jdk: 1.8.0_102

Expand Up @@ -7,5 +7,5 @@ Automatic-Module-Name: org.eclipse.efbt.util.access.impl.jackcess
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.efbt.util.access.interface;bundle-version="1.0.0"
Export-Package: org.eclipse.efbt.util.access.impl.jackcess
Import-Package: org.eclipse.efbt.util.access.impl.jackess,
Import-Package: org.eclipse.efbt.dependencies.access.jackcess,
com.healthmarketscience.jackcess
4 changes: 2 additions & 2 deletions org.eclipse.efbt.parent/pom.xml
Expand Up @@ -57,7 +57,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.efbt.dependencies</groupId>
<artifactId>org.eclipse.efbt.util.access.impl.jackess</artifactId>
<artifactId>org.eclipse.efbt.dependencies.access.jackcess</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
Expand Down Expand Up @@ -375,7 +375,7 @@
<dependencies>
<dependency>
<groupId>org.eclipse.efbt.dependencies</groupId>
<artifactId>org.eclipse.efbt.util.access.impl.jackess</artifactId>
<artifactId>org.eclipse.efbt.dependencies.access.jackcess</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
Expand Down

This file was deleted.

0 comments on commit 0027ad8

Please sign in to comment.