You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2018/11/13 14:50:57 UTC
[sling-org-apache-sling-feature-analyser] branch master updated:
SLING-8102 : Remove main class from analyser
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-analyser.git
The following commit(s) were added to refs/heads/master by this push:
new 58c986c SLING-8102 : Remove main class from analyser
58c986c is described below
commit 58c986c276531843dd6f63bea31aa38d9884a4a8
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Nov 13 15:50:36 2018 +0100
SLING-8102 : Remove main class from analyser
---
pom.xml | 87 +++++---------
.../apache/sling/feature/analyser/main/Main.java | 133 ---------------------
.../sling/feature/analyser/package-info.java | 2 +-
.../sling/feature/analyser/task/package-info.java | 2 +-
.../scanner/impl/FelixFrameworkScanner.java | 7 +-
.../apache/sling/feature/scanner/package-info.java | 2 +-
.../sling/feature/scanner/spi/package-info.java | 2 +-
7 files changed, 35 insertions(+), 200 deletions(-)
diff --git a/pom.xml b/pom.xml
index c242df9..edd28b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,6 +29,7 @@
A feature describes an OSGi system
</description>
+ <packaging>bundle</packaging>
<properties>
<sling.java.version>8</sling.java.version>
</properties>
@@ -38,39 +39,23 @@
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-analyser.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-feature-analyser.git</url>
<tag>HEAD</tag>
- </scm>
+ </scm>
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack-dependencies</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>unpack-dependencies</goal>
- </goals>
- <configuration>
- <excludes>META-INF/**</excludes>
- <outputDirectory>${project.build.directory}/classes</outputDirectory>
- <overWriteReleases>false</overWriteReleases>
- <overWriteSnapshots>true</overWriteSnapshots>
- <includeArtifactIds>commons-cli,commons-lang,org.apache.felix.utils,org.apache.felix.converter,org.apache.sling.feature,org.apache.sling.feature.io,org.apache.sling.commons.johnzon,osgi.core,slf4j-api,slf4j-simple</includeArtifactIds>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
<configuration>
- <archive>
- <manifest>
- <mainClass>org.apache.sling.feature.analyser.main.Main</mainClass>
- </manifest>
- </archive>
+ <instructions>
+ <Conditional-Package>
+ org.apache.felix.utils.*,
+ </Conditional-Package>
+ </instructions>
+
+ <!-- Skip baselining for 0.x version -->
+ <skip>true</skip>
</configuration>
</plugin>
<plugin>
@@ -89,18 +74,18 @@
</build>
<dependencies>
<dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>1.3.1</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ <version>1.6</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-json_1.1_spec</artifactId>
+ <version>1.0</version>
<scope>provided</scope>
- </dependency>
- <dependency>
+ </dependency>
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.annotation.versioning</artifactId>
<version>1.0.0</version>
@@ -128,30 +113,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.feature.io</artifactId>
- <version>0.2.1-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.johnzon</artifactId>
- <version>1.0.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.converter</artifactId>
- <version>1.0.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configurator</artifactId>
- <version>1.0.4</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.utils</artifactId>
<version>1.11.0</version>
@@ -170,5 +131,11 @@
<version>2.22.0</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.johnzon</groupId>
+ <artifactId>johnzon-core</artifactId>
+ <version>1.1.1</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/src/main/java/org/apache/sling/feature/analyser/main/Main.java b/src/main/java/org/apache/sling/feature/analyser/main/Main.java
deleted file mode 100644
index 04bdb2b..0000000
--- a/src/main/java/org/apache/sling/feature/analyser/main/Main.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * 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.
- */
-package org.apache.sling.feature.analyser.main;
-
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.DefaultParser;
-import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
-import org.apache.sling.feature.ArtifactId;
-import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.analyser.Analyser;
-import org.apache.sling.feature.analyser.AnalyserResult;
-import org.apache.sling.feature.builder.ArtifactProvider;
-import org.apache.sling.feature.io.file.ArtifactManager;
-import org.apache.sling.feature.io.file.ArtifactManagerConfig;
-import org.apache.sling.feature.io.json.FeatureJSONReader;
-import org.apache.sling.feature.scanner.Scanner;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class Main {
- private static String featureFile;
- private static String pluginClass;
-
- private static void parseArgs(final String[] args) {
- Option fileOption = new Option("f", true, "Set feature file");
- Option pluginOption = new Option("p", true, "Explicitly specify plugin class to run, "
- + "if ommitted the default plugins are used");
-
- Options options = new Options();
- options.addOption(fileOption);
- options.addOption(pluginOption);
-
- CommandLineParser parser = new DefaultParser();
- try {
- CommandLine cl = parser.parse(options, args);
-
- featureFile = cl.getOptionValue(fileOption.getOpt());
- if (cl.hasOption(pluginOption.getOpt())) {
- pluginClass = cl.getOptionValue(pluginOption.getOpt());
- }
- } catch (ParseException e) {
- HelpFormatter formatter = new HelpFormatter();
- formatter.printHelp("", options);
- System.exit(1);
- }
- }
-
- public static void main(final String[] args) {
- // setup logging
- System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", "info");
- System.setProperty("org.slf4j.simpleLogger.showThreadName", "false");
- System.setProperty("org.slf4j.simpleLogger.levelInBrackets", "true");
- System.setProperty("org.slf4j.simpleLogger.showLogName", "false");
-
- final Logger logger = LoggerFactory.getLogger("analyser");
- logger.info("Apache Sling Application Analyser");
- logger.info("");
-
- parseArgs(args);
-
- if (featureFile == null) {
- logger.error("Required argument missing: feature file");
- System.exit(1);
- }
-
- Feature feature = null;
- try ( final FileReader r = new FileReader(featureFile)) {
- feature = FeatureJSONReader.read(r, featureFile);
- } catch ( final IOException ioe) {
- logger.error("Unable to read application: {}", featureFile, ioe);
- System.exit(1);
- }
-
- try {
- final ArtifactManager am = ArtifactManager.getArtifactManager(new ArtifactManagerConfig());
- final Scanner scanner = new Scanner(new ArtifactProvider() {
-
- @Override
- public File provide(ArtifactId id) {
- try {
- return am.getArtifactHandler(id.toMvnUrl()).getFile();
- } catch (final IOException e) {
- return null;
- }
- }
- });
- final Analyser analyser;
- if (pluginClass != null) {
- analyser = new Analyser(scanner, pluginClass);
- } else {
- analyser = new Analyser(scanner);
- }
- final AnalyserResult result = analyser.analyse(feature);
- for (final String msg : result.getWarnings()) {
- logger.warn(msg);
- }
- for (final String msg : result.getErrors()) {
- logger.error(msg);
- }
-
- if (!result.getErrors().isEmpty()) {
- logger.error("Analyser detected errors on Feature '" + feature.getId()
- + "'. See log output for error messages.");
- }
-
- } catch ( final Exception e) {
- logger.error("Unable to analyse feature: {}", featureFile, e);
- System.exit(1);
- }
- }
-}
diff --git a/src/main/java/org/apache/sling/feature/analyser/package-info.java b/src/main/java/org/apache/sling/feature/analyser/package-info.java
index e472819..3042a56 100644
--- a/src/main/java/org/apache/sling/feature/analyser/package-info.java
+++ b/src/main/java/org/apache/sling/feature/analyser/package-info.java
@@ -17,7 +17,7 @@
* under the License.
*/
-@org.osgi.annotation.versioning.Version("0.1.0")
+@org.osgi.annotation.versioning.Version("1.0.0")
package org.apache.sling.feature.analyser;
diff --git a/src/main/java/org/apache/sling/feature/analyser/task/package-info.java b/src/main/java/org/apache/sling/feature/analyser/task/package-info.java
index 2176cb6..d265303 100644
--- a/src/main/java/org/apache/sling/feature/analyser/task/package-info.java
+++ b/src/main/java/org/apache/sling/feature/analyser/task/package-info.java
@@ -17,7 +17,7 @@
* under the License.
*/
-@org.osgi.annotation.versioning.Version("0.1.0")
+@org.osgi.annotation.versioning.Version("1.0.0")
package org.apache.sling.feature.analyser.task;
diff --git a/src/main/java/org/apache/sling/feature/scanner/impl/FelixFrameworkScanner.java b/src/main/java/org/apache/sling/feature/scanner/impl/FelixFrameworkScanner.java
index 8b6ea6b..a4e5654 100644
--- a/src/main/java/org/apache/sling/feature/scanner/impl/FelixFrameworkScanner.java
+++ b/src/main/java/org/apache/sling/feature/scanner/impl/FelixFrameworkScanner.java
@@ -32,8 +32,8 @@ import java.util.stream.Stream;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
-import org.apache.commons.lang.text.StrLookup;
-import org.apache.commons.lang.text.StrSubstitutor;
+import org.apache.commons.text.StringSubstitutor;
+import org.apache.commons.text.lookup.StringLookup;
import org.apache.felix.utils.manifest.Parser;
import org.apache.felix.utils.resource.ResourceBuilder;
import org.apache.sling.feature.Artifact;
@@ -180,7 +180,8 @@ public class FelixFrameworkScanner implements FrameworkScanner {
defaultMap.put("java.specification.version",
System.getProperty("java.specification.version", "1.8"));
- StrSubstitutor ss = new StrSubstitutor(new StrLookup() {
+ StringSubstitutor ss = new StringSubstitutor(new StringLookup() {
+
@Override
public String lookup(String key) {
// Normally if a variable cannot be found, StrSubstitutor will
diff --git a/src/main/java/org/apache/sling/feature/scanner/package-info.java b/src/main/java/org/apache/sling/feature/scanner/package-info.java
index 386302e..4c65dc3 100644
--- a/src/main/java/org/apache/sling/feature/scanner/package-info.java
+++ b/src/main/java/org/apache/sling/feature/scanner/package-info.java
@@ -17,7 +17,7 @@
* under the License.
*/
-@org.osgi.annotation.versioning.Version("0.1.0")
+@org.osgi.annotation.versioning.Version("1.0.0")
package org.apache.sling.feature.scanner;
diff --git a/src/main/java/org/apache/sling/feature/scanner/spi/package-info.java b/src/main/java/org/apache/sling/feature/scanner/spi/package-info.java
index 43f8764..3ecb9cb 100644
--- a/src/main/java/org/apache/sling/feature/scanner/spi/package-info.java
+++ b/src/main/java/org/apache/sling/feature/scanner/spi/package-info.java
@@ -17,7 +17,7 @@
* under the License.
*/
-@org.osgi.annotation.versioning.Version("0.1.0")
+@org.osgi.annotation.versioning.Version("1.0.0")
package org.apache.sling.feature.scanner.spi;