You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2019/07/01 20:27:53 UTC
[juneau] branch master updated: Clean up .classpath files.
This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new 18e33d3 Clean up .classpath files.
new b31afce Merge branch 'master' of https://gitbox.apache.org/repos/asf/juneau
18e33d3 is described below
commit 18e33d3c38bda521b4dd9482e777b299ce4407d7
Author: JamesBognar <ja...@apache.org>
AuthorDate: Mon Jul 1 16:25:25 2019 -0400
Clean up .classpath files.
---
.gitignore | 4 +-
juneau-core/.gitignore | 1 +
juneau-core/juneau-config/.gitignore | 1 -
juneau-core/juneau-core-utest/.gitignore | 2 -
juneau-core/juneau-dto/.gitignore | 1 -
juneau-core/juneau-marshall-rdf/.gitignore | 1 -
juneau-core/juneau-svl/.gitignore | 1 -
juneau-doc/.gitignore | 1 -
juneau-examples/.gitignore | 2 +-
juneau-examples/juneau-examples-core/.gitignore | 1 +
.../juneau-examples-rest-jetty-ftest/.gitignore | 2 -
.../juneau-examples-rest-jetty/.gitignore | 2 -
.../juneau-examples-rest-jetty/bin/.gitignore | 1 -
.../juneau-examples-rest-springboot/.gitignore | 1 -
juneau-examples/juneau-examples-rest/.gitignore | 1 -
juneau-microservice/.gitignore | 2 +-
.../juneau-microservice-core/.gitignore | 2 -
.../juneau-microservice-ftest/.gitignore | 2 -
.../juneau-microservice-jetty/.gitignore | 2 -
.../juneau-my-jetty-microservice/.gitignore | 2 -
.../juneau-my-springboot-microservice/.gitignore | 2 -
juneau-releng/.gitignore | 1 -
juneau-releng/juneau-all/.gitignore | 2 -
juneau-releng/juneau-all/bin/.project | 23 -----
juneau-releng/juneau-all/bin/pom.xml | 100 ---------------------
juneau-releng/juneau-all/bin/src/assembly/all.xml | 34 -------
juneau-releng/juneau-distrib/.gitignore | 1 -
juneau-rest/.gitignore | 2 +-
juneau-rest/juneau-rest-client-utest/.gitignore | 1 -
juneau-rest/juneau-rest-client/.gitignore | 1 -
juneau-rest/juneau-rest-mock-utest/.gitignore | 4 +-
juneau-rest/juneau-rest-mock/.gitignore | 4 +-
juneau-rest/juneau-rest-server-jaxrs/.gitignore | 1 -
juneau-rest/juneau-rest-server-rdf/.gitignore | 2 -
.../juneau-rest-server-springboot/.gitignore | 1 -
juneau-rest/juneau-rest-server-utest/.gitignore | 1 -
juneau-rest/juneau-rest-server/.gitignore | 1 -
juneau-sc/.gitignore | 9 +-
juneau-sc/juneau-server-config-client/.gitignore | 11 +--
juneau-sc/juneau-server-config/.gitignore | 9 +-
40 files changed, 16 insertions(+), 226 deletions(-)
diff --git a/.gitignore b/.gitignore
index 32d2676..89c0266 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,5 @@
+/target/
**/.DS_Store
-target
derby.log
.idea/
*.iml
-**/.settings
-**/.classpath
diff --git a/juneau-core/.gitignore b/juneau-core/.gitignore
index 79b5594..22d1e37 100644
--- a/juneau-core/.gitignore
+++ b/juneau-core/.gitignore
@@ -1 +1,2 @@
+/target/
**/.DS_Store
diff --git a/juneau-core/juneau-config/.gitignore b/juneau-core/juneau-config/.gitignore
index 497450c..22d1e37 100644
--- a/juneau-core/juneau-config/.gitignore
+++ b/juneau-core/juneau-config/.gitignore
@@ -1,3 +1,2 @@
-**/.classpath
/target/
**/.DS_Store
diff --git a/juneau-core/juneau-core-utest/.gitignore b/juneau-core/juneau-core-utest/.gitignore
index 8f17ced..22d1e37 100644
--- a/juneau-core/juneau-core-utest/.gitignore
+++ b/juneau-core/juneau-core-utest/.gitignore
@@ -1,4 +1,2 @@
-**/.classpath
/target/
**/.DS_Store
-/bin/
\ No newline at end of file
diff --git a/juneau-core/juneau-dto/.gitignore b/juneau-core/juneau-dto/.gitignore
index 497450c..22d1e37 100644
--- a/juneau-core/juneau-dto/.gitignore
+++ b/juneau-core/juneau-dto/.gitignore
@@ -1,3 +1,2 @@
-**/.classpath
/target/
**/.DS_Store
diff --git a/juneau-core/juneau-marshall-rdf/.gitignore b/juneau-core/juneau-marshall-rdf/.gitignore
index 497450c..22d1e37 100644
--- a/juneau-core/juneau-marshall-rdf/.gitignore
+++ b/juneau-core/juneau-marshall-rdf/.gitignore
@@ -1,3 +1,2 @@
-**/.classpath
/target/
**/.DS_Store
diff --git a/juneau-core/juneau-svl/.gitignore b/juneau-core/juneau-svl/.gitignore
index 497450c..22d1e37 100644
--- a/juneau-core/juneau-svl/.gitignore
+++ b/juneau-core/juneau-svl/.gitignore
@@ -1,3 +1,2 @@
-**/.classpath
/target/
**/.DS_Store
diff --git a/juneau-doc/.gitignore b/juneau-doc/.gitignore
index c3a1d31..22d1e37 100644
--- a/juneau-doc/.gitignore
+++ b/juneau-doc/.gitignore
@@ -1,3 +1,2 @@
/target/
-**/.classpath
**/.DS_Store
diff --git a/juneau-examples/.gitignore b/juneau-examples/.gitignore
index 5436667..22d1e37 100644
--- a/juneau-examples/.gitignore
+++ b/juneau-examples/.gitignore
@@ -1,2 +1,2 @@
+/target/
**/.DS_Store
-**/.classpath
diff --git a/juneau-examples/juneau-examples-core/.gitignore b/juneau-examples/juneau-examples-core/.gitignore
index 79b5594..22d1e37 100644
--- a/juneau-examples/juneau-examples-core/.gitignore
+++ b/juneau-examples/juneau-examples-core/.gitignore
@@ -1 +1,2 @@
+/target/
**/.DS_Store
diff --git a/juneau-examples/juneau-examples-rest-jetty-ftest/.gitignore b/juneau-examples/juneau-examples-rest-jetty-ftest/.gitignore
index 08c8ec3..5ad1d63 100644
--- a/juneau-examples/juneau-examples-rest-jetty-ftest/.gitignore
+++ b/juneau-examples/juneau-examples-rest-jetty-ftest/.gitignore
@@ -1,5 +1,3 @@
-**/.classpath
/target/
**/.DS_Store
/derby.log
-/bin/
diff --git a/juneau-examples/juneau-examples-rest-jetty/.gitignore b/juneau-examples/juneau-examples-rest-jetty/.gitignore
index 08c8ec3..5ad1d63 100644
--- a/juneau-examples/juneau-examples-rest-jetty/.gitignore
+++ b/juneau-examples/juneau-examples-rest-jetty/.gitignore
@@ -1,5 +1,3 @@
-**/.classpath
/target/
**/.DS_Store
/derby.log
-/bin/
diff --git a/juneau-examples/juneau-examples-rest-jetty/bin/.gitignore b/juneau-examples/juneau-examples-rest-jetty/bin/.gitignore
deleted file mode 100644
index ae3c172..0000000
--- a/juneau-examples/juneau-examples-rest-jetty/bin/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/bin/
diff --git a/juneau-examples/juneau-examples-rest-springboot/.gitignore b/juneau-examples/juneau-examples-rest-springboot/.gitignore
index e725db0..5ad1d63 100644
--- a/juneau-examples/juneau-examples-rest-springboot/.gitignore
+++ b/juneau-examples/juneau-examples-rest-springboot/.gitignore
@@ -1,4 +1,3 @@
-**/.classpath
/target/
**/.DS_Store
/derby.log
diff --git a/juneau-examples/juneau-examples-rest/.gitignore b/juneau-examples/juneau-examples-rest/.gitignore
index 497450c..22d1e37 100644
--- a/juneau-examples/juneau-examples-rest/.gitignore
+++ b/juneau-examples/juneau-examples-rest/.gitignore
@@ -1,3 +1,2 @@
-**/.classpath
/target/
**/.DS_Store
diff --git a/juneau-microservice/.gitignore b/juneau-microservice/.gitignore
index 5436667..22d1e37 100644
--- a/juneau-microservice/.gitignore
+++ b/juneau-microservice/.gitignore
@@ -1,2 +1,2 @@
+/target/
**/.DS_Store
-**/.classpath
diff --git a/juneau-microservice/juneau-microservice-core/.gitignore b/juneau-microservice/juneau-microservice-core/.gitignore
index 6e12d65..22d1e37 100644
--- a/juneau-microservice/juneau-microservice-core/.gitignore
+++ b/juneau-microservice/juneau-microservice-core/.gitignore
@@ -1,4 +1,2 @@
-**/.classpath
/target/
**/.DS_Store
-/bin/
diff --git a/juneau-microservice/juneau-microservice-ftest/.gitignore b/juneau-microservice/juneau-microservice-ftest/.gitignore
index 6e12d65..22d1e37 100644
--- a/juneau-microservice/juneau-microservice-ftest/.gitignore
+++ b/juneau-microservice/juneau-microservice-ftest/.gitignore
@@ -1,4 +1,2 @@
-**/.classpath
/target/
**/.DS_Store
-/bin/
diff --git a/juneau-microservice/juneau-microservice-jetty/.gitignore b/juneau-microservice/juneau-microservice-jetty/.gitignore
index 6e12d65..22d1e37 100644
--- a/juneau-microservice/juneau-microservice-jetty/.gitignore
+++ b/juneau-microservice/juneau-microservice-jetty/.gitignore
@@ -1,4 +1,2 @@
-**/.classpath
/target/
**/.DS_Store
-/bin/
diff --git a/juneau-microservice/juneau-my-jetty-microservice/.gitignore b/juneau-microservice/juneau-my-jetty-microservice/.gitignore
index 6e12d65..22d1e37 100644
--- a/juneau-microservice/juneau-my-jetty-microservice/.gitignore
+++ b/juneau-microservice/juneau-my-jetty-microservice/.gitignore
@@ -1,4 +1,2 @@
-**/.classpath
/target/
**/.DS_Store
-/bin/
diff --git a/juneau-microservice/juneau-my-springboot-microservice/.gitignore b/juneau-microservice/juneau-my-springboot-microservice/.gitignore
index 6e12d65..22d1e37 100644
--- a/juneau-microservice/juneau-my-springboot-microservice/.gitignore
+++ b/juneau-microservice/juneau-my-springboot-microservice/.gitignore
@@ -1,4 +1,2 @@
-**/.classpath
/target/
**/.DS_Store
-/bin/
diff --git a/juneau-releng/.gitignore b/juneau-releng/.gitignore
index 497450c..22d1e37 100644
--- a/juneau-releng/.gitignore
+++ b/juneau-releng/.gitignore
@@ -1,3 +1,2 @@
-**/.classpath
/target/
**/.DS_Store
diff --git a/juneau-releng/juneau-all/.gitignore b/juneau-releng/juneau-all/.gitignore
index 6e12d65..22d1e37 100644
--- a/juneau-releng/juneau-all/.gitignore
+++ b/juneau-releng/juneau-all/.gitignore
@@ -1,4 +1,2 @@
-**/.classpath
/target/
**/.DS_Store
-/bin/
diff --git a/juneau-releng/juneau-all/bin/.project b/juneau-releng/juneau-all/bin/.project
deleted file mode 100644
index 5ba7b4e..0000000
--- a/juneau-releng/juneau-all/bin/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>juneau-all</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- </natures>
-</projectDescription>
diff --git a/juneau-releng/juneau-all/bin/pom.xml b/juneau-releng/juneau-all/bin/pom.xml
deleted file mode 100644
index 28dcf4b..0000000
--- a/juneau-releng/juneau-all/bin/pom.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *
- * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *
- * with the License. You may obtain a copy of the License at *
- * *
- * http://www.apache.org/licenses/LICENSE-2.0 *
- * *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *
- * specific language governing permissions and limitations under the License. *
- ***************************************************************************************************************************
--->
-<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">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-releng</artifactId>
- <version>7.2.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>juneau-all</artifactId>
- <name>Apache Juneau UberJar</name>
- <description>Combined contents of Core/Server/Client/Microservice jars</description>
- <packaging>jar</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-marshall</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-marshall-rdf</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-rest-server</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-rest-client</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-microservice-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
-
- <!-- Creates our juneau-all jar file that's a combo of our 4 modules. -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <!--version>2.4.3</version-->
- <configuration>
- <createDependencyReducedPom>false</createDependencyReducedPom>
- <artifactSet>
- <includes>
- <include>org.apache.juneau:juneau-marshall</include>
- <include>org.apache.juneau:juneau-svl</include>
- <include>org.apache.juneau:juneau-config</include>
- <include>org.apache.juneau:juneau-dto</include>
- <include>org.apache.juneau:juneau-rest-server</include>
- <include>org.apache.juneau:juneau-rest-client</include>
- </includes>
- </artifactSet>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- </execution>
- <execution>
- <id>source-jar</id>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <createSourcesJar>true</createSourcesJar>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/juneau-releng/juneau-all/bin/src/assembly/all.xml b/juneau-releng/juneau-all/bin/src/assembly/all.xml
deleted file mode 100644
index f3fb07e..0000000
--- a/juneau-releng/juneau-all/bin/src/assembly/all.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *
- * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *
- * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *
- * with the License. You may obtain a copy of the License at *
- * *
- * http://www.apache.org/licenses/LICENSE-2.0 *
- * *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *
- * specific language governing permissions and limitations under the License. *
- ***************************************************************************************************************************
--->
-<assembly
- xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
- <id>all</id>
- <formats>
- <format>dir</format>
- <format>zip</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <includes>
- <include>*</include>
- </includes>
- <outputDirectory></outputDirectory>
- </dependencySet>
- </dependencySets>
-</assembly>
\ No newline at end of file
diff --git a/juneau-releng/juneau-distrib/.gitignore b/juneau-releng/juneau-distrib/.gitignore
index 497450c..22d1e37 100644
--- a/juneau-releng/juneau-distrib/.gitignore
+++ b/juneau-releng/juneau-distrib/.gitignore
@@ -1,3 +1,2 @@
-**/.classpath
/target/
**/.DS_Store
diff --git a/juneau-rest/.gitignore b/juneau-rest/.gitignore
index 4df49e4..22d1e37 100644
--- a/juneau-rest/.gitignore
+++ b/juneau-rest/.gitignore
@@ -1,2 +1,2 @@
-**/.classpath
+/target/
**/.DS_Store
diff --git a/juneau-rest/juneau-rest-client-utest/.gitignore b/juneau-rest/juneau-rest-client-utest/.gitignore
index 5fbb688..22d1e37 100644
--- a/juneau-rest/juneau-rest-client-utest/.gitignore
+++ b/juneau-rest/juneau-rest-client-utest/.gitignore
@@ -1,3 +1,2 @@
/target/
**/.DS_Store
-/bin/
diff --git a/juneau-rest/juneau-rest-client/.gitignore b/juneau-rest/juneau-rest-client/.gitignore
index 497450c..22d1e37 100644
--- a/juneau-rest/juneau-rest-client/.gitignore
+++ b/juneau-rest/juneau-rest-client/.gitignore
@@ -1,3 +1,2 @@
-**/.classpath
/target/
**/.DS_Store
diff --git a/juneau-rest/juneau-rest-mock-utest/.gitignore b/juneau-rest/juneau-rest-mock-utest/.gitignore
index ae3c172..c5b462d 100644
--- a/juneau-rest/juneau-rest-mock-utest/.gitignore
+++ b/juneau-rest/juneau-rest-mock-utest/.gitignore
@@ -1 +1,3 @@
-/bin/
+/target/
+**/.DS_Store
+
diff --git a/juneau-rest/juneau-rest-mock/.gitignore b/juneau-rest/juneau-rest-mock/.gitignore
index ae3c172..c5b462d 100644
--- a/juneau-rest/juneau-rest-mock/.gitignore
+++ b/juneau-rest/juneau-rest-mock/.gitignore
@@ -1 +1,3 @@
-/bin/
+/target/
+**/.DS_Store
+
diff --git a/juneau-rest/juneau-rest-server-jaxrs/.gitignore b/juneau-rest/juneau-rest-server-jaxrs/.gitignore
index 497450c..22d1e37 100644
--- a/juneau-rest/juneau-rest-server-jaxrs/.gitignore
+++ b/juneau-rest/juneau-rest-server-jaxrs/.gitignore
@@ -1,3 +1,2 @@
-**/.classpath
/target/
**/.DS_Store
diff --git a/juneau-rest/juneau-rest-server-rdf/.gitignore b/juneau-rest/juneau-rest-server-rdf/.gitignore
index 6e12d65..22d1e37 100644
--- a/juneau-rest/juneau-rest-server-rdf/.gitignore
+++ b/juneau-rest/juneau-rest-server-rdf/.gitignore
@@ -1,4 +1,2 @@
-**/.classpath
/target/
**/.DS_Store
-/bin/
diff --git a/juneau-rest/juneau-rest-server-springboot/.gitignore b/juneau-rest/juneau-rest-server-springboot/.gitignore
index 497450c..22d1e37 100644
--- a/juneau-rest/juneau-rest-server-springboot/.gitignore
+++ b/juneau-rest/juneau-rest-server-springboot/.gitignore
@@ -1,3 +1,2 @@
-**/.classpath
/target/
**/.DS_Store
diff --git a/juneau-rest/juneau-rest-server-utest/.gitignore b/juneau-rest/juneau-rest-server-utest/.gitignore
index 5fbb688..22d1e37 100644
--- a/juneau-rest/juneau-rest-server-utest/.gitignore
+++ b/juneau-rest/juneau-rest-server-utest/.gitignore
@@ -1,3 +1,2 @@
/target/
**/.DS_Store
-/bin/
diff --git a/juneau-rest/juneau-rest-server/.gitignore b/juneau-rest/juneau-rest-server/.gitignore
index 497450c..22d1e37 100644
--- a/juneau-rest/juneau-rest-server/.gitignore
+++ b/juneau-rest/juneau-rest-server/.gitignore
@@ -1,3 +1,2 @@
-**/.classpath
/target/
**/.DS_Store
diff --git a/juneau-sc/.gitignore b/juneau-sc/.gitignore
index 1d68438..0762eb3 100644
--- a/juneau-sc/.gitignore
+++ b/juneau-sc/.gitignore
@@ -1,10 +1,3 @@
-**/.classpath
+/target/
**/.DS_Store
-target
derby.log
-.idea/
-*.iml
-**/.settings
-.project
-.classpath
-.settings/
diff --git a/juneau-sc/juneau-server-config-client/.gitignore b/juneau-sc/juneau-server-config-client/.gitignore
index 1d68438..b62858f 100644
--- a/juneau-sc/juneau-server-config-client/.gitignore
+++ b/juneau-sc/juneau-server-config-client/.gitignore
@@ -1,10 +1,3 @@
-**/.classpath
+/target/
**/.DS_Store
-target
-derby.log
-.idea/
-*.iml
-**/.settings
-.project
-.classpath
-.settings/
+derby.log
\ No newline at end of file
diff --git a/juneau-sc/juneau-server-config/.gitignore b/juneau-sc/juneau-server-config/.gitignore
index 1d68438..0762eb3 100644
--- a/juneau-sc/juneau-server-config/.gitignore
+++ b/juneau-sc/juneau-server-config/.gitignore
@@ -1,10 +1,3 @@
-**/.classpath
+/target/
**/.DS_Store
-target
derby.log
-.idea/
-*.iml
-**/.settings
-.project
-.classpath
-.settings/